Migrate to odlparent 1.9.0

For now, integration test is disabled to avoid patch dependency.
The test will be re-enabled by follow up patch,
https://git.opendaylight.org/gerrit/#/c/55128/

Change-Id: I618f31a1fdf4da1236454620e21b3a7435c81d11
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index dd6cdd2e727990cb65d18df5770c1080726927b6..9e376f32b14c11942358c1c97d5012bf268e923f 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/features/production/features-neutron/pom.xml b/features/production/features-neutron/pom.xml
index be88c3f4c3c86faef8f265ca6e16ddca841adeeb..5406253f04e23a4bc9613900258572a48798863a 100644 (file)
--- a/features/production/features-neutron/pom.xml
+++ b/features/production/features-neutron/pom.xml
@@ -4,7 +4,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.neutron</groupId>

diff --git a/features/production/features4-neutron/pom.xml b/features/production/features4-neutron/pom.xml
index 802d649ab3ba4cdf436fb40bfbd069b396e59a43..cff7d84405b5ec8e9d5598b32376d1f8e86dc009 100644 (file)
--- a/features/production/features4-neutron/pom.xml
+++ b/features/production/features4-neutron/pom.xml
@@ -8,7 +8,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>
 

diff --git a/features/production/odl-neutron-hostconfig-ovs/pom.xml b/features/production/odl-neutron-hostconfig-ovs/pom.xml
index 5130cbafb6f66a4fdb1932d8206916d79a72bffb..0d9c5681192c34f669bb51cc1ed57db5c80d0c08 100644 (file)
--- a/features/production/odl-neutron-hostconfig-ovs/pom.xml
+++ b/features/production/odl-neutron-hostconfig-ovs/pom.xml
@@ -8,7 +8,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>
 

diff --git a/features/production/odl-neutron-hostconfig-vpp/pom.xml b/features/production/odl-neutron-hostconfig-vpp/pom.xml
index 6dfd330649b50f93214146488f6177eb7007eb19..36ba18a491def71363ca91e0192e96183eb16201 100644 (file)
--- a/features/production/odl-neutron-hostconfig-vpp/pom.xml
+++ b/features/production/odl-neutron-hostconfig-vpp/pom.xml
@@ -8,7 +8,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>
 

diff --git a/features/production/odl-neutron-logger/pom.xml b/features/production/odl-neutron-logger/pom.xml
index 6c3bf411d5463b7bb0a886c391f9f4452e7f6495..5f1554e8c4e69c5f0f230a3a8532bdf136ca02b2 100644 (file)
--- a/features/production/odl-neutron-logger/pom.xml
+++ b/features/production/odl-neutron-logger/pom.xml
@@ -8,7 +8,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>
 

diff --git a/features/production/odl-neutron-northbound-api/pom.xml b/features/production/odl-neutron-northbound-api/pom.xml
index e59dc038a4860ddf4a5261daa581a971e93bb02a..8ba7cc01425237733f0e5ebe55c8cb3faa009b83 100644 (file)
--- a/features/production/odl-neutron-northbound-api/pom.xml
+++ b/features/production/odl-neutron-northbound-api/pom.xml
@@ -8,7 +8,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>
 

diff --git a/features/production/odl-neutron-service/pom.xml b/features/production/odl-neutron-service/pom.xml
index bd8e3fb4fa8e9205d99e97545fffdf6a5285eff2..d87cfee727c73ac9040f40c89ceca2c45ad202cb 100644 (file)
--- a/features/production/odl-neutron-service/pom.xml
+++ b/features/production/odl-neutron-service/pom.xml
@@ -8,7 +8,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>
 

diff --git a/features/production/odl-neutron-spi/pom.xml b/features/production/odl-neutron-spi/pom.xml
index d805bd9174d0adf5428c95bb1062793662429664..21e53fe86be052062a6889f0c0031149220f6a63 100644 (file)
--- a/features/production/odl-neutron-spi/pom.xml
+++ b/features/production/odl-neutron-spi/pom.xml
@@ -8,7 +8,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>
 

diff --git a/features/production/odl-neutron-transcriber/pom.xml b/features/production/odl-neutron-transcriber/pom.xml
index 568b7098495767b8c516350f5096975fb0530e1e..25dd8111dd888beede279714b66f67153ec2b0ca 100644 (file)
--- a/features/production/odl-neutron-transcriber/pom.xml
+++ b/features/production/odl-neutron-transcriber/pom.xml
@@ -8,7 +8,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>
 

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

diff --git a/features/test/features-neutron-test/pom.xml b/features/test/features-neutron-test/pom.xml
index c3551f0bc3e3deddffeafa4d33180f087368b547..ff193383396a05ad26df891f2832feb75fcd2c1b 100644 (file)
--- a/features/test/features-neutron-test/pom.xml
+++ b/features/test/features-neutron-test/pom.xml
@@ -4,7 +4,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.neutron</groupId>

diff --git a/features/test/features4-neutron-test/pom.xml b/features/test/features4-neutron-test/pom.xml
index 6a965c804868805dcdaa127126c36a5da793c8c3..706f822fad00cd63f6ca51cc812ad18fa3ed8e78 100644 (file)
--- a/features/test/features4-neutron-test/pom.xml
+++ b/features/test/features4-neutron-test/pom.xml
@@ -8,7 +8,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>
 

diff --git a/features/test/odl-neutron-logger-test/pom.xml b/features/test/odl-neutron-logger-test/pom.xml
index b67d095862caba33de610f305719cb6a68420c4d..07afd247a2f7846787304276be80876f1a9e2dea 100644 (file)
--- a/features/test/odl-neutron-logger-test/pom.xml
+++ b/features/test/odl-neutron-logger-test/pom.xml
@@ -8,7 +8,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>
 

diff --git a/features/test/pom.xml b/features/test/pom.xml
index e3dcc79de81855037fef22958e4f39d43d42a2d6..17802a95a38c3f11a699677236811847e2d3a77c 100644 (file)
--- a/features/test/pom.xml
+++ b/features/test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.8.0-Carbon</version>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 

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

diff --git a/integration/test/src/main/features4/pom.xml b/integration/test/src/main/features4/pom.xml
index 17580e705cf8151fd7107a2538f3b57ccdb20426..262bf70ffde79275c07a5bd20e72acc1e562ea2b 100644 (file)
--- a/integration/test/src/main/features4/pom.xml
+++ b/integration/test/src/main/features4/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
     </parent>
 
     <groupId>org.opendaylight.neutron</groupId>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index d66bf6c3595239d438014910972a95e2c31ab56f..ee792a394362fb553cf8c2d0f62067d16d284e3c 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf-parent</artifactId>
-    <version>1.8.0-Carbon</version>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/karaf4/pom.xml b/karaf4/pom.xml
index c4bbadd439ad923e511289d350eb772e01ab6ef1..8b48b9f15f1cb677e9e054428e3aeb0899d90856 100644 (file)
--- a/karaf4/pom.xml
+++ b/karaf4/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/parent/pom.xml b/parent/pom.xml
index 1ad96dac0e0715a6257c46a6c88c2044cb28aedc..5442d16742a6c6881ff47dbdbb531c89ed5e18a8 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.8.0-Carbon</version>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 56da3ae2010749abc2fd82942776892669d5eaf8..83757dd1c57632c673d926ee337ea0982de45a83 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
     <module>features/test</module>
     <module>karaf</module>
     <module>karaf4</module>
-    <module>integration/test</module>
+    <!-- <module>integration/test</module> -->
     <module>model</module>
     <module>neutron-hostconfig</module>
   </modules>