Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed YangStore exception thrown at startup
[controller.git]
/
opendaylight
/
netconf
/
pom.xml
diff --git
a/opendaylight/netconf/pom.xml
b/opendaylight/netconf/pom.xml
index 840f557f51ae14fd41a737a38de07421ee70de14..b22732e630bf0b5263d1221c9684faf2e0a14f52 100644
(file)
--- a/
opendaylight/netconf/pom.xml
+++ b/
opendaylight/netconf/pom.xml
@@
-9,7
+9,7
@@
<relativePath>../commons/opendaylight</relativePath>
</parent>
<relativePath>../commons/opendaylight</relativePath>
</parent>
- <version>
${netconf.version}
</version>
+ <version>
0.2.3-SNAPSHOT
</version>
<artifactId>netconf-subsystem</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<artifactId>netconf-subsystem</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
@@
-23,19
+23,31
@@
<module>netconf-impl</module>
<module>config-netconf-connector</module>
<module>netconf-util</module>
<module>netconf-impl</module>
<module>config-netconf-connector</module>
<module>netconf-util</module>
- <module>netconf-it</module>
<module>config-persister-impl</module>
<module>netconf-mapping-api</module>
<module>netconf-client</module>
<module>config-persister-impl</module>
<module>netconf-mapping-api</module>
<module>netconf-client</module>
+ <module>../../third-party/ganymed</module>
+ <module>../../third-party/com.siemens.ct.exi</module>
</modules>
</modules>
+ <profiles>
+ <profile>
+ <id>integrationtests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>netconf-it</module>
+ </modules>
+ </profile>
+ </profiles>
+
<properties>
<osgi.version>5.0.0</osgi.version>
<maven.bundle.version>2.3.7</maven.bundle.version>
<slf4j.version>1.7.2</slf4j.version>
<properties>
<osgi.version>5.0.0</osgi.version>
<maven.bundle.version>2.3.7</maven.bundle.version>
<slf4j.version>1.7.2</slf4j.version>
- <java.version.source>1.7</java.version.source>
- <java.version.target>1.7</java.version.target>
<netconf.netty.version>4.0.10.Final</netconf.netty.version>
<netconf.netty.version>4.0.10.Final</netconf.netty.version>
+ <ct.exi.version>0.9.2</ct.exi.version>
</properties>
<dependencies>
</properties>
<dependencies>
@@
-172,6
+184,11
@@
<artifactId>logback-config</artifactId>
<version>${config.version}</version>
</dependency>
<artifactId>logback-config</artifactId>
<version>${config.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.siemens.ct.exi</groupId>
+ <artifactId>exificient</artifactId>
+ <version>${ct.exi.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</dependencies>
</dependencyManagement>
@@
-181,13
+198,6
@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <source>${java.version.source}</source>
- <target>${java.version.target}</target>
- <testSource>${java.version.source}</testSource>
- <testTarget>${java.version.target}</testTarget>
- </configuration>
</plugin>
</plugins>
<pluginManagement>
</plugin>
</plugins>
<pluginManagement>