Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump odlparent to 4.0.10
[netconf.git]
/
netconf
/
netconf-netty-util
/
pom.xml
diff --git
a/netconf/netconf-netty-util/pom.xml
b/netconf/netconf-netty-util/pom.xml
index 0f7254bd24d7b444bd09586ace16dffd56360da8..810f7a3cc338a107fe1e4425140fdc2dcea08636 100644
(file)
--- a/
netconf/netconf-netty-util/pom.xml
+++ b/
netconf/netconf-netty-util/pom.xml
@@
-12,26
+12,16
@@
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
- <version>1.6.
0
-SNAPSHOT</version>
+ <version>1.6.
1
-SNAPSHOT</version>
<relativePath>../netconf-parent</relativePath>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-netty-util</artifactId>
<packaging>bundle</packaging>
<relativePath>../netconf-parent</relativePath>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-netty-util</artifactId>
<packaging>bundle</packaging>
- <version>1.6.
0
-SNAPSHOT</version>
+ <version>1.6.
1
-SNAPSHOT</version>
<name>${project.artifactId}</name>
<name>${project.artifactId}</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.siemens.ct.exi</groupId>
- <artifactId>exificient</artifactId>
- <version>1.0.1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<!-- compile dependencies -->
<dependency>
<dependencies>
<!-- compile dependencies -->
<dependency>
@@
-56,21
+46,18
@@
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
- <artifactId>sshd-
core
</artifactId>
+ <artifactId>sshd-
osgi
</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-netty</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-netty</artifactId>
</dependency>
+
<dependency>
<dependency>
- <groupId>com.siemens.ct.exi</groupId>
- <artifactId>exificient</artifactId>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>shaded-exificient</artifactId>
</dependency>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@
-86,7
+73,7
@@
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-encrypt-service</artifactId>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-encrypt-service</artifactId>
- <version>0.9.
0
-SNAPSHOT</version>
+ <version>0.9.
1
-SNAPSHOT</version>
</dependency>
<!-- test dependencies -->
</dependency>
<!-- test dependencies -->