From 6cc0699351eb30d6f740732fc38bea317cdb4dfb Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 13 Jun 2017 16:07:47 -0400 Subject: [PATCH] Migrate to odlparent 1.9.0 Change-Id: Ie210d3177329d2bd94f590f06ecbcb5ed9877863 Signed-off-by: Thanh Ha Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- bgp/bmp-mock/pom.xml | 2 +- bgp/controller-config/pom.xml | 2 +- bgp/pom.xml | 2 +- bgp/testtool/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- dependency-version-management/pom.xml | 4 ++-- distribution-karaf/pom.xml | 2 +- features/bgp/features-bgp/pom.xml | 4 ++-- features/bgp/features4-bgp/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-benchmark/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-cli/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-config-loader/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-dependencies/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-evpn/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-flowspec/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-inet/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-linkstate/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-openconfig/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-parser/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-rib-api/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-topology/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp/pom.xml | 2 +- features/bgp/odl-bgpcep-config-files/pom.xml | 2 +- features/bgp/pom.xml | 2 +- features/bgpcep-extras/features-extras/pom.xml | 2 +- features/bgpcep-extras/features4-bgpcep-extras/pom.xml | 2 +- features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml | 2 +- features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml | 2 +- features/bgpcep-extras/pom.xml | 2 +- features/bmp/features-bmp/pom.xml | 4 ++-- features/bmp/features4-bmp/pom.xml | 2 +- features/bmp/odl-bgpcep-bmp/pom.xml | 2 +- features/bmp/pom.xml | 2 +- features/pcep/features-pcep/pom.xml | 4 ++-- features/pcep/features4-pcep/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-api/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-dependencies/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-impl/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-stateful07/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-topology/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep/pom.xml | 2 +- features/pcep/odl-bgpcep-programming-api/pom.xml | 2 +- features/pcep/odl-bgpcep-programming-impl/pom.xml | 2 +- features/pcep/pom.xml | 2 +- features/pom.xml | 2 +- features/rsvp/features-rsvp/pom.xml | 2 +- features/rsvp/features4-rsvp/pom.xml | 2 +- features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml | 2 +- features/rsvp/odl-bgpcep-rsvp/pom.xml | 2 +- features/rsvp/pom.xml | 2 +- .../protocol/integration/pcep/PcepRpcServicesRoutingTest.java | 4 ++-- parent/pom.xml | 2 +- pcep/controller-config/pom.xml | 2 +- pcep/pcc-mock/pom.xml | 2 +- pcep/pom.xml | 2 +- pcep/testtool/pom.xml | 2 +- pom.xml | 2 +- programming/controller-config/pom.xml | 2 +- programming/pom.xml | 2 +- rsvp/pom.xml | 2 +- topology/pom.xml | 2 +- 71 files changed, 76 insertions(+), 76 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index d7be0ce39e..82dc7109f0 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/bgp/bmp-mock/pom.xml b/bgp/bmp-mock/pom.xml index f303147966..98e2598a87 100644 --- a/bgp/bmp-mock/pom.xml +++ b/bgp/bmp-mock/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent odlparent - 1.8.0-Carbon + 1.9.0 diff --git a/bgp/controller-config/pom.xml b/bgp/controller-config/pom.xml index 32399e48f7..1615a7bafb 100644 --- a/bgp/controller-config/pom.xml +++ b/bgp/controller-config/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent - 1.8.0-Carbon + 1.9.0 diff --git a/bgp/pom.xml b/bgp/pom.xml index ef64d89944..fb4604716d 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/bgp/testtool/pom.xml b/bgp/testtool/pom.xml index f36b7cb8ad..4ddf430738 100644 --- a/bgp/testtool/pom.xml +++ b/bgp/testtool/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent odlparent - 1.8.0-Carbon + 1.9.0 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 718f77edf1..9e676ad4a2 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 1.8.0-Carbon + 1.9.0 diff --git a/dependency-version-management/pom.xml b/dependency-version-management/pom.xml index cc2abecb99..47a0c66afa 100644 --- a/dependency-version-management/pom.xml +++ b/dependency-version-management/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 @@ -23,7 +23,7 @@ 2.3.0-SNAPSHOT 0.11.0-SNAPSHOT 1.2.0-SNAPSHOT - 1.8.0-Carbon + 1.9.0 0.7.0-SNAPSHOT diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 82798150a1..272421182b 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent karaf-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/features-bgp/pom.xml b/features/bgp/features-bgp/pom.xml index 8dcce2afbb..3c940c80e9 100644 --- a/features/bgp/features-bgp/pom.xml +++ b/features/bgp/features-bgp/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent features-parent - 1.8.0-Carbon + 1.9.0 @@ -28,7 +28,7 @@ 0.11.0-SNAPSHOT 2.3.0-SNAPSHOT 0.7.0-SNAPSHOT - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/features4-bgp/pom.xml b/features/bgp/features4-bgp/pom.xml index 1d5a2007b7..a1f223c311 100644 --- a/features/bgp/features4-bgp/pom.xml +++ b/features/bgp/features4-bgp/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent feature-repo-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml index 9776729154..3da6e67d53 100644 --- a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-cli/pom.xml b/features/bgp/odl-bgpcep-bgp-cli/pom.xml index 2338d4b3c4..7316e4e7a1 100644 --- a/features/bgp/odl-bgpcep-bgp-cli/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-cli/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml b/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml index cf5466f643..d07fa4ccfb 100644 --- a/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml b/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml index be5f353b12..1c2faa63b9 100644 --- a/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml b/features/bgp/odl-bgpcep-bgp-evpn/pom.xml index a69e0a83cd..29355bcf53 100644 --- a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-evpn/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml b/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml index 22fd7dc0cf..5eb047c26e 100644 --- a/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-inet/pom.xml b/features/bgp/odl-bgpcep-bgp-inet/pom.xml index 008bac43e5..c106f7f64d 100644 --- a/features/bgp/odl-bgpcep-bgp-inet/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-inet/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml b/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml index 9ea09a04a1..4d243296aa 100644 --- a/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml b/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml index 70c8ec8f37..b24b057d1a 100644 --- a/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml index 8cda0420dd..fd1171743d 100644 --- a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml index 1f3a272285..4a6fd879ed 100644 --- a/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml index c93cf41353..fa7a211c9a 100644 --- a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-parser/pom.xml b/features/bgp/odl-bgpcep-bgp-parser/pom.xml index 93312a0fc0..575f908ceb 100644 --- a/features/bgp/odl-bgpcep-bgp-parser/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-parser/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml b/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml index a966b5da5a..7125633449 100644 --- a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml index ac84d1d658..394447be65 100644 --- a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml index f9ad4298eb..d7aba33663 100644 --- a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp-topology/pom.xml b/features/bgp/odl-bgpcep-bgp-topology/pom.xml index 4c145989bc..dbc0d2e21e 100644 --- a/features/bgp/odl-bgpcep-bgp-topology/pom.xml +++ b/features/bgp/odl-bgpcep-bgp-topology/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-bgp/pom.xml b/features/bgp/odl-bgpcep-bgp/pom.xml index 41cd7c7240..c4c10f9493 100644 --- a/features/bgp/odl-bgpcep-bgp/pom.xml +++ b/features/bgp/odl-bgpcep-bgp/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/odl-bgpcep-config-files/pom.xml b/features/bgp/odl-bgpcep-config-files/pom.xml index f5a394fad3..c9b275d057 100644 --- a/features/bgp/odl-bgpcep-config-files/pom.xml +++ b/features/bgp/odl-bgpcep-config-files/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml index f54a77dda3..b1138cc734 100644 --- a/features/bgp/pom.xml +++ b/features/bgp/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgpcep-extras/features-extras/pom.xml b/features/bgpcep-extras/features-extras/pom.xml index fa0bcae64d..06440fd331 100644 --- a/features/bgpcep-extras/features-extras/pom.xml +++ b/features/bgpcep-extras/features-extras/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent features-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgpcep-extras/features4-bgpcep-extras/pom.xml b/features/bgpcep-extras/features4-bgpcep-extras/pom.xml index d11eca27dc..bf562a909e 100644 --- a/features/bgpcep-extras/features4-bgpcep-extras/pom.xml +++ b/features/bgpcep-extras/features4-bgpcep-extras/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent feature-repo-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml b/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml index 24a4125837..e10763871c 100644 --- a/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml +++ b/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml index c43efcfc93..314edb63ac 100644 --- a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml +++ b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bgpcep-extras/pom.xml b/features/bgpcep-extras/pom.xml index 540a8aba58..510d9e1798 100644 --- a/features/bgpcep-extras/pom.xml +++ b/features/bgpcep-extras/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/features/bmp/features-bmp/pom.xml b/features/bmp/features-bmp/pom.xml index b204f0336d..9d25a4c78d 100644 --- a/features/bmp/features-bmp/pom.xml +++ b/features/bmp/features-bmp/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.odlparent features-parent - 1.8.0-Carbon + 1.9.0 features-bmp @@ -15,7 +15,7 @@ 1.6.0-SNAPSHOT 0.11.0-SNAPSHOT 0.7.0-SNAPSHOT - 1.8.0-Carbon + 1.9.0 diff --git a/features/bmp/features4-bmp/pom.xml b/features/bmp/features4-bmp/pom.xml index ab59ea24d3..9bb6de2eef 100644 --- a/features/bmp/features4-bmp/pom.xml +++ b/features/bmp/features4-bmp/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent feature-repo-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bmp/odl-bgpcep-bmp/pom.xml b/features/bmp/odl-bgpcep-bmp/pom.xml index aac4ab44e4..8b4310b25d 100644 --- a/features/bmp/odl-bgpcep-bmp/pom.xml +++ b/features/bmp/odl-bgpcep-bmp/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml index 8f03d0d78f..514f573cd7 100644 --- a/features/bmp/pom.xml +++ b/features/bmp/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/features-pcep/pom.xml b/features/pcep/features-pcep/pom.xml index 45d4bd4949..50b02c664a 100644 --- a/features/pcep/features-pcep/pom.xml +++ b/features/pcep/features-pcep/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent features-parent - 1.8.0-Carbon + 1.9.0 @@ -26,7 +26,7 @@ 1.2.0-SNAPSHOT 1.6.0-SNAPSHOT 0.7.0-SNAPSHOT - 1.8.0-Carbon + 1.9.0 0.11.0-SNAPSHOT diff --git a/features/pcep/features4-pcep/pom.xml b/features/pcep/features4-pcep/pom.xml index f936247886..e9a503762b 100644 --- a/features/pcep/features4-pcep/pom.xml +++ b/features/pcep/features4-pcep/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent feature-repo-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep-api/pom.xml b/features/pcep/odl-bgpcep-pcep-api/pom.xml index 58a737c1ef..55ee7291ae 100644 --- a/features/pcep/odl-bgpcep-pcep-api/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-api/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml b/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml index 6f2a18fd97..0bb50723d4 100644 --- a/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml b/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml index c51549c096..acc6f4edfa 100644 --- a/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep-impl/pom.xml b/features/pcep/odl-bgpcep-pcep-impl/pom.xml index 589f077de0..28a9a3c13d 100644 --- a/features/pcep/odl-bgpcep-pcep-impl/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-impl/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml index 28a4d0f474..e1a827ddb6 100644 --- a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml b/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml index 3dd4b3aedd..850f3edc34 100644 --- a/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml index 6b1fec26c4..e7206d8b64 100644 --- a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep-topology/pom.xml b/features/pcep/odl-bgpcep-pcep-topology/pom.xml index 057a83e837..378a9a5d65 100644 --- a/features/pcep/odl-bgpcep-pcep-topology/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-topology/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml index 5026c0e481..a05d667633 100644 --- a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml +++ b/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-pcep/pom.xml b/features/pcep/odl-bgpcep-pcep/pom.xml index c0150112e0..3150ffe12a 100644 --- a/features/pcep/odl-bgpcep-pcep/pom.xml +++ b/features/pcep/odl-bgpcep-pcep/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-programming-api/pom.xml b/features/pcep/odl-bgpcep-programming-api/pom.xml index 6b15044909..1773066b8c 100644 --- a/features/pcep/odl-bgpcep-programming-api/pom.xml +++ b/features/pcep/odl-bgpcep-programming-api/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/odl-bgpcep-programming-impl/pom.xml b/features/pcep/odl-bgpcep-programming-impl/pom.xml index 4c95393388..13644d04cd 100644 --- a/features/pcep/odl-bgpcep-programming-impl/pom.xml +++ b/features/pcep/odl-bgpcep-programming-impl/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml index cc33b87f30..f83d4fcd12 100644 --- a/features/pcep/pom.xml +++ b/features/pcep/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/features/pom.xml b/features/pom.xml index c726d2d941..e8be6c7c97 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/features/rsvp/features-rsvp/pom.xml b/features/rsvp/features-rsvp/pom.xml index 8a6c0070ba..cd5cffb08f 100644 --- a/features/rsvp/features-rsvp/pom.xml +++ b/features/rsvp/features-rsvp/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.odlparent features-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/rsvp/features4-rsvp/pom.xml b/features/rsvp/features4-rsvp/pom.xml index 61a0bf591c..fcbddb4b47 100644 --- a/features/rsvp/features4-rsvp/pom.xml +++ b/features/rsvp/features4-rsvp/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent feature-repo-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml b/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml index dec3c692be..9abf8b7f86 100644 --- a/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml +++ b/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/rsvp/odl-bgpcep-rsvp/pom.xml b/features/rsvp/odl-bgpcep-rsvp/pom.xml index 4b402dc987..a070a7a02f 100644 --- a/features/rsvp/odl-bgpcep-rsvp/pom.xml +++ b/features/rsvp/odl-bgpcep-rsvp/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent single-feature-parent - 1.8.0-Carbon + 1.9.0 diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml index bcd9a3d852..47fee4a1ac 100644 --- a/features/rsvp/pom.xml +++ b/features/rsvp/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java index bb26de7c2d..d1e6c0f5b0 100644 --- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java +++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java @@ -72,8 +72,8 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { new DefaultCompositeOption( // Repository required to load harmcrest (OSGi-fied version). // Mockito - mavenBundle("org.mockito", "mockito-core", "1.10.19"), - mavenBundle("org.objenesis", "objenesis", "2.2"), + mavenBundle("org.mockito", "mockito-core").versionAsInProject(), + mavenBundle("org.objenesis", "objenesis").versionAsInProject(), junitBundles(), /* diff --git a/parent/pom.xml b/parent/pom.xml index e21eb1b8e9..9932ee84bb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -19,7 +19,7 @@ org.opendaylight.odlparent odlparent - 1.8.0-Carbon + 1.9.0 diff --git a/pcep/controller-config/pom.xml b/pcep/controller-config/pom.xml index 8ad3732dcd..1e217c1035 100644 --- a/pcep/controller-config/pom.xml +++ b/pcep/controller-config/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent - 1.8.0-Carbon + 1.9.0 diff --git a/pcep/pcc-mock/pom.xml b/pcep/pcc-mock/pom.xml index 2c08fb1bfd..9160f22869 100644 --- a/pcep/pcc-mock/pom.xml +++ b/pcep/pcc-mock/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 1.8.0-Carbon + 1.9.0 diff --git a/pcep/pom.xml b/pcep/pom.xml index ace019d5fe..f7cf3b5602 100644 --- a/pcep/pom.xml +++ b/pcep/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/pcep/testtool/pom.xml b/pcep/testtool/pom.xml index 8311adb4a0..6931c21b8d 100644 --- a/pcep/testtool/pom.xml +++ b/pcep/testtool/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent - 1.8.0-Carbon + 1.9.0 diff --git a/pom.xml b/pom.xml index a58ac8d906..2a46993696 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/programming/controller-config/pom.xml b/programming/controller-config/pom.xml index 5420936ec7..c8d90a4db2 100644 --- a/programming/controller-config/pom.xml +++ b/programming/controller-config/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent - 1.8.0-Carbon + 1.9.0 diff --git a/programming/pom.xml b/programming/pom.xml index de82770644..d0dde9e20c 100644 --- a/programming/pom.xml +++ b/programming/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/rsvp/pom.xml b/rsvp/pom.xml index 799d091cf7..a1690bf1ec 100644 --- a/rsvp/pom.xml +++ b/rsvp/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 diff --git a/topology/pom.xml b/topology/pom.xml index d452b7faf9..2bf95cc65d 100644 --- a/topology/pom.xml +++ b/topology/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent odlparent-lite - 1.8.0-Carbon + 1.9.0 -- 2.36.6