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 curious hard-coded yangtools 2.1.8 which seems no longer needed
[netconf.git]
/
netconf
/
mdsal-netconf-connector
/
pom.xml
diff --git
a/netconf/mdsal-netconf-connector/pom.xml
b/netconf/mdsal-netconf-connector/pom.xml
index 0e263d81232f433cfbe66d3f4720bf7b30325783..71900e2307aa70b25a967d8065da324d1f5ccb5d 100644
(file)
--- a/
netconf/mdsal-netconf-connector/pom.xml
+++ b/
netconf/mdsal-netconf-connector/pom.xml
@@
-10,38
+10,26
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
config
-parent</artifactId>
- <version>
0
.6.0-SNAPSHOT</version>
- <relativePath
/
>
+ <groupId>org.opendaylight.
netconf
</groupId>
+ <artifactId>
netconf
-parent</artifactId>
+ <version>
1
.6.0-SNAPSHOT</version>
+ <relativePath
>../netconf-parent</relativePath
>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>mdsal-netconf-connector</artifactId>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>mdsal-netconf-connector</artifactId>
- <version>1.
2
.0-SNAPSHOT</version>
+ <version>1.
6
.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<packaging>bundle</packaging>
<name>${project.artifactId}</name>
<packaging>bundle</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-subsystem</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<dependencies>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
- <artifactId>yang-data-
imp
l</artifactId>
+ <artifactId>yang-data-
uti
l</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
- <artifactId>
object-cache-noop
</artifactId>
+ <artifactId>
yang-data-impl
</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-58,7
+46,7
@@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>netconf-tcp</artifactId>
+ <artifactId>
mdsal-
netconf-tcp</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@
-69,10
+57,6
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-core-api</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-core-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-dom-config</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>mockito-configuration</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>mockito-configuration</artifactId>
@@
-81,21
+65,13
@@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>config-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>config-api</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>ietf-netconf</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>ietf-netconf</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-
distributed-datastore
</artifactId>
+ <artifactId>sal-
broker-impl
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-105,13
+81,17
@@
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
+ <groupId>
org.
xmlunit</groupId>
+ <artifactId>xmlunit
-legacy
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-test-util</artifactId>
</dependency>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-test-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-codec-xml</artifactId>
+ </dependency>
</dependencies>
</project>
</dependencies>
</project>