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 "Unitests: remove conditions that are always true/false."
[controller.git]
/
opendaylight
/
northbound
/
staticrouting
/
pom.xml
diff --git
a/opendaylight/northbound/staticrouting/pom.xml
b/opendaylight/northbound/staticrouting/pom.xml
index d169de9f2af44372d4099adb6015c82b14d8d85e..c020e6b2a24e32226c96b4892a5530a2257feb2e 100644
(file)
--- a/
opendaylight/northbound/staticrouting/pom.xml
+++ b/
opendaylight/northbound/staticrouting/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>
@@
-57,7
+57,8
@@
javax.xml.bind.annotation,
javax.xml.bind,
org.apache.catalina.filters,
javax.xml.bind.annotation,
javax.xml.bind,
org.apache.catalina.filters,
- org.codehaus.jackson.jaxrs,
+ com.fasterxml.jackson.jaxrs.base,
+ com.fasterxml.jackson.jaxrs.json,
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Export-Package>
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Export-Package>
@@
-74,12
+75,12
@@
<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>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>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-94,7
+95,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.northbound</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.northbound</artifactId>
- <version>
0.4.1-SNAPSHOT
</version>
+ <version>
${commons.northbound.version}
</version>
</dependency>
<dependency>
<groupId>junit</groupId>
</dependency>
<dependency>
<groupId>junit</groupId>