Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix license header violations in controller
[controller.git]
/
opendaylight
/
netconf
/
pom.xml
diff --git
a/opendaylight/netconf/pom.xml
b/opendaylight/netconf/pom.xml
index e1aa6ce3ed8184d979682df63281fe41311004e4..f33eb112bf2d1e11423370ed840d04b6f19d834d 100644
(file)
--- a/
opendaylight/netconf/pom.xml
+++ b/
opendaylight/netconf/pom.xml
@@
-5,38
+5,40
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.
5
.0-SNAPSHOT</version>
+ <version>1.
6
.0-SNAPSHOT</version>
<relativePath>../commons/opendaylight</relativePath>
</parent>
<artifactId>netconf-subsystem</artifactId>
<relativePath>../commons/opendaylight</relativePath>
</parent>
<artifactId>netconf-subsystem</artifactId>
- <version>0.
3
.0-SNAPSHOT</version>
+ <version>0.
4
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
<modules>
<module>netconf-api</module>
<modules>
<module>netconf-api</module>
- <module>netconf-cli</module>
<module>netconf-config</module>
<module>netconf-impl</module>
<module>config-netconf-connector</module>
<module>netconf-config</module>
<module>netconf-impl</module>
<module>config-netconf-connector</module>
+ <module>mdsal-netconf-connector</module>
+ <module>mdsal-netconf-monitoring</module>
<module>netconf-util</module>
<module>netconf-netty-util</module>
<module>netconf-util</module>
<module>netconf-netty-util</module>
- <module>config-persister-impl</module>
<module>netconf-mapping-api</module>
<module>netconf-client</module>
<module>netconf-mapping-api</module>
<module>netconf-client</module>
+ <module>netconf-config-dispatcher</module>
<module>netconf-ssh</module>
<module>netconf-tcp</module>
<module>netconf-monitoring</module>
<module>netconf-ssh</module>
<module>netconf-tcp</module>
<module>netconf-monitoring</module>
- <module>ietf-netconf-monitoring</module>
- <module>ietf-netconf-monitoring-extension</module>
<module>netconf-connector-config</module>
<module>netconf-connector-config</module>
+ <module>netconf-mdsal-config</module>
<module>netconf-auth</module>
<module>netconf-auth</module>
- <module>netconf-usermanager</module>
- <module>netconf-testtool</module>
+ <module>netconf-notifications-impl</module>
+ <module>netconf-notifications-api</module>
+ <module>sal-netconf-connector</module>
+ <module>messagebus-netconf</module>
+ <module>features</module>
+ <module>models</module>
+ <module>tools</module>
<module>netconf-artifacts</module>
</modules>
<module>netconf-artifacts</module>
</modules>
@@
-74,35
+76,37
@@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${yangtools.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>maven-sal-api-gen-plugin</artifactId>
- <version>${yangtools.version}</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<executions>
<execution>
+ <id>config</id>
<goals>
<goal>generate-sources</goal>
</goals>
<configuration>
<goals>
<goal>generate-sources</goal>
</goals>
<configuration>
- <yangFilesRootDir>src/main/yang</yangFilesRootDir>
<codeGenerators>
<generator>
<codeGenerators>
<generator>
- <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
- <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+ <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+ <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
+ <additionalConfiguration>
+ <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
+ </additionalConfiguration>
</generator>
<generator>
</generator>
<generator>
- <codeGeneratorClass>org.opendaylight.yangtools.
yang.unified.doc.generator.maven.Documentation
GeneratorImpl</codeGeneratorClass>
- <outputBaseDir>${
project.build.directory}/site/models
</outputBaseDir>
+ <codeGeneratorClass>org.opendaylight.yangtools.
maven.sal.api.gen.plugin.Code
GeneratorImpl</codeGeneratorClass>
+ <outputBaseDir>${
salGeneratorPath}
</outputBaseDir>
</generator>
</codeGenerators>
<inspectDependencies>true</inspectDependencies>
</configuration>
</execution>
</executions>
</generator>
</codeGenerators>
<inspectDependencies>true</inspectDependencies>
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>yang-jmx-generator-plugin</artifactId>
+ <version>${config.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</plugin>
</plugins>
@@
-119,7
+123,7
@@
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.basedir}</sourceDirectory>
<includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.basedir}</sourceDirectory>
<includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
- <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/netconf\/test\/tool\/Main.java</excludes>
+ <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/netconf\/test\/tool\/Main.java
, **\/netconf\/test\/tool\/client\/stress\/StressClient.java
</excludes>
</configuration>
<dependencies>
<dependency>
</configuration>
<dependencies>
<dependency>