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 dependency to 2.0.0
[netconf.git]
/
restconf
/
sal-rest-connector
/
pom.xml
diff --git
a/restconf/sal-rest-connector/pom.xml
b/restconf/sal-rest-connector/pom.xml
index 26528b81b8f30e80aac57e9e582b59f99b092082..97b93bc7844cd037a3bdee7c5c01a3f83fe5d823 100644
(file)
--- a/
restconf/sal-rest-connector/pom.xml
+++ b/
restconf/sal-rest-connector/pom.xml
@@
-32,12
+32,18
@@
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
- <version>2.
4
</version>
+ <version>2.
6
</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+ <artifactId>jersey-guava</artifactId>
+ <version>2.6</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-connector-api</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-connector-api</artifactId>
@@
-150,17
+156,19
@@
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
</dependency>
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+
+ <!-- Remove this once odlparent provides it -->
+ <version>2.3.2</version>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </dependency>
-
<!-- Testing Dependencies -->
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<!-- Testing Dependencies -->
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>