Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove superfluous version/groupId declarations
[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 89f2c85190e26b58d803c579c10e647e9e1dd6fc..4c89f6439eb6eaa6ce55400b782502c456ef02ae 100644
(file)
--- a/
netconf/netconf-netty-util/pom.xml
+++ b/
netconf/netconf-netty-util/pom.xml
@@
-12,36
+12,20
@@
<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>
- <relativePath>../
netconf-
parent</relativePath>
+ <version>
2.0
.0-SNAPSHOT</version>
+ <relativePath>../
../
parent</relativePath>
</parent>
</parent>
- <groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-netty-util</artifactId>
<packaging>bundle</packaging>
<artifactId>netconf-netty-util</artifactId>
<packaging>bundle</packaging>
- <version>1.6.0-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>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-api</artifactId>
</dependency>
<dependencies>
<!-- compile dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-api</artifactId>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>netconf-mapping-api</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-util</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-util</artifactId>
@@
-54,31
+38,16
@@
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-netty</artifactId>
- </dependency>
<dependency>
<dependency>
- <groupId>
com.siemens.ct.exi
</groupId>
- <artifactId>exificient</artifactId>
+ <groupId>
org.opendaylight.netconf
</groupId>
+ <artifactId>
shaded-
exificient</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <!-- Override until exificient ships a newer version -->
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.12.0</version>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>shaded-sshd</artifactId>
</dependency>
</dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@
-94,7
+63,6
@@
<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>
</dependency>
<!-- test dependencies -->
</dependency>
<!-- test dependencies -->