From f6e33ecf517049638bd33e3158e502abc540322a Mon Sep 17 00:00:00 2001 From: Martial COULIBALY Date: Wed, 20 Jun 2018 09:14:51 +0200 Subject: [PATCH] Bump to odlparent-3.1.0 put dependencies modules into stable/nitrogen SR1 x.y.(2-SNAPSHOT) Change-Id: I806cbd0f283ca0073e6725d600012eb71e23bb95 Signed-off-by: Martial COULIBALY --- api/pom.xml | 2 +- .../yang/service_path/transportpce-pce.yang | 3 --- 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 | 12 ++++++------ features/odl-transportpce-ordmodels/pom.xml | 12 ++++++------ features/odl-transportpce-rest/pom.xml | 4 ++-- features/odl-transportpce-ui/pom.xml | 6 +++--- features/odl-transportpce/pom.xml | 10 +++++----- features/pom.xml | 2 +- impl/pom.xml | 6 +++--- it/pom.xml | 2 +- karaf/pom.xml | 2 +- olm/pom.xml | 4 ++-- ordmodels/pom.xml | 18 +++++++++--------- 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, 55 insertions(+), 58 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 901b2b8dc..3ffbc0500 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.0-SNAPSHOT + 0.12.2-SNAPSHOT diff --git a/api/src/main/yang/service_path/transportpce-pce.yang b/api/src/main/yang/service_path/transportpce-pce.yang index 53c356ded..ca2708f82 100644 --- a/api/src/main/yang/service_path/transportpce-pce.yang +++ b/api/src/main/yang/service_path/transportpce-pce.yang @@ -20,9 +20,6 @@ module transportpce-pce { prefix transportpce-pathDescription; revision-date 2017-10-17; } - import transportpce-pathDescription { - prefix transportpce-pathDescription; - } organization "transportPCE"; diff --git a/artifacts/pom.xml b/artifacts/pom.xml index b25ee74f4..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.0.2 + 3.1.0 diff --git a/cli/pom.xml b/cli/pom.xml index d3dfa8687..8450199cf 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.0-SNAPSHOT + 0.8.2-SNAPSHOT diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml index d40f69009..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.0.2 + 3.1.0 diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml index cf86dc1ed..18395bf82 100644 --- a/features/odl-transportpce-api/pom.xml +++ b/features/odl-transportpce-api/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.0.2 + 3.1.0 @@ -23,12 +23,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - 0.12.0-SNAPSHOT - 1.7.0-SNAPSHOT - 1.7.0-SNAPSHOT + 0.12.2-SNAPSHOT + 1.7.2-SNAPSHOT + 1.7.2-SNAPSHOT 1.3.0-SNAPSHOT - 0.7.0-SNAPSHOT - 1.4.0-SNAPSHOT + 0.7.2-SNAPSHOT + 1.4.2-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-cli/pom.xml b/features/odl-transportpce-cli/pom.xml index 6c90a98af..884dd923d 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.0.2 + 3.1.0 @@ -22,12 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 0.12.0-SNAPSHOT - 1.7.0-SNAPSHOT - 1.7.0-SNAPSHOT + 0.12.2-SNAPSHOT + 1.7.2-SNAPSHOT + 1.7.2-SNAPSHOT 1.3.0-SNAPSHOT - 0.7.0-SNAPSHOT - 1.4.0-SNAPSHOT + 0.7.2-SNAPSHOT + 1.4.2-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml index c67549463..7a2addd79 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.0.2 + 3.1.0 @@ -22,12 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 0.12.0-SNAPSHOT - 1.7.0-SNAPSHOT - 1.7.0-SNAPSHOT + 0.12.2-SNAPSHOT + 1.7.2-SNAPSHOT + 1.7.2-SNAPSHOT 1.3.0-SNAPSHOT - 0.7.0-SNAPSHOT - 1.4.0-SNAPSHOT + 0.7.2-SNAPSHOT + 1.4.2-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-rest/pom.xml b/features/odl-transportpce-rest/pom.xml index ed955f231..ecd3c4718 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.0.2 + 3.1.0 @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 1.7.0-SNAPSHOT + 1.7.2-SNAPSHOT OpenDaylight :: transportpce :: REST diff --git a/features/odl-transportpce-ui/pom.xml b/features/odl-transportpce-ui/pom.xml index a53adcf23..10eca5614 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.0.2 + 3.1.0 @@ -22,8 +22,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 1.7.0-SNAPSHOT - 0.7.0-SNAPSHOT + 1.7.2-SNAPSHOT + 0.7.2-SNAPSHOT OpenDaylight :: transportpce :: UI diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index 284b2b677..48687a29a 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.0.2 + 3.1.0 @@ -23,11 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - 0.12.0-SNAPSHOT - 1.7.0-SNAPSHOT + 0.12.2-SNAPSHOT + 1.7.2-SNAPSHOT 1.3.0-SNAPSHOT - 0.7.0-SNAPSHOT - 1.4.0-SNAPSHOT + 0.7.2-SNAPSHOT + 1.4.2-SNAPSHOT etc/opendaylight/karaf diff --git a/features/pom.xml b/features/pom.xml index 1109c4fd5..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.0.2 + 3.1.0 diff --git a/impl/pom.xml b/impl/pom.xml index 543d4d1fe..4950cdce3 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.0.2 + 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.0-SNAPSHOT + 1.7.2-SNAPSHOT org.opendaylight.netconf sal-netconf-connector - 1.7.0-SNAPSHOT + 1.7.2-SNAPSHOT diff --git a/it/pom.xml b/it/pom.xml index d886aae49..557539bba 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.0-SNAPSHOT + 1.7.2-SNAPSHOT diff --git a/karaf/pom.xml b/karaf/pom.xml index 86ce37758..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.0.2 + 3.1.0 diff --git a/olm/pom.xml b/olm/pom.xml index 10582caa5..0eeaa8f5a 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.0-SNAPSHOT + 0.8.2-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.0-SNAPSHOT + 1.7.2-SNAPSHOT diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index 8c1f1a954..654052d6d 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.0-SNAPSHOT + 0.12.2-SNAPSHOT @@ -52,42 +52,42 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf ietf-netconf - 1.4.0-SNAPSHOT + 1.4.2-SNAPSHOT org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 - 1.4.0-SNAPSHOT + 1.4.2-SNAPSHOT org.opendaylight.mdsal.model iana-afn-safi - 2013.07.04.12.0-SNAPSHOT + 2013.07.04.12.2-SNAPSHOT org.opendaylight.mdsal.model ietf-access-control-list - 0.10.0-SNAPSHOT + 0.10.2-SNAPSHOT org.opendaylight.mdsal.model iana-if-type-2014-05-08 - 2014.05.08.12.0-SNAPSHOT + 2014.05.08.12.2-SNAPSHOT org.opendaylight.mdsal.model ietf-yang-types-20130715 - 2013.07.15.12.0-SNAPSHOT + 2013.07.15.12.2-SNAPSHOT org.opendaylight.mdsal.model ietf-interfaces - 2014.05.08.12.0-SNAPSHOT + 2014.05.08.12.2-SNAPSHOT org.opendaylight.mdsal.model ietf-packet-fields - 0.10.0-SNAPSHOT + 0.10.2-SNAPSHOT diff --git a/renderer/pom.xml b/renderer/pom.xml index 4f5ca5b8d..8d9b79f11 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.0-SNAPSHOT + 0.8.2-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.0-SNAPSHOT + 1.7.2-SNAPSHOT diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index 5f0ea8c1a..93e4937d7 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.0-SNAPSHOT + 0.8.2-SNAPSHOT diff --git a/tests/pom.xml b/tests/pom.xml index 8f74d50a9..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.0.2 + 3.1.0 diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml index f4e5341b4..85f0051d4 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.0-SNAPSHOT + 0.8.2-SNAPSHOT diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml index f20331c00..51c2e177d 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.0-SNAPSHOT + 0.8.2-SNAPSHOT -- 2.36.6