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 "Use Java 7 new method getLoopbackAddress in ClusterManager"
[controller.git]
/
opendaylight
/
northbound
/
commons
/
pom.xml
diff --git
a/opendaylight/northbound/commons/pom.xml
b/opendaylight/northbound/commons/pom.xml
index 8e769a23499edacd822f4b6a6a2375ecc3a401a3..2169f3f3e7c679670f24c94516217fe9bbceaf9b 100644
(file)
--- a/
opendaylight/northbound/commons/pom.xml
+++ b/
opendaylight/northbound/commons/pom.xml
@@
-52,9
+52,10
@@
org.osgi.service.packageadmin,
org.osgi.util.tracker,
javax.servlet.http,
org.osgi.service.packageadmin,
org.osgi.util.tracker,
javax.servlet.http,
- org.codehaus.jackson,
- org.codehaus.jackson.jaxrs,
- org.codehaus.jackson.map,
+ com.fasterxml.jackson.core,
+ com.fasterxml.jackson.databind,
+ com.fasterxml.jackson.jaxrs.base,
+ com.fasterxml.jackson.jaxrs.json,
org.slf4j
</Import-Package>
</instructions>
org.slf4j
</Import-Package>
</instructions>
@@
-71,30
+72,44
@@
<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>
${sal.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>usermanager</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>usermanager</artifactId>
- <version>
0.4.1-SNAPSHOT
</version>
+ <version>
${usermanager.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>bundlescanner</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>bundlescanner</artifactId>
- <version>
0.4.1-SNAPSHOT
</version>
+ <version>
${bundlescanner.version}
</version>
</dependency>
</dependency>
+
<dependency>
<dependency>
-
<groupId>org.codehaus.jackson
</groupId>
-
<artifactId>jackson-core-asl
</artifactId>
+
<groupId>com.fasterxml.jackson.core
</groupId>
+
<artifactId>jackson-annotations
</artifactId>
</dependency>
</dependency>
+
<dependency>
<dependency>
-
<groupId>org.codehaus.jackson
</groupId>
-
<artifactId>jackson-mapper-asl
</artifactId>
+
<groupId>com.fasterxml.jackson.core
</groupId>
+
<artifactId>jackson-core
</artifactId>
</dependency>
</dependency>
+
<dependency>
<dependency>
- <groupId>
org.codehaus.jackson
</groupId>
- <artifactId>jackson-
jaxrs
</artifactId>
+ <groupId>
com.fasterxml.jackson.core
</groupId>
+ <artifactId>jackson-
databind
</artifactId>
</dependency>
</dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@
-114,10
+129,6
@@
<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>
+
</dependencies>
</project>
</dependencies>
</project>