From 25f39aab062c7d403a1ff1a698a389e6b64eb8f0 Mon Sep 17 00:00:00 2001 From: Martial COULIBALY Date: Mon, 9 Jul 2018 09:05:21 +0200 Subject: [PATCH] Bump to odlparent-3.1.0 oxygen SR2 snapshot put dependencies modules into stable/oxygen SR2 x.y.(3-SNAPSHOT) Change-Id: I4fbf2f792a673d53b22cd9da7ad5658833c992d4 Signed-off-by: Martial COULIBALY --- api/pom.xml | 2 +- artifacts/pom.xml | 2 +- cli/pom.xml | 2 +- features/features-transportpce/pom.xml | 2 +- features/odl-transportpce-api/pom.xml | 12 ++--- features/odl-transportpce-cli/pom.xml | 14 +++--- features/odl-transportpce-ordmodels/pom.xml | 14 +++--- features/odl-transportpce-rest/pom.xml | 4 +- features/odl-transportpce-ui/pom.xml | 6 +-- features/odl-transportpce/pom.xml | 12 ++--- features/pom.xml | 2 +- impl/pom.xml | 6 +-- it/pom.xml | 2 +- karaf/pom.xml | 2 +- olm/pom.xml | 4 +- ordmodels/pom.xml | 18 +++---- pom.xml | 52 +-------------------- renderer/pom.xml | 4 +- servicehandler/pom.xml | 2 +- tests/pom.xml | 2 +- tests/stubpce/pom.xml | 2 +- tests/stubrenderer/pom.xml | 2 +- 22 files changed, 59 insertions(+), 109 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 458670e74..afd1a3c97 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.12.2 + 0.12.3-SNAPSHOT diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 2bebe150d..f5b66878f 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 3.1.1 + 3.1.0 diff --git a/cli/pom.xml b/cli/pom.xml index 7bc4bf2bd..d33909709 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller config-parent - 0.8.2 + 0.8.3-SNAPSHOT diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml index 9935c5322..28c782d10 100644 --- a/features/features-transportpce/pom.xml +++ b/features/features-transportpce/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent feature-repo-parent - 3.1.1 + 3.1.0 diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml index 5c3fb7f47..fa43abc05 100644 --- a/features/odl-transportpce-api/pom.xml +++ b/features/odl-transportpce-api/pom.xml @@ -23,12 +23,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - 0.12.2 - 1.7.2 - 1.7.2 - 2.0.5 - 0.7.2 - 1.4.2 + 0.12.3-SNAPSHOT + 1.7.3-SNAPSHOT + 1.7.3-SNAPSHOT + 1.3.0-SNAPSHOT + 0.7.3-SNAPSHOT + 1.4.3-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-cli/pom.xml b/features/odl-transportpce-cli/pom.xml index 12cd1fbd9..7191f3859 100644 --- a/features/odl-transportpce-cli/pom.xml +++ b/features/odl-transportpce-cli/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 3.1.1 + 3.1.0 @@ -22,12 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 0.12.2 - 1.7.2 - 1.7.2 - 2.0.5 - 0.7.2 - 1.4.2 + 0.12.3-SNAPSHOT + 1.7.3-SNAPSHOT + 1.7.3-SNAPSHOT + 1.3.0-SNAPSHOT + 0.7.3-SNAPSHOT + 1.4.3-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml index f3cc25071..317acf7d5 100644 --- a/features/odl-transportpce-ordmodels/pom.xml +++ b/features/odl-transportpce-ordmodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 3.1.1 + 3.1.0 @@ -22,12 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 0.12.2 - 1.7.2 - 1.7.2 - 2.0.5 - 0.7.2 - 1.4.2 + 0.12.3-SNAPSHOT + 1.7.3-SNAPSHOT + 1.7.3-SNAPSHOT + 1.3.0-SNAPSHOT + 0.7.3-SNAPSHOT + 1.4.3-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-rest/pom.xml b/features/odl-transportpce-rest/pom.xml index 864bd4a75..8d09163d6 100644 --- a/features/odl-transportpce-rest/pom.xml +++ b/features/odl-transportpce-rest/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 3.1.1 + 3.1.0 @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 1.7.2 + 1.7.3-SNAPSHOT OpenDaylight :: transportpce :: REST diff --git a/features/odl-transportpce-ui/pom.xml b/features/odl-transportpce-ui/pom.xml index 09d149326..8c74d42a9 100644 --- a/features/odl-transportpce-ui/pom.xml +++ b/features/odl-transportpce-ui/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 3.1.1 + 3.1.0 @@ -22,8 +22,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 1.7.2 - 0.7.2 + 1.7.3-SNAPSHOT + 0.7.3-SNAPSHOT OpenDaylight :: transportpce :: UI diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index 21454f5c9..0b0102be2 100644 --- a/features/odl-transportpce/pom.xml +++ b/features/odl-transportpce/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 3.1.1 + 3.1.0 @@ -23,11 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - 0.12.2 - 1.7.2 - 2.0.5 - 0.7.2 - 1.4.2 + 0.12.3-SNAPSHOT + 1.7.3-SNAPSHOT + 1.3.0-SNAPSHOT + 0.7.3-SNAPSHOT + 1.4.3-SNAPSHOT etc/opendaylight/karaf diff --git a/features/pom.xml b/features/pom.xml index 7b6a5f99d..8781d5ad9 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.1 + 3.1.0 diff --git a/impl/pom.xml b/impl/pom.xml index c42e4b313..6d7e8dd32 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 3.1.1 + 3.1.0 @@ -31,12 +31,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller.model model-topology - 1.7.2 + 1.7.3-SNAPSHOT org.opendaylight.netconf sal-netconf-connector - 1.7.2 + 1.7.3-SNAPSHOT diff --git a/it/pom.xml b/it/pom.xml index fbf90e458..c78c38f44 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-it-parent - 1.7.2 + 1.7.3-SNAPSHOT diff --git a/karaf/pom.xml b/karaf/pom.xml index 69516a2b4..bce1afdd9 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 3.1.1 + 3.1.0 diff --git a/olm/pom.xml b/olm/pom.xml index 38c0fc571..4316baf92 100644 --- a/olm/pom.xml +++ b/olm/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller config-parent - 0.8.2 + 0.8.3-SNAPSHOT @@ -44,7 +44,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf sal-netconf-connector - 1.7.2 + 1.7.3-SNAPSHOT diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index 65a081ae3..f110dcf12 100644 --- a/ordmodels/pom.xml +++ b/ordmodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.12.2 + 0.12.3-SNAPSHOT @@ -52,42 +52,42 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf ietf-netconf - 1.4.2 + 1.4.3-SNAPSHOT org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 - 1.4.2 + 1.4.3-SNAPSHOT org.opendaylight.mdsal.model iana-afn-safi - 2013.07.04.12.2 + 2013.07.04.12.3-SNAPSHOT org.opendaylight.mdsal.model ietf-access-control-list - 0.10.2 + 0.10.3-SNAPSHOT org.opendaylight.mdsal.model iana-if-type-2014-05-08 - 2014.05.08.12.2 + 2014.05.08.12.3-SNAPSHOT org.opendaylight.mdsal.model ietf-yang-types-20130715 - 2013.07.15.12.2 + 2013.07.15.12.3-SNAPSHOT org.opendaylight.mdsal.model ietf-interfaces - 2014.05.08.12.2 + 2014.05.08.12.3-SNAPSHOT org.opendaylight.mdsal.model ietf-packet-fields - 0.10.2 + 0.10.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1a4c9926b..1fe836077 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 3.1.1 + 3.1.0 @@ -81,54 +81,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - - - - - maven-site - - - ${user.dir}/deploy-site.xml - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - false - - - aggregate - - aggregate - - package - - - - - - - - - - ${odl.site.url}/${project.groupId}/${stream}/ - - - - opendaylight-site - ${nexus.site.url}/ - - diff --git a/renderer/pom.xml b/renderer/pom.xml index 262bfb7cd..6e5321ec2 100644 --- a/renderer/pom.xml +++ b/renderer/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller config-parent - 0.8.2 + 0.8.3-SNAPSHOT @@ -40,7 +40,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf sal-netconf-connector - 1.7.2 + 1.7.3-SNAPSHOT diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index 50e2cfab3..4ac732bf7 100644 --- a/servicehandler/pom.xml +++ b/servicehandler/pom.xml @@ -15,7 +15,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.controller config-parent - 0.8.2 + 0.8.3-SNAPSHOT diff --git a/tests/pom.xml b/tests/pom.xml index b21c7976e..ad7ee1d91 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 3.1.1 + 3.1.0 diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml index ae0df3207..f67df0630 100644 --- a/tests/stubpce/pom.xml +++ b/tests/stubpce/pom.xml @@ -17,7 +17,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.controller config-parent - 0.8.2 + 0.8.3-SNAPSHOT diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml index 40be2eed5..5adece408 100644 --- a/tests/stubrenderer/pom.xml +++ b/tests/stubrenderer/pom.xml @@ -15,7 +15,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.controller config-parent - 0.8.2 + 0.8.3-SNAPSHOT -- 2.36.6