Migrate to odlparent 1.8.0-Carbon

Also fix coala and requests version.

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.

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

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 510c2581fbea72c6ec3fca32c8ae66c8a2acac60..ce89cf663aaa9b3a59355e605da92cbe0c226a04 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.9.0-SNAPSHOT</version>
+      <version>1.8.0-Carbon</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index af6955acfec45dcf9f36e4bcc1c0c45b322b2a9f..28a17e5f76b7736ab8528d0aac09a27b4e6e5e78 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.9.0-SNAPSHOT</version>
+      <version>1.8.0-Carbon</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 829587876daab990fbeb69abd3dd8348f07cf42d..2f3cf47d16ce3ba45e39e69c41782941b620f2af 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index 65cdbf0133060579c930bf1506bf4de20ccf379a..30bf040ff433177750f9c70e025e217438f33a40 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.9.0-SNAPSHOT</version>
+      <version>1.8.0-Carbon</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index cf4056f9c78e5a0c29c0b86a1adba618df53208e..8349194dddfbd5018bee620908c033476b3c8468 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.9.0-SNAPSHOT</version>
+      <version>1.8.0-Carbon</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index da41adba1390501d419144e59c3fed2f818c8d72..3807b3072488299b9efa394868d8e42fd8752cbc 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</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.9.0-SNAPSHOT</odlparent.version>
+        <odlparent.version>1.8.0-Carbon</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 2c1be453d0a627cfce9ea73500bc21c28a881e53..05126f8ac1e3874a5a6276cb851aefac1b2d30a3 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/pom.xml b/features/pom.xml
index 8e8f289afe4d75ada7bc26d3a4cf05ea2c2258a4..4b3f7ec8c217643b5c581fb0967ef76dfebc497b 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/distribution/pom.xml b/features/repos/distribution/pom.xml
index c9eca9eacebeacc92c3383ac8c3854e30d17703a..dda0af08472238b52f5ba3467545e2b116776439 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index d51e115ccb1d853efaf81bae78d6635e7f505a07..4c88714c072b46acad2ddcfdc54454e2b472bee3 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index fdf20c7947115b34c960d4120566a7d748940623..095f5d1a7c2330872694156064c6178bd88be15c 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 2b4f5d01718fc116024687997d51e7091393d11d..ea2ae4b5ac88264cf81d3e067f2ca5952198462a 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</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 673ad2ff46ec50940e837c1edd13295049fd0f7c..f539b43e0e959090889d380b9e0172083a63be51 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</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 128d50eaed3f597f6d00104f5c9349bc550c1a83..d784b909feb98ef51bc521e64cb11073ef59204e 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</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 468924b8df0ec42b9e292a1458f1c0d16171026c..23ddd8eb35a841787b5e08d2a2a5128d4052b8c7 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 85d2d40595a0d8100129f1f9114a07e0c4de9eea..2ce37abf4bec57b35afe2a0bcfddd035294d7ac4 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features3-distribution/pom.xml b/features3-distribution/pom.xml
index da9ba6bd135cfd44b0adf456ac500d5352a186c6..f55b29f2c5fd761e42d1580acb8c547a5b347239 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index c10b2a5df4571e3c6996290bceff63ebbc149212..3de03ce18869fbce258ef5de444a5d897ad5487f 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features3-test/pom.xml b/features3-test/pom.xml
index 3775beb09ce4429cecfe6b1cb1a46bd89dcaa031..4ada3eb7e08edb6d23fc876bf6e09d0f5daef1c9 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 612d3fa097435810b4cbd1adbca56319620777ca..253d8074eb18a8b26bb22ced9076947df5ed1392 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.9.0-SNAPSHOT</version>
+        <version>1.8.0-Carbon</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/pom.xml b/pom.xml
index d63c7559be093ec534a066acff6a9c3c7acaa94b..53657e7a47337e798fb916b8abe16558c8a3a400 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,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.integration</groupId>

diff --git a/tox.ini b/tox.ini
index 281d80588ea1f588ba9b7d8002d2c8522e93127c..66896abc56db853c8af4b0d4b6647580db3bb34d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,10 @@ skipsdist = true
 [testenv:coala]
 basepython = python3
 deps =
-    coala<0.11
-    coala-bears
+    coala==0.11
+    coala-bears==0.11
+    # Requests 2.16 breaks dependencies
+    requests<2.16
 commands =
     python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger
     coala --non-interactive

diff --git a/version/pom.xml b/version/pom.xml
index 98b8eabe0039623e99dc4dbdbd58ac5954bdf619..868ccb632695e0482307b25c0d1df1ea7e51d6d3 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.9.0-SNAPSHOT</feature.odlparent.version>
+        <feature.odlparent.version>1.8.0-Carbon</feature.odlparent.version>
     </properties>
 </project>