Bug-5559: L2Switch distribution job does not work correctly
- replaced hard-coded versions with properties in parent pom
- removed/fixed redundant versions in pom
- when karaf was run from distribution job, it was throwing exceptions. Fixed root-cause which was that karaf.version was set to old version. Now letting this version flow from the parent
- verified using mininet that l2switch features are working as expected when launched from distribution job
Change-Id: Ib2e24fdf1b05e5c42285c3ffe749fca6fbee3617
Signed-off-by: Ajay <ajayl.bro@gmail.com>
diff --git a/addresstracker/implementation/pom.xml b/addresstracker/implementation/pom.xml
index 361ade7..e6e6ed9 100644
--- a/addresstracker/implementation/pom.xml
+++ b/addresstracker/implementation/pom.xml
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator-plugin</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${config.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
diff --git a/addresstracker/pom.xml b/addresstracker/pom.xml
index dce08c8..436ece2 100644
--- a/addresstracker/pom.xml
+++ b/addresstracker/pom.xml
@@ -13,7 +13,6 @@
<artifactId>addresstracker.aggregator</artifactId>
<groupId>org.opendaylight.l2switch.addresstracker</groupId>
- <version>0.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/arphandler/implementation/pom.xml b/arphandler/implementation/pom.xml
index 03fcab7..9a7ca5b 100644
--- a/arphandler/implementation/pom.xml
+++ b/arphandler/implementation/pom.xml
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator-plugin</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${config.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
diff --git a/arphandler/pom.xml b/arphandler/pom.xml
index b2c8347..6182088 100644
--- a/arphandler/pom.xml
+++ b/arphandler/pom.xml
@@ -13,7 +13,6 @@
<artifactId>arphandler.aggregator</artifactId>
<groupId>org.opendaylight.l2switch.arphandler</groupId>
- <version>0.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index 6721e68..9d863e7 100644
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -13,11 +13,6 @@
<prerequisites>
<maven>3.0</maven>
</prerequisites>
- <properties>
- <branding.version>1.3.0-SNAPSHOT</branding.version>
- <karaf.resources.version>1.7.0-SNAPSHOT</karaf.resources.version>
- <karaf.version>3.0.1</karaf.version>
- </properties>
<dependencies>
<!-- Basic Karaf dependencies -->
diff --git a/hosttracker/implementation/pom.xml b/hosttracker/implementation/pom.xml
index ea7e500..9673723 100644
--- a/hosttracker/implementation/pom.xml
+++ b/hosttracker/implementation/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator-plugin</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${config.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
diff --git a/hosttracker/model/pom.xml b/hosttracker/model/pom.xml
index 5e981f5..4146cb5 100644
--- a/hosttracker/model/pom.xml
+++ b/hosttracker/model/pom.xml
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.opendaylight.l2switch.addresstracker</groupId>
<artifactId>addresstracker-model</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller.model</groupId>
diff --git a/l2switch-main/implementation/pom.xml b/l2switch-main/implementation/pom.xml
index c05735f..a88e4d5 100644
--- a/l2switch-main/implementation/pom.xml
+++ b/l2switch-main/implementation/pom.xml
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator-plugin</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${config.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
diff --git a/l2switch-main/pom.xml b/l2switch-main/pom.xml
index 38d156c..93e1a48 100644
--- a/l2switch-main/pom.xml
+++ b/l2switch-main/pom.xml
@@ -13,7 +13,6 @@
<artifactId>main.aggregator</artifactId>
<groupId>org.opendaylight.l2switch.main</groupId>
- <version>0.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/loopremover/implementation/pom.xml b/loopremover/implementation/pom.xml
index 4336402..a606964 100644
--- a/loopremover/implementation/pom.xml
+++ b/loopremover/implementation/pom.xml
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator-plugin</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${config.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
diff --git a/loopremover/pom.xml b/loopremover/pom.xml
index d47acf6..0091bb0 100644
--- a/loopremover/pom.xml
+++ b/loopremover/pom.xml
@@ -13,7 +13,6 @@
<groupId>org.opendaylight.l2switch.loopremover</groupId>
<artifactId>loopremover.aggregator</artifactId>
- <version>0.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/packethandler/implementation/pom.xml b/packethandler/implementation/pom.xml
index 750e00a..472a603 100644
--- a/packethandler/implementation/pom.xml
+++ b/packethandler/implementation/pom.xml
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator-plugin</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>${config.version}</version>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
diff --git a/packethandler/pom.xml b/packethandler/pom.xml
index cca39d7..addac5a 100644
--- a/packethandler/pom.xml
+++ b/packethandler/pom.xml
@@ -13,7 +13,6 @@
<artifactId>packethandler.aggregator</artifactId>
<groupId>org.opendaylight.l2switch.packethandler</groupId>
- <version>0.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/parent/pom.xml b/parent/pom.xml
index c060ea7..5c5b9ae 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -16,9 +16,12 @@
<properties>
<codeGeneratorPath>src/main/yang-gen-code</codeGeneratorPath>
<configCodeGeneratorPath>src/main/yang-gen-config</configCodeGeneratorPath>
- <nexus_proxy>http://nexus.opendaylight.org/content</nexus_proxy>
- <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
+ <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+ <branding.version>1.3.0-SNAPSHOT</branding.version>
+ <karaf.resources.version>1.7.0-SNAPSHOT</karaf.resources.version>
+ <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
<mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+ <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
<yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
<jung2.version>2.0.1</jung2.version>
<config.version>0.5.0-SNAPSHOT</config.version>
@@ -45,14 +48,14 @@
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${mdsal.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>mdsal-model-artifacts</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>${mdsal.model.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -66,7 +69,7 @@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>${mdsal.version}</version>
+ <version>${controller.mdsal.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
diff --git a/pom.xml b/pom.xml
index 463454f..33609ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,6 @@
<module>features</module>
<module>artifacts</module>
</modules>
- <properties>
- <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
- </properties>
<scm>
<connection>scm:git:ssh://git.opendaylight.org:29418/l2switch.git</connection>
<developerConnection>scm:git:ssh://git.opendaylight.org:29418/l2switch.git</developerConnection>