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 "Use Java 7 new method getLoopbackAddress in ClusterManager"
[controller.git]
/
opendaylight
/
northbound
/
flowprogrammer
/
pom.xml
diff --git
a/opendaylight/northbound/flowprogrammer/pom.xml
b/opendaylight/northbound/flowprogrammer/pom.xml
index 1b81ccb450f71a9050739830c3e57758e0a43fc4..565bd5f6aa1961452041069baa57f5fd5b997615 100644
(file)
--- a/
opendaylight/northbound/flowprogrammer/pom.xml
+++ b/
opendaylight/northbound/flowprogrammer/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>
@@
-57,7
+57,8
@@
javax.xml.bind.annotation,
javax.xml.bind,
org.slf4j,
javax.xml.bind.annotation,
javax.xml.bind,
org.slf4j,
- 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,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>
@@
-83,12
+84,12
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
- <version>
0.4.1-SNAPSHOT
</version>
+ <version>
${forwardingrulesmanager.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>
0.7.0-SNAPSHOT
</version>
+ <version>
${sal.version}
</version>
</dependency>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
</dependency>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
@@
-98,7
+99,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>