Migrate to odlparent 1.9.0

Also remove bgpcep from K3 distro as it has issues in this version.

Change-Id: Idf46a3c9c9fa99b8926e5f1788659263a33c1727
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index ce89cf663aaa9b3a59355e605da92cbe0c226a04..08fb8670d0809cc9a74ae6d9be3b7bf013a8f7d7 100644 (file)
--- a/artifacts/all/pom.xml
+++ b/artifacts/all/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.8.0-Carbon</version>
+      <version>1.9.0</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index 28a17e5f76b7736ab8528d0aac09a27b4e6e5e78..b2f75f0e40e970a6dac63daa2470981e5f70c616 100644 (file)
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.8.0-Carbon</version>
+      <version>1.9.0</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 2f3cf47d16ce3ba45e39e69c41782941b620f2af..eddf22380413e0a2772833329658e90d3286d8c0 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index 30bf040ff433177750f9c70e025e217438f33a40..38c4f43166b12707df32341d9ee1c70e74992789 100644 (file)
--- a/artifacts/upstream/all/pom.xml
+++ b/artifacts/upstream/all/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.8.0-Carbon</version>
+      <version>1.9.0</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 8349194dddfbd5018bee620908c033476b3c8468..b08c8888ad11e9c8c345acd8f66a24b47b79252a 100644 (file)
--- a/artifacts/upstream/pom.xml
+++ b/artifacts/upstream/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.8.0-Carbon</version>
+      <version>1.9.0</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 3807b3072488299b9efa394868d8e42fd8752cbc..548c716a77ed2fde5e6f805058b895408d5414ee 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -76,7 +76,7 @@
         <nic.version>1.4.0-SNAPSHOT</nic.version>
         <neutron.version>0.9.0-SNAPSHOT</neutron.version>
         <ocpplugin.version>0.3.0-SNAPSHOT</ocpplugin.version>
-        <odlparent.version>1.8.0-Carbon</odlparent.version>
+        <odlparent.version>1.9.0</odlparent.version>
         <of-config.version>1.3.0-SNAPSHOT</of-config.version>
         <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 05126f8ac1e3874a5a6276cb851aefac1b2d30a3..f74a8461907cb7a0dfba499913fbce237afd8b06 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/pom.xml b/features/pom.xml
index 4b3f7ec8c217643b5c581fb0967ef76dfebc497b..0a56f0c4cf73b6c94969bb7ce3140de1fa9c69a1 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/distribution/pom.xml b/features/repos/distribution/pom.xml
index dda0af08472238b52f5ba3467545e2b116776439..2a33e69ecb1b81f3eb3267a2b8b9ac701ca4ac4b 100644 (file)
--- a/features/repos/distribution/pom.xml
+++ b/features/repos/distribution/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 4c88714c072b46acad2ddcfdc54454e2b472bee3..e85099b69483952114c6825d8de8d09bd578b163 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index 095f5d1a7c2330872694156064c6178bd88be15c..e71cfeecfa88a88dc4b6cc468aa946c1b8da3a49 100644 (file)
--- a/features/repos/pom.xml
+++ b/features/repos/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index ea2ae4b5ac88264cf81d3e067f2ca5952198462a..4a0536cf6822c9dff34ba6dff079a05468ae3986 100644 (file)
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/odl-distribution-version/pom.xml b/features/singles/odl-distribution-version/pom.xml
index f539b43e0e959090889d380b9e0172083a63be51..b00a46056773d5a2db045653c2b026c088b08c1f 100644 (file)
--- a/features/singles/odl-distribution-version/pom.xml
+++ b/features/singles/odl-distribution-version/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index d784b909feb98ef51bc521e64cb11073ef59204e..d8ecd20f28149ace71684050f83ee7148fc23a76 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 23ddd8eb35a841787b5e08d2a2a5128d4052b8c7..0aa8d71b6edac719a4f7f237227caa7f7cb463ea 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 2ce37abf4bec57b35afe2a0bcfddd035294d7ac4..73e9238469f28b453621c351cfb1122dcf1cb197 100644 (file)
--- a/features/singles/pom.xml
+++ b/features/singles/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features3-distribution/pom.xml b/features3-distribution/pom.xml
index f55b29f2c5fd761e42d1580acb8c547a5b347239..9eaaeb8507a78c625b0be9f624f1027e15da2fde 100644 (file)
--- a/features3-distribution/pom.xml
+++ b/features3-distribution/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>features-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 3de03ce18869fbce258ef5de444a5d897ad5487f..5ab57b783763aa09549b1d46609f657bdf615c45 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>features-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -80,6 +80,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- bgpcep has issues bumping odlparent version
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-bgp</artifactId>
@@ -110,6 +111,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>features-bier</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index 461a730af92463f4b1d96855596640f97e3ca54c..c90b1fefd84ab22e5c73e2517e3a719de6e6bbc3 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -33,11 +33,13 @@
     <repository>mvn:org.opendaylight.aaa/features-aaa/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.alto/features-alto-release/{{VERSION}}/xml/features</repository>
