Migrate to odlparent 1.8.0-Carbon

Per request of odlparent project we are downgrading all Nitrogen
projects to use the released odlparent 1.8.0-Carbon to allow for the
odlparent project to start performing semver style releases.

Jira: RELENG-159
RT: 41406
Change-Id: Ib2554a901c944da375e5c842d0c9a224764db95f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/features/features-dlux/pom.xml b/features/features-dlux/pom.xml
index ab809b3dd25d6b09d0a9f395212ef5536a5f14be..2699c5fc248c198e0d98447e19e13032fafab610 100644 (file)
--- a/features/features-dlux/pom.xml
+++ b/features/features-dlux/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.8.0-Carbon</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.dlux</groupId>
@@ -22,12 +22,12 @@
       <dependency>
          <groupId>org.opendaylight.odlparent</groupId>
          <artifactId>features-test</artifactId>
-         <version>1.9.0-SNAPSHOT</version>
+         <version>1.8.0-Carbon</version>
       </dependency>
       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
+         <groupId>org.opendaylight.odlparent</groupId>
          <artifactId>opendaylight-karaf-empty</artifactId>
-         <version>1.9.0-SNAPSHOT</version>
+         <version>1.8.0-Carbon</version>
          <type>zip</type>
       </dependency>
       <dependency>

diff --git a/features/features4-dlux/pom.xml b/features/features4-dlux/pom.xml
index dff68d56b2967782f0e11f2962bafb6427de4428..b53f804fa543821617898c2596baea0f020845e4 100644 (file)
--- a/features/features4-dlux/pom.xml
+++ b/features/features4-dlux/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-dlux-core/pom.xml b/features/odl-dlux-core/pom.xml
index 38c3cb0db16db90a40cb622a70aad2045db26727..bb119d40f8d123114a455d2907a633327852c269 100644 (file)
--- a/features/odl-dlux-core/pom.xml
+++ b/features/odl-dlux-core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 59ad2bfb12bcca86222ad7cee707712c35cec28b..bc9fe8fb7ed1b4cf4fbc8eb864b820620b83c6c5 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.dlux</groupId>

diff --git a/pom.xml b/pom.xml
index 3455b2f3c1275056a8674ba0bfc4910a822c9dfb..a6a5d1bb402ba51571083b505b829fb200778c51 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.8.0-Carbon</version>
     <relativePath></relativePath>
   </parent>
 
@@ -16,7 +16,6 @@
   <name>dlux</name> <!-- Used by Sonar to set project name -->
 
   <properties>
-    <commons.opendaylight.version>1.9.0-SNAPSHOT</commons.opendaylight.version>
     <loader.resources.version>0.6.0-SNAPSHOT</loader.resources.version>
     <core.resources.version>0.6.0-SNAPSHOT</core.resources.version>
     <connection_manager.resources.version>0.6.0-SNAPSHOT</connection_manager.resources.version>
@@ -33,19 +32,16 @@
     <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
     <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
     <branding.version>1.5.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.9.0-SNAPSHOT</karaf.resources.version>
     <feature.l2switch.version>0.6.0-SNAPSHOT</feature.l2switch.version>
     <feature.aaa.version>0.6.0-SNAPSHOT</feature.aaa.version>
     <feature.openflowplugin.version>0.5.0-SNAPSHOT</feature.openflowplugin.version>
 
-    <feature.test.version>1.9.0-SNAPSHOT</feature.test.version>
     <feature.mdsal.version>1.6.0-SNAPSHOT</feature.mdsal.version>
     <feature.dlux.version>0.6.0-SNAPSHOT</feature.dlux.version>
     <feature.flow.version>1.6.0-SNAPSHOT</feature.flow.version>
     <feature.yangtools.version>1.2.0-SNAPSHOT</feature.yangtools.version>
     <apache.felix.osgi.compendium.version>1.4.0</apache.felix.osgi.compendium.version>
     <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
-    <karaf.empty.version>1.9.0-SNAPSHOT</karaf.empty.version>
   </properties>
 
   <modules>