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 "Update to new version of ADSAL components and its dependencies proposed by...
[controller.git]
/
opendaylight
/
web
/
root
/
pom.xml
diff --git
a/opendaylight/web/root/pom.xml
b/opendaylight/web/root/pom.xml
index 85388d9b05f70587f6ba5006590411fac1363a25..1a801a2fe41517b907cbae2662973e993b2589f9 100644
(file)
--- a/
opendaylight/web/root/pom.xml
+++ b/
opendaylight/web/root/pom.xml
@@
-61,10
+61,9
@@
org.apache.taglibs.standard.tag.rt.fmt,
org.apache.taglibs.standard.tei,
org.apache.taglibs.standard.tlv,
org.apache.taglibs.standard.tag.rt.fmt,
org.apache.taglibs.standard.tei,
org.apache.taglibs.standard.tlv,
- org.codehaus.jackson,
- org.codehaus.jackson.annotate,
- org.codehaus.jackson.map,
- org.codehaus.jackson.map.annotate,
+ com.fasterxml.jackson.core,
+ com.fasterxml.jackson.databind,
+ com.fasterxml.jackson.annotation,
org.osgi.framework,
org.slf4j,
org.springframework.beans,
org.osgi.framework,
org.slf4j,
org.springframework.beans,
@@
-98,7
+97,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>clustering.services</artifactId>
- <version>0.
4.1
-SNAPSHOT</version>
+ <version>0.
5.0
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-113,7
+112,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>0.
7.0
-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>