Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[maven-release-plugin] prepare for next development iteration
[controller.git]
/
opendaylight
/
netconf
/
pom.xml
diff --git
a/opendaylight/netconf/pom.xml
b/opendaylight/netconf/pom.xml
index e70df1b9493634806c701b5ebd861bac36ab4b6d..6fef98ff361a05842d896d7f901a86ff04c7c783 100644
(file)
--- a/
opendaylight/netconf/pom.xml
+++ b/
opendaylight/netconf/pom.xml
@@
-1,15
+1,14
@@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.
1
-SNAPSHOT</version>
+ <version>1.4.
2
-SNAPSHOT</version>
<relativePath>../commons/opendaylight</relativePath>
</parent>
<relativePath>../commons/opendaylight</relativePath>
</parent>
- <version>0.2.
3
-SNAPSHOT</version>
+ <version>0.2.
4
-SNAPSHOT</version>
<artifactId>netconf-subsystem</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<artifactId>netconf-subsystem</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
@@
-27,8
+26,6
@@
<module>netconf-mapping-api</module>
<module>netconf-client</module>
<module>netconf-ssh</module>
<module>netconf-mapping-api</module>
<module>netconf-client</module>
<module>netconf-ssh</module>
- <module>../../third-party/ganymed</module>
- <module>../../third-party/com.siemens.ct.exi</module>
<module>netconf-monitoring</module>
<module>ietf-netconf-monitoring</module>
<module>ietf-netconf-monitoring-extension</module>
<module>netconf-monitoring</module>
<module>ietf-netconf-monitoring</module>
<module>ietf-netconf-monitoring-extension</module>
@@
-48,10
+45,11
@@
<properties>
<osgi.version>5.0.0</osgi.version>
<properties>
<osgi.version>5.0.0</osgi.version>
- <maven.bundle.version>2.
3.7
</maven.bundle.version>
+ <maven.bundle.version>2.
4.0
</maven.bundle.version>
<slf4j.version>1.7.2</slf4j.version>
<netconf.netty.version>4.0.10.Final</netconf.netty.version>
<slf4j.version>1.7.2</slf4j.version>
<netconf.netty.version>4.0.10.Final</netconf.netty.version>
- <ct.exi.version>0.9.2</ct.exi.version>
+ <netconf.version>0.2.4-SNAPSHOT</netconf.version>
+ <config.version>0.2.4-SNAPSHOT</config.version>
</properties>
<dependencies>
</properties>
<dependencies>
@@
-74,12
+72,6
@@
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.bgpcep</groupId>
- <artifactId>mockito-configuration</artifactId>
- <version>${bgpcep.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-api</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>config-api</artifactId>
@@
-148,6
+140,12
@@
<artifactId>netconf-ssh</artifactId>
<version>${netconf.version}</version>
</dependency>
<artifactId>netconf-ssh</artifactId>
<version>${netconf.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netconf-ssh</artifactId>
+ <version>${netconf.version}</version>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-mapping-api</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-mapping-api</artifactId>
@@
-203,11
+201,6
@@
<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>