From 78c0309a346a750a5230d9aa8d58a6d71901f114 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 13 Jun 2017 16:55:23 -0400
Subject: [PATCH] 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>
---
 artifacts/all/pom.xml                                        | 2 +-
 artifacts/distribution/pom.xml                               | 2 +-
 artifacts/pom.xml                                            | 2 +-
 artifacts/upstream/all/pom.xml                               | 2 +-
 artifacts/upstream/pom.xml                                   | 2 +-
 artifacts/upstream/properties/pom.xml                        | 4 ++--
 distribution-karaf/pom.xml                                   | 2 +-
 features/pom.xml                                             | 2 +-
 features/repos/distribution/pom.xml                          | 2 +-
 features/repos/index/pom.xml                                 | 2 +-
 features/repos/pom.xml                                       | 2 +-
 features/repos/test/pom.xml                                  | 2 +-
 features/singles/odl-distribution-version/pom.xml            | 2 +-
 features/singles/odl-integration-all/pom.xml                 | 2 +-
 features/singles/odl-integration-compatible-with-all/pom.xml | 2 +-
 features/singles/pom.xml                                     | 2 +-
 features3-distribution/pom.xml                               | 2 +-
 features3-index/pom.xml                                      | 4 +++-
 features3-index/src/main/features/features.xml               | 2 ++
 features3-test/pom.xml                                       | 2 +-
 features3-test/src/main/features/features.xml                | 4 ++++
 karaf/pom.xml                                                | 2 +-
 pom.xml                                                      | 2 +-
 version/pom.xml                                              | 2 +-
 24 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index ce89cf66..08fb8670 100644
--- 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 28a17e5f..b2f75f0e 100644
--- 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 2f3cf47d..eddf2238 100644
--- 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 30bf040f..38c4f431 100644
--- 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 8349194d..b08c8888 100644
--- 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 3807b307..548c716a 100644
--- 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 05126f8a..f74a8461 100644
--- 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 4b3f7ec8..0a56f0c4 100644
--- 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 dda0af08..2a33e69e 100644
--- 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 4c88714c..e85099b6 100644
--- 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 095f5d1a..e71cfeec 100644
--- 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 ea2ae4b5..4a0536cf 100644
--- 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 f539b43e..b00a4605 100644
--- 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 d784b909..d8ecd20f 100644
--- 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 23ddd8eb..0aa8d71b 100644
--- 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 2ce37abf..73e92384 100644
--- 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 f55b29f2..9eaaeb85 100644
--- 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 3de03ce1..5ab57b78 100644
--- 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 461a730a..c90b1fef 100644
--- 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 4ada3eb7..f858abd6 100644
--- 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 d651cb94..b36878d6 100644
--- 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 253d8074..46a0b298 100644
--- 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 53657e7a..be817592 100644
--- 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 868ccb63..90f209fa 100644
--- 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>
-- 
2.36.6