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 "Add a container for pass-through netconf access"
[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 cb2f5482d6ad3ea683ddf38a6e39c5db385d4c1b..e06363d38576fde9b0aec1ca0932118a1d4eb8f0 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
@@
-6,7
+6,7
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<relativePath>../..</relativePath>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<relativePath>../..</relativePath>
- <version>1.
0
-SNAPSHOT</version>
+ <version>1.
1
-SNAPSHOT</version>
</parent>
<artifactId>sal-remoterpc-connector</artifactId>
</parent>
<artifactId>sal-remoterpc-connector</artifactId>
@@
-14,8
+14,8
@@
<properties>
<zeromq.version>0.3.1</zeromq.version>
<properties>
<zeromq.version>0.3.1</zeromq.version>
- <jackson.version>2.3.0</jackson.version>
<stax.version>1.0.1</stax.version>
<stax.version>1.0.1</stax.version>
+ <yang.jmx.plugin>0.2.4-SNAPSHOT</yang.jmx.plugin>
</properties>
<dependencies>
</properties>
<dependencies>
@@
-38,8
+38,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>remoterpc-routingtable.implementation</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>remoterpc-routingtable.implementation</artifactId>
- <!-- TODO: fix the version. Why is it not MD Sal project version?-->
- <version>0.4.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<!-- AD Sal -->
</dependency>
<!-- AD Sal -->
@@
-83,25
+82,21
@@
<dependency>
<groupId> ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<dependency>
<groupId> ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-127,12
+122,12
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${bundle.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>
*,
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>
*,
+ com.google.common.collect,
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Export-Package>
!org.codehaus.enunciate.jaxrs
</Import-Package>
<Export-Package>
@@
-152,7
+147,6
@@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${yangtools.version}</version>
<executions>
<execution>
<goals>
<executions>
<execution>
<goals>
@@
-184,12
+178,12
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator-plugin</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator-plugin</artifactId>
- <version>
0.2.3-SNAPSHOT
</version>
+ <version>
${yang.jmx.plugin}
</version>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
-
<version>0.6.0-SNAPSHOT
</version>
+
<version>${yangtools.version}
</version>
<type>jar</type>
</dependency>
</dependencies>
<type>jar</type>
</dependency>
</dependencies>