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 "Add test for generated code checking list of dependencies."
[controller.git]
/
opendaylight
/
samples
/
northbound
/
loadbalancer
/
pom.xml
diff --git
a/opendaylight/samples/northbound/loadbalancer/pom.xml
b/opendaylight/samples/northbound/loadbalancer/pom.xml
index a6b85d26f79f41e285365a2c16f1280fa4df6d4a..1bbc5bf23efad487b6242cf48e444d76d78b5ec0 100644
(file)
--- a/
opendaylight/samples/northbound/loadbalancer/pom.xml
+++ b/
opendaylight/samples/northbound/loadbalancer/pom.xml
@@
-59,7
+59,8
@@
javax.xml.bind,
org.slf4j,
org.apache.catalina.filters,
javax.xml.bind,
org.slf4j,
org.apache.catalina.filters,
- org.codehaus.jackson.jaxrs,
+ com.fasterxml.jackson.jaxrs.base,
+ com.fasterxml.jackson.jaxrs.json,
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Web-ContextPath>/one/nb/v2/lb</Web-ContextPath>
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Web-ContextPath>/one/nb/v2/lb</Web-ContextPath>
@@
-71,11
+72,6
@@
</plugins>
</build>
<dependencies>
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.opendaylight.controller.thirdparty</groupId>
- <artifactId>com.sun.jersey.jersey-servlet</artifactId>
- <version>1.18-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
@@
-84,12
+80,12
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>hosttracker</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>hosttracker</artifactId>
- <version>
0.4.1-SNAPSHOT
</version>
+ <version>
${hosttracker.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>samples.loadbalancer</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>samples.loadbalancer</artifactId>
- <version>
0.4.1-SNAPSHOT
</version>
+ <version>
${samples.loadbalancer}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-106,10
+102,5
@@
<artifactId>enunciate-core-annotations</artifactId>
<version>${enunciate.version}</version>
</dependency>
<artifactId>enunciate-core-annotations</artifactId>
<version>${enunciate.version}</version>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller.thirdparty</groupId>
- <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
- <version>7.0.43-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
</dependencies>
</project>