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
/
switchmanager
/
pom.xml
diff --git
a/opendaylight/northbound/switchmanager/pom.xml
b/opendaylight/northbound/switchmanager/pom.xml
index e4447fee2d8528e75dbe0819b4a3a20303e56c92..a1932f521bcec302e30e4b77fb5d2cdfaa5afb8d 100644
(file)
--- a/
opendaylight/northbound/switchmanager/pom.xml
+++ b/
opendaylight/northbound/switchmanager/pom.xml
@@
-28,7
+28,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,8
@@
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.databind
,
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Web-ContextPath>/controller/nb/v2/switchmanager</Web-ContextPath>
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Web-ContextPath>/controller/nb/v2/switchmanager</Web-ContextPath>
@@
-75,7
+75,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
<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>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-85,13
+85,13
@@
<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>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>