From 3ac36c76f40e8d9eb431de939e0234362ed14679 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 12 Jun 2017 11:24:15 -0400 Subject: [PATCH] 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 --- 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 +- .../singles/odl-integration-compatible-with-all/pom.xml | 2 +- features/singles/pom.xml | 2 +- features3-distribution/pom.xml | 2 +- features3-index/pom.xml | 2 +- features3-test/pom.xml | 2 +- karaf/pom.xml | 2 +- pom.xml | 2 +- tox.ini | 6 ++++-- version/pom.xml | 2 +- 23 files changed, 27 insertions(+), 25 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index 510c2581..ce89cf66 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index af6955ac..28a17e5f 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 82958787..2f3cf47d 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 65cdbf01..30bf040f 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index cf4056f9..8349194d 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index da41adba..3807b307 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration @@ -76,7 +76,7 @@ 1.4.0-SNAPSHOT 0.9.0-SNAPSHOT 0.3.0-SNAPSHOT - 1.9.0-SNAPSHOT + 1.8.0-Carbon 1.3.0-SNAPSHOT 0.5.0-SNAPSHOT 1.5.0-SNAPSHOT diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 2c1be453..05126f8a 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent karaf-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features/pom.xml b/features/pom.xml index 8e8f289a..4b3f7ec8 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features/repos/distribution/pom.xml b/features/repos/distribution/pom.xml index c9eca9ea..dda0af08 100644 --- a/features/repos/distribution/pom.xml +++ b/features/repos/distribution/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index d51e115c..4c88714c 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features/repos/pom.xml b/features/repos/pom.xml index fdf20c79..095f5d1a 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index 2b4f5d01..ea2ae4b5 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features/singles/odl-distribution-version/pom.xml b/features/singles/odl-distribution-version/pom.xml index 673ad2ff..f539b43e 100644 --- a/features/singles/odl-distribution-version/pom.xml +++ b/features/singles/odl-distribution-version/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 128d50ea..d784b909 100644 --- a/features/singles/odl-integration-all/pom.xml +++ b/features/singles/odl-integration-all/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index 468924b8..23ddd8eb 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 @@ org.opendaylight.odlparent single-feature-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 85d2d405..2ce37abf 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features3-distribution/pom.xml b/features3-distribution/pom.xml index da9ba6bd..f55b29f2 100644 --- a/features3-distribution/pom.xml +++ b/features3-distribution/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent features-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features3-index/pom.xml b/features3-index/pom.xml index c10b2a5d..3de03ce1 100644 --- a/features3-index/pom.xml +++ b/features3-index/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent features-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/features3-test/pom.xml b/features3-test/pom.xml index 3775beb0..4ada3eb7 100644 --- a/features3-test/pom.xml +++ b/features3-test/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent features-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/karaf/pom.xml b/karaf/pom.xml index 612d3fa0..253d8074 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent karaf4-parent - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/pom.xml b/pom.xml index d63c7559..53657e7a 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0-SNAPSHOT + 1.8.0-Carbon org.opendaylight.integration diff --git a/tox.ini b/tox.ini index 281d8058..66896abc 100644 --- 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 98b8eabe..868ccb63 100644 --- a/version/pom.xml +++ b/version/pom.xml @@ -41,6 +41,6 @@ - 1.9.0-SNAPSHOT + 1.8.0-Carbon -- 2.36.6