Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove version mismatch in config.version
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
integrationtest
/
test-it
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
index 4305a283e2f0ac2e374629005c85fd0dbc65c7e2..4c7e15dbb033f127518564a47e7c8db0743acc62 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
@@
-14,10
+14,9
@@
</scm>
<properties>
</scm>
<properties>
+ <jackson.version>2.3.0</jackson.version>
<exam.version>3.0.0</exam.version>
<url.version>1.5.0</url.version>
<exam.version>3.0.0</exam.version>
<url.version>1.5.0</url.version>
- <config.version>0.2.3-SNAPSHOT</config.version>
- <netconf.version>0.2.3-SNAPSHOT</netconf.version>
</properties>
<dependencyManagement>
</properties>
<dependencyManagement>
@@
-49,7
+48,7
@@
</plugins>
<pluginManagement>
<plugins>
</plugins>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse
+ <!--This plugin's configuration is used to store Eclipse
m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@
-202,12
+201,12
@@
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-api</artifactId>
</dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-data-api</artifactId>
</dependency>
- <!--dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId>
- <version>
0.5.9-SNAPSHOT
</version> </dependency -->
+ <!--dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId>
+ <version>
${yangtools.version}
</version> </dependency -->
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-parser-impl</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-parser-impl</artifactId>
- <version>
0.5.9-SNAPSHOT
</version>
+ <version>
${yangtools.version}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-317,9
+316,8
@@
<version>0.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<version>0.5.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>ietf-netconf-monitoring</artifactId>
- <version>${netconf.version}</version>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>ietf-netconf-monitoring</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
@@
-328,12
+326,12
@@
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>yang-ext</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>yang-ext</artifactId>
- <version>2013.09.07.
1
</version>
+ <version>2013.09.07.
3
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>opendaylight-l2-types</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>opendaylight-l2-types</artifactId>
- <version>2013.08.27.
1
</version>
+ <version>2013.08.27.
3
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
@@
-389,20
+387,29
@@
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>
org.codehaus.jackson
</groupId>
- <artifactId>jackson-
mapper-asl
</artifactId>
- <version>
1.9.2
</version>
+ <groupId>
com.fasterxml.jackson.core
</groupId>
+ <artifactId>jackson-
databind
</artifactId>
+ <version>
${jackson.version}
</version>
</dependency>
</dependency>
+
<dependency>
<dependency>
- <groupId>
org.codehaus.jackson
</groupId>
- <artifactId>jackson-
core-asl
</artifactId>
- <version>
1.9.2
</version>
+ <groupId>
com.fasterxml.jackson.core
</groupId>
+ <artifactId>jackson-
annotations
</artifactId>
+ <version>
${jackson.version}
</version>
</dependency>
</dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.zeromq</groupId>
<artifactId>jeromq</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
<groupId>org.zeromq</groupId>
<artifactId>jeromq</artifactId>
<version>0.3.1</version>
</dependency>
+
<dependency>
<groupId>org.opendaylight.yangtools.thirdparty</groupId>
<artifactId>xtend-lib-osgi</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools.thirdparty</groupId>
<artifactId>xtend-lib-osgi</artifactId>
@@
-430,45
+437,34
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-netconf-connector</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-netconf-connector</artifactId>
- <version>${netconf.version}</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>yang-store-impl</artifactId>
- <version>${config.version}</version>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>logback-config</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>logback-config</artifactId>
- <version>${config.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-persister-impl</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-persister-impl</artifactId>
- <version>${config.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>config-persister-file-adapter</artifactId>
- <version>${config.version}</version>
+ <artifactId>config-persister-file-xml-adapter</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-impl</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-impl</artifactId>
- <version>${netconf.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-client</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>netconf-client</artifactId>
- <version>${netconf.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
<version>${exam.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
<version>${exam.version}</version>
- <!-- Compile scope here is intentional, it is used in TestHelper
- class which could be downloaded via nexus and reused in other integration
+ <!-- Compile scope here is intentional, it is used in TestHelper
+ class which could be downloaded via nexus and reused in other integration
tests. -->
<scope>compile</scope>
</dependency>
tests. -->
<scope>compile</scope>
</dependency>