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 "Resolve Bug:522"
[controller.git]
/
opendaylight
/
northbound
/
networkconfiguration
/
neutron
/
pom.xml
diff --git
a/opendaylight/northbound/networkconfiguration/neutron/pom.xml
b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
index d54f2c5b2860ca6f2514ea1ca4420b2280132c84..774a12547944e9b943dde61a31535d1efe150960 100644
(file)
--- a/
opendaylight/northbound/networkconfiguration/neutron/pom.xml
+++ b/
opendaylight/northbound/networkconfiguration/neutron/pom.xml
@@
-3,11
+3,10
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.
1
-SNAPSHOT</version>
+ <version>1.4.
2
-SNAPSHOT</version>
<relativePath>../../../commons/opendaylight</relativePath>
</parent>
<properties>
<relativePath>../../../commons/opendaylight</relativePath>
</parent>
<properties>
- <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
<enunciate.version>1.26.2</enunciate.version>
</properties>
<scm>
<enunciate.version>1.26.2</enunciate.version>
</properties>
<scm>
@@
-21,12
+20,12
@@
<!-- OpenDayLight Released artifact -->
<repository>
<id>opendaylight-release</id>
<!-- OpenDayLight Released artifact -->
<repository>
<id>opendaylight-release</id>
- <url>${nexusproxy}/repositories/
opendaylight.release
/</url>
+ <url>${nexusproxy}/repositories/
${nexus.repository.release}
/</url>
</repository>
<!-- OpenDayLight Snapshot artifact -->
<snapshotRepository>
<id>opendaylight-snapshot</id>
</repository>
<!-- OpenDayLight Snapshot artifact -->
<snapshotRepository>
<id>opendaylight-snapshot</id>
- <url>${nexusproxy}/repositories/
opendaylight.snapshot
/</url>
+ <url>${nexusproxy}/repositories/
${nexus.repository.snapshot}
/</url>
</snapshotRepository>
<!-- Site deployment -->
<site>
</snapshotRepository>
<!-- Site deployment -->
<site>
@@
-34,9
+33,8
@@
<url>${sitedeploy}</url>
</site>
</distributionManagement>
<url>${sitedeploy}</url>
</site>
</distributionManagement>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>networkconfig.neutron.northbound</artifactId>
<artifactId>networkconfig.neutron.northbound</artifactId>
- <version>0.4.
1
-SNAPSHOT</version>
+ <version>0.4.
2
-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
<packaging>bundle</packaging>
<build>
@@
-89,42
+87,34
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>containermanager</artifactId>
- <version>${containermanager.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
- <version>${sal.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.northbound</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.northbound</artifactId>
- <version>${commons.northbound.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>networkconfig.neutron</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>networkconfig.neutron</artifactId>
- <version>0.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.enunciate</groupId>
<artifactId>enunciate-core-annotations</artifactId>
- <version>${enunciate.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
- <version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.core</artifactId>
- <version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.antlr</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.antlr</artifactId>
- <version>2.5.0</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>