Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Integrate controller-2.0.1
[netconf.git]
/
netconf
/
sal-netconf-connector
/
pom.xml
diff --git
a/netconf/sal-netconf-connector/pom.xml
b/netconf/sal-netconf-connector/pom.xml
index 83c656c4adb8d8a5f4f91c888fa7f91be7af93f5..0f1ad85b3010c4aba6f92dbace2b7ab9d5efc976 100644
(file)
--- a/
netconf/sal-netconf-connector/pom.xml
+++ b/
netconf/sal-netconf-connector/pom.xml
@@
-11,15
+11,15
@@
<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>1.
9
.0-SNAPSHOT</version>
+ <relativePath>../
../
parent</relativePath>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
<!-- Preserve version from mdsal -->
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
<!-- Preserve version from mdsal -->
- <version>1.
9
.0-SNAPSHOT</version>
+ <version>1.
12
.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<packaging>bundle</packaging>
<dependencies>
@@
-27,10
+27,6
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-common-util</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-connector-api</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ietf-netconf-monitoring</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ietf-netconf-monitoring</artifactId>
@@
-57,15
+53,15
@@
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-
generator-impl
</artifactId>
+ <artifactId>mdsal-binding-
runtime-spi
</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.mdsal
.model
</groupId>
- <artifactId>
ietf-topology
</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>
mdsal-dom-spi
</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
sal-broker-impl
</artifactId>
+ <groupId>org.opendaylight.
mdsal.model
</groupId>
+ <artifactId>
ietf-topology
</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
@@
-90,7
+86,6
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-codec-xml</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-codec-xml</artifactId>
- <version>2.1.8</version>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
@@
-100,10
+95,20
@@
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>yang-ext</artifactId>
</dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>yang-ext</artifactId>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netconf-util</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-legacy</artifactId>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-legacy</artifactId>
@@
-126,14
+131,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-dom-adapter</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-dom-adapter</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>mdsal-binding-test-utils</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>