From 1162e17ac3eadedef1e5713d002913b70ffa6d8e Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Wed, 21 Jun 2017 13:19:50 +0200 Subject: [PATCH] Bump odlparent dependency to 2.0.0 also rename karaf4 features Change-Id: I4d9d9274d12e4bb098884d70827d7ed57e8d7b48 Signed-off-by: Claudio D. Gasparini Signed-off-by: Robert Varga --- artifacts/pom.xml | 12 ++++++------ bgp/bmp-mock/pom.xml | 2 +- bgp/controller-config/pom.xml | 2 +- .../protocol/bgp/parser/impl/CommunityTest.java | 4 ++-- .../bgp/peer/acceptor/BGPPeerAcceptorImplTest.java | 4 ++-- bgp/pom.xml | 2 +- .../bgp/rib/impl/config/AbstractConfig.java | 1 + bgp/testtool/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- dependency-version-management/pom.xml | 2 +- distribution-karaf/pom.xml | 14 +++++++------- .../bgp/{features4-bgp => features-bgp}/pom.xml | 4 ++-- 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 | 4 ++-- 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 +- .../bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml | 2 +- features/bgp/odl-bgpcep-bgp-linkstate/pom.xml | 2 +- .../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 +- .../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 | 4 ++-- .../pom.xml | 4 ++-- .../odl-bgpcep-data-change-counter/pom.xml | 2 +- .../odl-bgpcep-extras-dependencies/pom.xml | 4 ++-- features/bgpcep-extras/pom.xml | 4 ++-- .../bmp/{features4-bmp => features-bmp}/pom.xml | 4 ++-- features/bmp/odl-bgpcep-bmp/pom.xml | 2 +- features/bmp/pom.xml | 4 ++-- .../pcep/{features4-pcep => features-pcep}/pom.xml | 4 ++-- features/pcep/odl-bgpcep-pcep-api/pom.xml | 2 +- .../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 +- .../pcep/odl-bgpcep-pcep-segment-routing/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-stateful07/pom.xml | 2 +- .../pcep/odl-bgpcep-pcep-topology-provider/pom.xml | 2 +- features/pcep/odl-bgpcep-pcep-topology/pom.xml | 2 +- .../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 | 4 ++-- features/pom.xml | 2 +- .../rsvp/{features4-rsvp => features-rsvp}/pom.xml | 4 ++-- features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml | 4 ++-- features/rsvp/odl-bgpcep-rsvp/pom.xml | 2 +- features/rsvp/pom.xml | 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 +- .../protocol/pcep/testtool/PCCMock.java | 2 +- .../Stateful07TopologySessionListener.java | 8 ++++---- .../provider/PCEPStatefulPeerProposalTest.java | 2 +- .../topology/provider/TopologyProgrammingTest.java | 1 + .../tunnel/provider/TunnelProgrammingTest.java | 1 + pom.xml | 8 ++++---- programming/controller-config/pom.xml | 2 +- programming/pom.xml | 2 +- rsvp/pom.xml | 2 +- .../protocol/util/InetSocketAddressUtil.java | 4 ++-- topology/pom.xml | 2 +- 74 files changed, 107 insertions(+), 104 deletions(-) rename features/bgp/{features4-bgp => features-bgp}/pom.xml (98%) rename features/bgpcep-extras/{features4-bgpcep-extras => features-bgpcep-extras}/pom.xml (95%) rename features/bmp/{features4-bmp => features-bmp}/pom.xml (95%) rename features/pcep/{features4-pcep => features-pcep}/pom.xml (98%) rename features/rsvp/{features4-rsvp => features-rsvp}/pom.xml (95%) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 82dc7109f0..35e9671f7a 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 @@ -507,7 +507,7 @@ org.opendaylight.bgpcep - features4-bgp + features-bgp features xml ${project.version} @@ -655,7 +655,7 @@ org.opendaylight.bgpcep - features4-bmp + features-bmp features xml ${project.version} @@ -677,7 +677,7 @@ org.opendaylight.bgpcep - features4-bgpcep-extras + features-bgpcep-extras features xml ${project.version} @@ -706,7 +706,7 @@ org.opendaylight.bgpcep - features4-pcep + features-pcep features xml ${project.version} @@ -805,7 +805,7 @@ org.opendaylight.bgpcep - features4-rsvp + features-rsvp features xml ${project.version} diff --git a/bgp/bmp-mock/pom.xml b/bgp/bmp-mock/pom.xml index 98e2598a87..b18e0b2432 100644 --- a/bgp/bmp-mock/pom.xml +++ b/bgp/bmp-mock/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent odlparent - 1.9.0 + 2.0.0 diff --git a/bgp/controller-config/pom.xml b/bgp/controller-config/pom.xml index 1615a7bafb..9dcde1b1aa 100644 --- a/bgp/controller-config/pom.xml +++ b/bgp/controller-config/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent - 1.9.0 + 2.0.0 diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/CommunityTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/CommunityTest.java index 7d9d9aa966..eedce621c1 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/CommunityTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/CommunityTest.java @@ -33,13 +33,13 @@ public class CommunityTest { this.util.create(10, -2); fail("Semantics under range."); } catch (final IllegalArgumentException e) { - assertEquals("Invalid range: -2, expected: [[0‥65535]].", e.getMessage()); + assertEquals("Invalid range: -2, expected: [[0..65535]].", e.getMessage()); } try { this.util.create(10, 65536); fail("Semantics above range."); } catch (final IllegalArgumentException e) { - assertEquals("Invalid range: 65536, expected: [[0‥65535]].", e.getMessage()); + assertEquals("Invalid range: 65536, expected: [[0..65535]].", e.getMessage()); } } diff --git a/bgp/peer-acceptor/src/test/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImplTest.java b/bgp/peer-acceptor/src/test/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImplTest.java index 7268026639..99a767304b 100644 --- a/bgp/peer-acceptor/src/test/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImplTest.java +++ b/bgp/peer-acceptor/src/test/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImplTest.java @@ -28,7 +28,7 @@ public class BGPPeerAcceptorImplTest extends AbstractBGPDispatcherTest { @Test public void testBGPPeerAcceptorImpl() throws Exception { final InetSocketAddress inetServerAddress = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(); - final IpAddress serverIpAddress = new IpAddress(new Ipv4Address(InetSocketAddressUtil.toHostAndPort(inetServerAddress).getHostText())); + final IpAddress serverIpAddress = new IpAddress(new Ipv4Address(InetSocketAddressUtil.toHostAndPort(inetServerAddress).getHost())); final PortNumber portNumber = new PortNumber(InetSocketAddressUtil.toHostAndPort(inetServerAddress).getPort()); this.registry.addPeer(serverIpAddress, this.serverListener, createPreferences(inetServerAddress)); @@ -47,4 +47,4 @@ public class BGPPeerAcceptorImplTest extends AbstractBGPDispatcherTest { bgpPeerAcceptor.close(); } -} \ No newline at end of file +} diff --git a/bgp/pom.xml b/bgp/pom.xml index fb4604716d..f4c6c65803 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java index 348b232d79..5eb0f33f67 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java @@ -130,6 +130,7 @@ class AbstractConfig { Mockito.doReturn(checkedFuture).when(this.domDW).submit(); Mockito.doReturn(null).when(checkedFuture).checkedGet(); Mockito.doReturn(null).when(checkedFuture).get(); + Mockito.doReturn(true).when(checkedFuture).isDone(); Mockito.doReturn("checkedFuture").when(checkedFuture).toString(); Mockito.doAnswer(invocationOnMock->{ this.singletonService.closeServiceInstance(); diff --git a/bgp/testtool/pom.xml b/bgp/testtool/pom.xml index 4ddf430738..ecedc5731e 100644 --- a/bgp/testtool/pom.xml +++ b/bgp/testtool/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent odlparent - 1.9.0 + 2.0.0 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 9e676ad4a2..dc385280a9 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 1.9.0 + 2.0.0 diff --git a/dependency-version-management/pom.xml b/dependency-version-management/pom.xml index 47a0c66afa..5dbd127fc9 100644 --- a/dependency-version-management/pom.xml +++ b/dependency-version-management/pom.xml @@ -7,7 +7,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 555ce56fbf..f4e7a51102 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent karaf4-parent - 1.9.0 + 2.0.0 @@ -47,7 +47,7 @@ org.opendaylight.bgpcep - features4-bgp + features-bgp features ${project.version} xml @@ -55,7 +55,7 @@ org.opendaylight.bgpcep - features4-bmp + features-bmp features ${project.version} xml @@ -63,7 +63,7 @@ org.opendaylight.bgpcep - features4-bgpcep-extras + features-bgpcep-extras features ${project.version} xml @@ -71,7 +71,7 @@ org.opendaylight.bgpcep - features4-pcep + features-pcep features ${project.version} xml @@ -79,7 +79,7 @@ org.opendaylight.bgpcep - features4-rsvp + features-rsvp features ${project.version} xml @@ -87,7 +87,7 @@ org.opendaylight.netconf - features4-restconf + features-restconf features ${restconfVersion} xml diff --git a/features/bgp/features4-bgp/pom.xml b/features/bgp/features-bgp/pom.xml similarity index 98% rename from features/bgp/features4-bgp/pom.xml rename to features/bgp/features-bgp/pom.xml index a1f223c311..8fea8420ce 100644 --- a/features/bgp/features4-bgp/pom.xml +++ b/features/bgp/features-bgp/pom.xml @@ -6,12 +6,12 @@ org.opendaylight.odlparent feature-repo-parent - 1.9.0 + 2.0.0 org.opendaylight.bgpcep - features4-bgp + features-bgp 0.8.0-SNAPSHOT feature diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml index 3da6e67d53..458354b26e 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-cli/pom.xml b/features/bgp/odl-bgpcep-bgp-cli/pom.xml index 7316e4e7a1..c699acfce4 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml b/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml index d07fa4ccfb..6dd29b3ee0 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml b/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml index 1120e41fdb..61262dbe6b 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.9.0 + 2.0.0 @@ -70,7 +70,7 @@ org.opendaylight.odlparent - odl4-netty-4 + odl-netty-4 xml features diff --git a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml b/features/bgp/odl-bgpcep-bgp-evpn/pom.xml index 29355bcf53..575f62234e 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml b/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml index 5eb047c26e..42970326e4 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-inet/pom.xml b/features/bgp/odl-bgpcep-bgp-inet/pom.xml index c106f7f64d..60e888830f 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml b/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml index 4d243296aa..387ce4e1d3 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml b/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml index b24b057d1a..2143539475 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml index fd1171743d..fb066c1928 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml index 4a6fd879ed..df38998a08 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml index fa7a211c9a..54d2d3fe7f 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-parser/pom.xml b/features/bgp/odl-bgpcep-bgp-parser/pom.xml index 575f908ceb..e30bfb8d7d 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.9.0 + 2.0.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 7125633449..435943e1da 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml index 394447be65..f3e83d0a8a 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml index d7aba33663..a7dee630a3 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp-topology/pom.xml b/features/bgp/odl-bgpcep-bgp-topology/pom.xml index dbc0d2e21e..38591e3cc1 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-bgp/pom.xml b/features/bgp/odl-bgpcep-bgp/pom.xml index 832c890bd2..7f1ad2a161 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.9.0 + 2.0.0 diff --git a/features/bgp/odl-bgpcep-config-files/pom.xml b/features/bgp/odl-bgpcep-config-files/pom.xml index c9b275d057..3a3d01ca54 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.9.0 + 2.0.0 diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml index aadb79e551..c9e169ed77 100644 --- a/features/bgp/pom.xml +++ b/features/bgp/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 @@ -23,7 +23,7 @@ pom - features4-bgp + features-bgp odl-bgpcep-bgp odl-bgpcep-bgp-dependencies odl-bgpcep-config-files diff --git a/features/bgpcep-extras/features4-bgpcep-extras/pom.xml b/features/bgpcep-extras/features-bgpcep-extras/pom.xml similarity index 95% rename from features/bgpcep-extras/features4-bgpcep-extras/pom.xml rename to features/bgpcep-extras/features-bgpcep-extras/pom.xml index bf562a909e..701a28aa35 100644 --- a/features/bgpcep-extras/features4-bgpcep-extras/pom.xml +++ b/features/bgpcep-extras/features-bgpcep-extras/pom.xml @@ -6,12 +6,12 @@ org.opendaylight.odlparent feature-repo-parent - 1.9.0 + 2.0.0 org.opendaylight.bgpcep - features4-bgpcep-extras + features-bgpcep-extras 0.8.0-SNAPSHOT feature 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 e10763871c..96bf03075c 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.9.0 + 2.0.0 diff --git a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml index 314edb63ac..0784e58038 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.9.0 + 2.0.0 @@ -59,7 +59,7 @@ org.opendaylight.odlparent - odl4-netty-4 + odl-netty-4 xml features diff --git a/features/bgpcep-extras/pom.xml b/features/bgpcep-extras/pom.xml index f92bee923e..a04b5f0524 100644 --- a/features/bgpcep-extras/pom.xml +++ b/features/bgpcep-extras/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 @@ -23,7 +23,7 @@ pom - features4-bgpcep-extras + features-bgpcep-extras odl-bgpcep-extras-dependencies odl-bgpcep-data-change-counter diff --git a/features/bmp/features4-bmp/pom.xml b/features/bmp/features-bmp/pom.xml similarity index 95% rename from features/bmp/features4-bmp/pom.xml rename to features/bmp/features-bmp/pom.xml index 9bb6de2eef..b5503bd539 100644 --- a/features/bmp/features4-bmp/pom.xml +++ b/features/bmp/features-bmp/pom.xml @@ -6,12 +6,12 @@ org.opendaylight.odlparent feature-repo-parent - 1.9.0 + 2.0.0 org.opendaylight.bgpcep - features4-bmp + features-bmp 0.8.0-SNAPSHOT feature diff --git a/features/bmp/odl-bgpcep-bmp/pom.xml b/features/bmp/odl-bgpcep-bmp/pom.xml index 8b4310b25d..b1a4007666 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.9.0 + 2.0.0 diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml index ace1cc6452..c9ce337eba 100644 --- a/features/bmp/pom.xml +++ b/features/bmp/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 @@ -14,7 +14,7 @@ pom - features4-bmp + features-bmp odl-bgpcep-bmp diff --git a/features/pcep/features4-pcep/pom.xml b/features/pcep/features-pcep/pom.xml similarity index 98% rename from features/pcep/features4-pcep/pom.xml rename to features/pcep/features-pcep/pom.xml index e9a503762b..6a7c2d6824 100644 --- a/features/pcep/features4-pcep/pom.xml +++ b/features/pcep/features-pcep/pom.xml @@ -6,12 +6,12 @@ org.opendaylight.odlparent feature-repo-parent - 1.9.0 + 2.0.0 org.opendaylight.bgpcep - features4-pcep + features-pcep 0.8.0-SNAPSHOT feature diff --git a/features/pcep/odl-bgpcep-pcep-api/pom.xml b/features/pcep/odl-bgpcep-pcep-api/pom.xml index 55ee7291ae..483d8a0284 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml b/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml index 0bb50723d4..64e013d831 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml b/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml index 5ac0bb4c5f..94a67acfda 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-pcep-impl/pom.xml b/features/pcep/odl-bgpcep-pcep-impl/pom.xml index 28a9a3c13d..c11bea5500 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml index e1a827ddb6..37af3698ca 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml b/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml index 850f3edc34..8c5a572744 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml index e7206d8b64..bf5a06e9c6 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-pcep-topology/pom.xml b/features/pcep/odl-bgpcep-pcep-topology/pom.xml index 378a9a5d65..8159936744 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml index a05d667633..207da7576c 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-pcep/pom.xml b/features/pcep/odl-bgpcep-pcep/pom.xml index 3150ffe12a..43da5d8eb2 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-programming-api/pom.xml b/features/pcep/odl-bgpcep-programming-api/pom.xml index 1773066b8c..504cb0021b 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.9.0 + 2.0.0 diff --git a/features/pcep/odl-bgpcep-programming-impl/pom.xml b/features/pcep/odl-bgpcep-programming-impl/pom.xml index 13644d04cd..aef15ded5e 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.9.0 + 2.0.0 diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml index cf89ef7186..3cd5a09856 100644 --- a/features/pcep/pom.xml +++ b/features/pcep/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 @@ -24,7 +24,7 @@ pom - features4-pcep + features-pcep odl-bgpcep-pcep odl-bgpcep-pcep-dependencies odl-bgpcep-pcep-api diff --git a/features/pom.xml b/features/pom.xml index e8be6c7c97..5aeb9ab343 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 diff --git a/features/rsvp/features4-rsvp/pom.xml b/features/rsvp/features-rsvp/pom.xml similarity index 95% rename from features/rsvp/features4-rsvp/pom.xml rename to features/rsvp/features-rsvp/pom.xml index fcbddb4b47..501bfc09ed 100644 --- a/features/rsvp/features4-rsvp/pom.xml +++ b/features/rsvp/features-rsvp/pom.xml @@ -6,12 +6,12 @@ org.opendaylight.odlparent feature-repo-parent - 1.9.0 + 2.0.0 org.opendaylight.bgpcep - features4-rsvp + features-rsvp 0.8.0-SNAPSHOT feature diff --git a/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml b/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml index 97efc370cb..da729e29be 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.9.0 + 2.0.0 @@ -60,7 +60,7 @@ org.opendaylight.odlparent - odl4-netty-4 + odl-netty-4 xml features diff --git a/features/rsvp/odl-bgpcep-rsvp/pom.xml b/features/rsvp/odl-bgpcep-rsvp/pom.xml index a070a7a02f..8ab8330daf 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.9.0 + 2.0.0 diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml index 7fe14b9555..657f05dff8 100644 --- a/features/rsvp/pom.xml +++ b/features/rsvp/pom.xml @@ -15,7 +15,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 @@ -25,7 +25,7 @@ pom - features4-rsvp + features-rsvp odl-bgpcep-rsvp odl-bgpcep-rsvp-dependencies diff --git a/parent/pom.xml b/parent/pom.xml index 9932ee84bb..650e8acd53 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -19,7 +19,7 @@ org.opendaylight.odlparent odlparent - 1.9.0 + 2.0.0 diff --git a/pcep/controller-config/pom.xml b/pcep/controller-config/pom.xml index 1e217c1035..6895a1431e 100644 --- a/pcep/controller-config/pom.xml +++ b/pcep/controller-config/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent - 1.9.0 + 2.0.0 diff --git a/pcep/pcc-mock/pom.xml b/pcep/pcc-mock/pom.xml index 9160f22869..79e12dcde8 100644 --- a/pcep/pcc-mock/pom.xml +++ b/pcep/pcc-mock/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 1.9.0 + 2.0.0 diff --git a/pcep/pom.xml b/pcep/pom.xml index f7cf3b5602..ac1a9f6647 100644 --- a/pcep/pom.xml +++ b/pcep/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 diff --git a/pcep/testtool/pom.xml b/pcep/testtool/pom.xml index 6931c21b8d..ece01759dd 100644 --- a/pcep/testtool/pom.xml +++ b/pcep/testtool/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent - 1.9.0 + 2.0.0 diff --git a/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java b/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java index d456b48f1c..ddc7e2b5d2 100644 --- a/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java +++ b/pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.java @@ -31,7 +31,7 @@ public class PCCMock { final PCEPSessionProposalFactory proposal = new BasePCEPSessionProposalFactory((short) 120, (short) 30, caps); final PCEPSessionNegotiatorFactory snf = new DefaultPCEPSessionNegotiatorFactory(proposal, 0); final HostAndPort serverHostAndPort = HostAndPort.fromString(args[0]); - final InetSocketAddress serverAddr = new InetSocketAddress(serverHostAndPort.getHostText(), serverHostAndPort + final InetSocketAddress serverAddr = new InetSocketAddress(serverHostAndPort.getHost(), serverHostAndPort .getPortOrDefault(12345)); final InetSocketAddress clientAddr = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(0); diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java index 4cbe6830c1..8dbf3dde9b 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java @@ -163,7 +163,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< if (f == null) { return OperationResults.createUnsent(PCEPErrors.LSP_INTERNAL_ERROR).future(); } - return Futures.transform(f, new ResyncLspFunction(input)); + return Futures.transformAsync(f, new ResyncLspFunction(input)); } private ListenableFuture triggerResyncronization(final TriggerSyncArgs input) { @@ -501,7 +501,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< if (f == null) { return OperationResults.createUnsent(PCEPErrors.LSP_INTERNAL_ERROR).future(); } - return Futures.transform(f, new AddFunction(input, lsp)); + return Futures.transformAsync(f, new AddFunction(input, lsp)); } @Override @@ -514,7 +514,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< if (f == null) { return OperationResults.createUnsent(PCEPErrors.LSP_INTERNAL_ERROR).future(); } - return Futures.transform(f, (AsyncFunction, OperationResult>) rep -> { + return Futures.transformAsync(f, rep -> { final Lsp reportedLsp = validateReportedLsp(rep, input); if (reportedLsp == null) { return OperationResults.createUnsent(PCEPErrors.UNKNOWN_PLSP_ID).future(); @@ -631,7 +631,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< if (f == null) { return OperationResults.createUnsent(PCEPErrors.LSP_INTERNAL_ERROR).future(); } - return Futures.transform(f, new UpdateFunction(input)); + return Futures.transformAsync(f, new UpdateFunction(input)); } @Override diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java index 091b2c53fc..281595fe14 100644 --- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposalTest.java @@ -70,7 +70,7 @@ public class PCEPStatefulPeerProposalTest { doNothing().when(this.rTxMock).close(); doReturn(this.listenableFutureMock).when(this.rTxMock) .read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); - + doReturn(true).when(this.listenableFutureMock).isDone(); doAnswer(invocation -> { final Runnable runnable = (Runnable) invocation.getArguments()[0]; runnable.run(); diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java index 4c7af1a344..c830d1edfc 100644 --- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgrammingTest.java @@ -138,6 +138,7 @@ public class TopologyProgrammingTest extends AbstractPCEPSessionTest org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 @@ -44,6 +44,7 @@ concepts + dependency-version-management util @@ -61,9 +62,8 @@ testtool-util data-change-counter-controller-config - distribution-karaf - dependency-version-management - + diff --git a/programming/controller-config/pom.xml b/programming/controller-config/pom.xml index c8d90a4db2..7a1e69a132 100644 --- a/programming/controller-config/pom.xml +++ b/programming/controller-config/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent - 1.9.0 + 2.0.0 diff --git a/programming/pom.xml b/programming/pom.xml index d0dde9e20c..bb90e3ad9f 100644 --- a/programming/pom.xml +++ b/programming/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 diff --git a/rsvp/pom.xml b/rsvp/pom.xml index a1690bf1ec..5fd228a98f 100644 --- a/rsvp/pom.xml +++ b/rsvp/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 diff --git a/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java b/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java index 94a67aff96..6a91adafdb 100644 --- a/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java +++ b/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java @@ -39,9 +39,9 @@ public final class InetSocketAddressUtil { public static InetSocketAddress getInetSocketAddress(final String hostPortString, final Integer defaultPort) { final HostAndPort hostAndPort = HostAndPort.fromString(hostPortString); if (defaultPort != null) { - return new InetSocketAddress(hostAndPort.getHostText(), hostAndPort.getPortOrDefault(defaultPort)); + return new InetSocketAddress(hostAndPort.getHost(), hostAndPort.getPortOrDefault(defaultPort)); } - return new InetSocketAddress(hostAndPort.getHostText(), hostAndPort.getPort()); + return new InetSocketAddress(hostAndPort.getHost(), hostAndPort.getPort()); } public static InetSocketAddress getRandomLoopbackInetSocketAddress(final int port) { diff --git a/topology/pom.xml b/topology/pom.xml index 2bf95cc65d..7724c0c014 100644 --- a/topology/pom.xml +++ b/topology/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent odlparent-lite - 1.9.0 + 2.0.0 -- 2.36.6