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 "Declare a property for commons-lang version in poms and use it."
[controller.git]
/
opendaylight
/
northbound
/
integrationtest
/
pom.xml
diff --git
a/opendaylight/northbound/integrationtest/pom.xml
b/opendaylight/northbound/integrationtest/pom.xml
index 88cff5ed835e1475e7c0f7acaf80e40b06ca348b..f0c04ae5e2bde9d3264dbb3a256b834239a70d16 100644
(file)
--- a/
opendaylight/northbound/integrationtest/pom.xml
+++ b/
opendaylight/northbound/integrationtest/pom.xml
@@
-120,12
+120,12
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
5
.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>containermanager.implementation</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <artifactId>containermanager.i
t.i
mplementation</artifactId>
+ <version>0.
5
.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-278,6
+278,11
@@
<artifactId>jackson-jaxrs</artifactId>
<version>${jackson.version}</version>
</dependency>
<artifactId>jackson-jaxrs</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
@@
-438,7
+443,7
@@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>
3.1
</version>
+ <version>
${commons.lang.version}
</version>
</dependency>
<dependency>
<groupId>virgomirror</groupId>
</dependency>
<dependency>
<groupId>virgomirror</groupId>