+    <!-- bgpcep has issues bumping odlparent version
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bmp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-extras/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-pcep/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/{{VERSION}}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.bier/features-bier/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.cardinal/cardinal-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-extras/{{VERSION}}/xml/features</repository>

diff --git a/features3-test/pom.xml b/features3-test/pom.xml
index 4ada3eb7e08edb6d23fc876bf6e09d0f5daef1c9..f858abd657e88c5192c16d209ed1c6f2f2d3a42b 100644 (file)
--- a/features3-test/pom.xml
+++ b/features3-test/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>features-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index d651cb94b412df34c51778a7954fe19e55d1fd2c..b36878d66c0f3540729602e1780a5c41e68fec87 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -59,10 +59,12 @@
         <!-- Please use alphabetical order to add a compatible with all features -->
         <feature>odl-aaa-shiro</feature>
         <feature>odl-aaa-netconf-plugin</feature>
+        <!-- bgpcep has issues bumping odlparent version
         <feature>odl-bgpcep-bgp</feature>
         <feature>odl-bgpcep-bmp</feature>
         <feature>odl-bgpcep-pcep</feature>
         <feature>odl-bgpcep-rsvp</feature>
+        -->
         <feature>odl-cardinal</feature>
         <feature>odl-didm-all</feature>
         <feature>odl-dlux-core</feature>
@@ -118,7 +120,9 @@
     <feature name='odl-integration-all' version='${project.version}'>
         <!-- Please use alphabetical order for non-compatible features -->
         <feature>odl-alto-release</feature>
+        <!-- bgpcep has issues bumping odlparent version and bier uses bgpcep
         <feature>odl-bier-all</feature>
+        -->
         <feature>odl-faas-base</feature>
         <feature>odl-genius-rest</feature>
         <feature>odl-groupbasedpolicy-faas</feature>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 253d8074eb18a8b26bb22ced9076947df5ed1392..46a0b298efcb83aeb241feb64f26f49d83000821 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/pom.xml b/pom.xml
index 53657e7a47337e798fb916b8abe16558c8a3a400..be817592fd65f948c043baa0f2a27e76882bba2f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/version/pom.xml b/version/pom.xml
index 868ccb632695e0482307b25c0d1df1ea7e51d6d3..90f209faea9775a48a659e9de803d03234c458bb 100644 (file)
--- a/version/pom.xml
+++ b/version/pom.xml
@@ -41,6 +41,6 @@
     </scm>
     <!-- Is there a way to inherit/include properties from a file bumped autimatically? -->
     <properties>
-        <feature.odlparent.version>1.8.0-Carbon</feature.odlparent.version>
+        <feature.odlparent.version>1.9.0</feature.odlparent.version>
     </properties>
 </project>