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 "Fix for Bugs 324"
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
implementation
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
index b8e0938a5f0901c9d7b73de541543aa472fca217..ee9bc8922b08d6d0d045b0883d3e6a824601c489 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
@@
-14,7
+14,7
@@
<properties>
<zeromq.version>0.3.1</zeromq.version>
<properties>
<zeromq.version>0.3.1</zeromq.version>
- <jackson.version>
1.9.8
</jackson.version>
+ <jackson.version>
2.3.0
</jackson.version>
<stax.version>1.0.1</stax.version>
</properties>
<stax.version>1.0.1</stax.version>
</properties>
@@
-37,7
+37,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>
zeromq
-routingtable.implementation</artifactId>
+ <artifactId>
remoterpc
-routingtable.implementation</artifactId>
<!-- TODO: fix the version. Why is it not MD Sal project version?-->
<version>0.4.1-SNAPSHOT</version>
</dependency>
<!-- TODO: fix the version. Why is it not MD Sal project version?-->
<version>0.4.1-SNAPSHOT</version>
</dependency>
@@
-61,10
+61,6
@@
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-impl</artifactId>
</dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>yang-common</artifactId>
- </dependency>
<!-- Third Party -->
<dependency>
<!-- Third Party -->
<dependency>
@@
-84,16
+80,25
@@
<groupId> org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<groupId> org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
<dependency>
<dependency>
- <groupId>
org.codehaus.jackson
</groupId>
- <artifactId>jackson-
core-asl
</artifactId>
+ <groupId>
com.fasterxml.jackson.core
</groupId>
+ <artifactId>jackson-
annotations
</artifactId>
<version>${jackson.version}</version>
</dependency>
<version>${jackson.version}</version>
</dependency>
+
<dependency>
<dependency>
- <groupId>
org.codehaus.jackson
</groupId>
- <artifactId>jackson-
mapper-asl
</artifactId>
+ <groupId>
com.fasterxml.jackson.core
</groupId>
+ <artifactId>jackson-
core
</artifactId>
<version>${jackson.version}</version>
</dependency>
<version>${jackson.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
@@
-141,7
+146,7
@@
<Export-Package>
org.opendaylight.controller.config.yang.md.sal.remote.rpc,
org.opendaylight.controller.sal.connector.remoterpc,
<Export-Package>
org.opendaylight.controller.config.yang.md.sal.remote.rpc,
org.opendaylight.controller.sal.connector.remoterpc,
- org.opendaylight.controller.sal.connector.remoterpc.*
+ org.opendaylight.controller.sal.connector.remoterpc.*
,
</Export-Package>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
</instructions>
</Export-Package>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
</instructions>
@@
-152,7
+157,7
@@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>
0.5.9-SNAPSHOT
</version>
+ <version>
${yangtools.version}
</version>
<executions>
<execution>
<goals>
<executions>
<execution>
<goals>