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 "Declare a urlPrefix for reuse in NorthboundIT."
[controller.git]
/
opendaylight
/
northbound
/
integrationtest
/
pom.xml
diff --git
a/opendaylight/northbound/integrationtest/pom.xml
b/opendaylight/northbound/integrationtest/pom.xml
index 4e1de914f7677e649f291a86d1dea69b368bddba..d1815bbf8c80b0ca4f8eaec2f520061609805bc2 100644
(file)
--- a/
opendaylight/northbound/integrationtest/pom.xml
+++ b/
opendaylight/northbound/integrationtest/pom.xml
@@
-49,7
+49,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>0.
5.1
-SNAPSHOT</version>
+ <version>0.
7.0
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-134,7
+134,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
- <version>0.
6.1
-SNAPSHOT</version>
+ <version>0.
7.0
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-266,26
+266,32
@@
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
+
<dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
</dependency>
+
<dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>${jackson.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
</dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+
<dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>${jackson.version}</version>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
</dependency>
+
<dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>${jackson.version}</version>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
</dependency>
+
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
@@
-672,11
+678,7
@@
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
- </dependency>
+
<dependency>
<groupId>eclipselink</groupId>
<artifactId>javax.resource</artifactId>
<dependency>
<groupId>eclipselink</groupId>
<artifactId>javax.resource</artifactId>