Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-1601 Fix null pointer in netconf connector for empty schemas node"
[controller.git]
/
features
/
mdsal
/
pom.xml
diff --git
a/features/mdsal/pom.xml
b/features/mdsal/pom.xml
index e7b825c48b1173b783291e3e2a1797c4cea64ebc..5be0061698ab3947d63323cd3390ebdc8771dd7b 100644
(file)
--- a/
features/mdsal/pom.xml
+++ b/
features/mdsal/pom.xml
@@
-83,6
+83,9
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>md-sal-config</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>md-sal-config</artifactId>
+ <version>${mdsal.version}</version>
+ <type>xml</type>
+ <classifier>config</classifier>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-99,6
+102,9
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-connector-config</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-connector-config</artifactId>
+ <version>${netconf.version}</version>
+ <type>xml</type>
+ <classifier>config</classifier>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-117,8
+123,8
@@
<artifactId>jersey-server</artifactId>
</dependency>
<dependency>
<artifactId>jersey-server</artifactId>
</dependency>
<dependency>
- <groupId>
org.opendaylight.controller.thirdpart
y</groupId>
- <artifactId>
com.sun.jersey.
jersey-servlet</artifactId>
+ <groupId>
com.sun.jerse
y</groupId>
+ <artifactId>jersey-servlet</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@
-151,6
+157,9
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-rest-connector-config</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-rest-connector-config</artifactId>
+ <version>${mdsal.version}</version>
+ <type>xml</type>
+ <classifier>config</classifier>
</dependency>
<dependency>
<groupId>org.opendaylight.controller.samples</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller.samples</groupId>
@@
-167,6
+176,9
@@
<dependency>
<groupId>org.opendaylight.controller.samples</groupId>
<artifactId>toaster-config</artifactId>
<dependency>
<groupId>org.opendaylight.controller.samples</groupId>
<artifactId>toaster-config</artifactId>
+ <version>${mdsal.version}</version>
+ <type>xml</type>
+ <classifier>config</classifier>
</dependency>
<!-- test to validate features.xml -->
<dependency>
</dependency>
<!-- test to validate features.xml -->
<dependency>