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 "Upgrade jackson library to version 2.3.0"
[controller.git]
/
opendaylight
/
northbound
/
controllermanager
/
pom.xml
diff --git
a/opendaylight/northbound/controllermanager/pom.xml
b/opendaylight/northbound/controllermanager/pom.xml
index d1299a2559830b3ce10ddb3437cacad9765b39de..8c3279e6c7b6857630bb5e7855b93cfd1064f906 100644
(file)
--- a/
opendaylight/northbound/controllermanager/pom.xml
+++ b/
opendaylight/northbound/controllermanager/pom.xml
@@
-27,7
+27,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>
${sal.version}
</version>
</dependency>
</dependencies>
</plugin>
</dependency>
</dependencies>
</plugin>
@@
-59,8
+59,9
@@
javax.xml.bind,
org.slf4j,
org.apache.catalina.filters,
javax.xml.bind,
org.slf4j,
org.apache.catalina.filters,
- org.codehaus.jackson.jaxrs,
- org.codehaus.jackson.annotate,
+ com.fasterxml.jackson.annotation,
+ com.fasterxml.jackson.jaxrs.base,
+ com.fasterxml.jackson.jaxrs.json,
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Web-ContextPath>/controller/nb/v2/controllermanager</Web-ContextPath>
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Web-ContextPath>/controller/nb/v2/controllermanager</Web-ContextPath>
@@
-75,30
+76,30
@@
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
<artifactId>com.sun.jersey.jersey-servlet</artifactId>
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
<artifactId>com.sun.jersey.jersey-servlet</artifactId>
- <version>
1.18-SNAPSHOT
</version>
+ <version>
${jersey-servlet.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
- <version>
0.5.1-SNAPSHOT
</version>
+ <version>
${containermanager.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
- <version>
0.6.1-SNAPSHOT
</version>
+ <version>
${switchmanager.api.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
</dependency>
<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>commons.northbound</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.northbound</artifactId>
- <version>
0.4.1-SNAPSHOT
</version>
+ <version>
${commons.northbound.version}
</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-120,7
+121,7
@@
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
<artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
<dependency>
<groupId>org.opendaylight.controller.thirdparty</groupId>
<artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
- <version>
7.0.43-SNAPSHOT
</version>
+ <version>
${corsfilter.version}
</version>
</dependency>
</dependencies>
</project>
</dependency>
</dependencies>
</project>