Bump odlparent dependency to 2.0.0

also rename karaf4 features

Change-Id: I4d9d9274d12e4bb098884d70827d7ed57e8d7b48
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 82dc7109f0b4ee50d026ec5c2512df0bf94101d1..35e9671f7a39c7af3e5042c645db60a9d9688841 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.9.0</version>
+      <version>2.0.0</version>
       <relativePath/>
     </parent>
 
@@ -507,7 +507,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features4-bgp</artifactId>
+                <artifactId>features-bgp</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
@@ -655,7 +655,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features4-bmp</artifactId>
+                <artifactId>features-bmp</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
@@ -677,7 +677,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features4-bgpcep-extras</artifactId>
+                <artifactId>features-bgpcep-extras</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
@@ -706,7 +706,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features4-pcep</artifactId>
+                <artifactId>features-pcep</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
@@ -805,7 +805,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features4-rsvp</artifactId>
+                <artifactId>features-rsvp</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>

diff --git a/bgp/bmp-mock/pom.xml b/bgp/bmp-mock/pom.xml
index 98e2598a87d50edc4eb8274100eb6ec2cfa56cfd..b18e0b243271bf632211c1fb8e12744a770ea270 100644 (file)
--- a/bgp/bmp-mock/pom.xml
+++ b/bgp/bmp-mock/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/bgp/controller-config/pom.xml b/bgp/controller-config/pom.xml
index 1615a7bafbfd672383af2c809487530ce572dc05..9dcde1b1aaa21e8fb7a1f561d073cc6f62e7fbb3 100644 (file)
--- a/bgp/controller-config/pom.xml
+++ b/bgp/controller-config/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

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 7d9d9aa9661fa12124ed9b5704d375d1d02ade5d..eedce621c1aad5a9684cf984419ca4bffb617940 100644 (file)
--- 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 7268026639d1f46c521d14ae328e32ee15d35ca7..99a767304b155a6f7b63e6d4788e4dc5bbdbae32 100644 (file)
--- 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 fb4604716d123f5dd6f0b8efc78b5bcac5cfa0a6..f4c6c6580391bc6ffb8cb262588008ce9f7459d8 100644 (file)
--- a/bgp/pom.xml
+++ b/bgp/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

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 348b232d797f839ce819aefb921840270157fa74..5eb0f33f679051768477a79a4f8459845917303e 100644 (file)
--- 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 4ddf4307382cc8f2a7a723e11e935f3bc30d445d..ecedc5731e91850875d7949e6470a66c04ce0b4d 100644 (file)
--- a/bgp/testtool/pom.xml
+++ b/bgp/testtool/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index 9e676ad4a2facb3e6e34ca60b7c8ff8336559a7a..dc385280a9c408be6830bed5e0d2e983ad6fa4dd 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/dependency-version-management/pom.xml b/dependency-version-management/pom.xml
index 47a0c66afaae4e5145d15a13d9c756d434b08426..5dbd127fc94928969a119ca45d64c0271a97d096 100644 (file)
--- a/dependency-version-management/pom.xml
+++ b/dependency-version-management/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 555ce56fbf6a3a1bb679b11ec658973224dc870c..f4e7a51102d6a324e9e22a95cbe387900ad7f51b 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath />
   </parent>
 
@@ -47,7 +47,7 @@
     <!-- Project local feautures -->
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>features4-bgp</artifactId>
+      <artifactId>features-bgp</artifactId>
       <classifier>features</classifier>
       <version>${project.version}</version>
       <type>xml</type>
@@ -55,7 +55,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>features4-bmp</artifactId>
+      <artifactId>features-bmp</artifactId>
       <classifier>features</classifier>
       <version>${project.version}</version>
       <type>xml</type>
@@ -63,7 +63,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>features4-bgpcep-extras</artifactId>
+      <artifactId>features-bgpcep-extras</artifactId>
       <classifier>features</classifier>
       <version>${project.version}</version>
       <type>xml</type>
@@ -71,7 +71,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>features4-pcep</artifactId>
+      <artifactId>features-pcep</artifactId>
       <classifier>features</classifier>
       <version>${project.version}</version>
       <type>xml</type>
@@ -79,7 +79,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>features4-rsvp</artifactId>
+      <artifactId>features-rsvp</artifactId>
       <classifier>features</classifier>
       <version>${project.version}</version>
       <type>xml</type>
@@ -87,7 +87,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features4-restconf</artifactId>
+      <artifactId>features-restconf</artifactId>
       <classifier>features</classifier>
       <version>${restconfVersion}</version>
       <type>xml</type>

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 a1f223c3111d3bb10d0ec6682fdabca8bad6b913..8fea8420cee57caa95f627ff0547e5c4627bbd6b 100644 (file)
--- a/features/bgp/features4-bgp/pom.xml
+++ b/features/bgp/features-bgp/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     
     <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features4-bgp</artifactId>
+    <artifactId>features-bgp</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 

diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
index 3da6e67d530b7ac85ad5b416cbdfac25320d19fb..458354b26e33af4eeb2d004a5d2807fa326159a7 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-cli/pom.xml b/features/bgp/odl-bgpcep-bgp-cli/pom.xml
index 7316e4e7a1b97c9cbdde880aa50dc588fbb5121b..c699acfce4bd4e747cfdd37648f31d7b5f463575 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-cli/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-cli/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml b/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml
index d07fa4ccfbd02113a9ad3b2236f13fa4c3053d93..6dd29b3ee0f50668bc2862f547bcdbbff9315088 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml b/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml
index 1120e41fdb239c28a7d415f0593681600dde0615..61262dbe6bff82613591c0b4ce59ed44c95a62c7 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl4-netty-4</artifactId>
+            <artifactId>odl-netty-4</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml b/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
index 29355bcf53a7424f2f3ecc5551702563888ea9b5..575f62234ec9c43746949ad13bef559c4eace60e 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml b/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml
index 5eb047c26e1048a95a9ad3fe44ed2448cbe14d2a..42970326e481384909928e8b27e6f113a44e5ba9 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-inet/pom.xml b/features/bgp/odl-bgpcep-bgp-inet/pom.xml
index c106f7f64d3f8fd1d2a27e8a7e380aa67e5c9025..60e888830faa00d856498470fee6ede6ed865579 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-inet/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-inet/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml b/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml
index 4d243296aae48cc0d716d13cd4f3ac1223769f00..387ce4e1d328b12c9f0ba5f0daeeb832cc18d070 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml b/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml
index b24b057d1a30a01a0769694a5457389459942777..2143539475de406b68954d186c6545f797a61d50 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
index fd1171743db297023384d5835cee36cdaf1210f2..fb066c192800f5c813089606784a00e8e4e2f512 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml
index 4a6fd879ed7da5eb69e0233997f2847ca5e9e244..df38998a0888defd0894e178921dbb22d2196229 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml b/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
index fa7a211c9a06f1d761e503ff898f0dda97f9b5a9..54d2d3fe7fdfd767ef3c5229a117d39463c42855 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-parser/pom.xml b/features/bgp/odl-bgpcep-bgp-parser/pom.xml
index 575f908ceb820d896f85c4d63b171af99a9083bf..e30bfb8d7d710aac23561f4b415fb712c605ef9c 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-parser/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-parser/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

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 712563344941214744e3f0f4180bfc6fc6c99c1a..435943e1dacc99aedcd4800475e9744c0420c8c2 100644 (file)
--- 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 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
index 394447be6515069f67587e203e56e6f7f472c384..f3e83d0a8a040353b782fbd4fbe7664c0d125c4e 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
index d7aba33663c294260bea1242a35d0a0e79aa3555..a7dee630a332731a5bb4b98d0dd9aa43b5fc373b 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp-topology/pom.xml b/features/bgp/odl-bgpcep-bgp-topology/pom.xml
index dbc0d2e21eba1a6cd99c3517c9f1f10e356cd674..38591e3cc10e8e7d8905276205114f6a8569375e 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-topology/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-topology/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-bgp/pom.xml b/features/bgp/odl-bgpcep-bgp/pom.xml
index 832c890bd22fa3d9ee61487e2f1229d1b6788175..7f1ad2a16130886f6858002078924adbe2c7a9a1 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/odl-bgpcep-config-files/pom.xml b/features/bgp/odl-bgpcep-config-files/pom.xml
index c9b275d0576b2003424f11cc35263bcd09880163..3a3d01ca544d15d9a8c7b5a8a90b32e4dc938606 100644 (file)
--- a/features/bgp/odl-bgpcep-config-files/pom.xml
+++ b/features/bgp/odl-bgpcep-config-files/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     

diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml
index aadb79e5511f152a31665ff2248009ce210dcf4c..c9e169ed77a30001f5c19e2f6a5e2acb2653d46a 100644 (file)
--- a/features/bgp/pom.xml
+++ b/features/bgp/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>features4-bgp</module>
+        <module>features-bgp</module>
         <module>odl-bgpcep-bgp</module>
         <module>odl-bgpcep-bgp-dependencies</module>
         <module>odl-bgpcep-config-files</module>

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 bf562a909e34f0c0ebd688e24b6d8ca0a1f294c0..701a28aa35761156d9e381abae5f5a7f813bb550 100644 (file)
--- a/features/bgpcep-extras/features4-bgpcep-extras/pom.xml
+++ b/features/bgpcep-extras/features-bgpcep-extras/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features4-bgpcep-extras</artifactId>
+    <artifactId>features-bgpcep-extras</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 

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 e10763871c3e7e892df9602175be6f3cbe037a91..96bf03075c62a53470da58ec85c361f0cb6f9bc8 100644 (file)
--- 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 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml
index 314edb63ac7e9b63c8e9eb867e6ebc9c23634ac3..0784e5803849c635cfe31acab9a6598f3b752d17 100644 (file)
--- a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml
+++ b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl4-netty-4</artifactId>
+            <artifactId>odl-netty-4</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/bgpcep-extras/pom.xml b/features/bgpcep-extras/pom.xml
index f92bee923e9636d2e44908bfce47b3425c7906ce..a04b5f0524c17795a781e6827df40fc4f234d83e 100644 (file)
--- a/features/bgpcep-extras/pom.xml
+++ b/features/bgpcep-extras/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>features4-bgpcep-extras</module>
+        <module>features-bgpcep-extras</module>
         <module>odl-bgpcep-extras-dependencies</module>
         <module>odl-bgpcep-data-change-counter</module>
     </modules>

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 9bb6de2eefae0c2437e97254ae1bf2fa002b12e2..b5503bd5392b05bae9154ce6288c3cb96642ccee 100644 (file)
--- a/features/bmp/features4-bmp/pom.xml
+++ b/features/bmp/features-bmp/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features4-bmp</artifactId>
+    <artifactId>features-bmp</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 

diff --git a/features/bmp/odl-bgpcep-bmp/pom.xml b/features/bmp/odl-bgpcep-bmp/pom.xml
index 8b4310b25d59f5a5924cc95340205a1214631332..b1a4007666d80e0f74ecced220cd8c8f3e0cf365 100644 (file)
--- a/features/bmp/odl-bgpcep-bmp/pom.xml
+++ b/features/bmp/odl-bgpcep-bmp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml
index ace1cc64528c49350c50f8ab46e5041124a09adf..c9ce337eba7af0115fd3ca7f24936665ae45e7a6 100644 (file)
--- a/features/bmp/pom.xml
+++ b/features/bmp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -14,7 +14,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>features4-bmp</module>
+        <module>features-bmp</module>
         <module>odl-bgpcep-bmp</module>
     </modules>
 

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 e9a503762be5aa171d739e4a89951a23f76a1434..6a7c2d68245f180beb5ebc56406dfbac4d1a6d23 100644 (file)
--- a/features/pcep/features4-pcep/pom.xml
+++ b/features/pcep/features-pcep/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features4-pcep</artifactId>
+    <artifactId>features-pcep</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 

diff --git a/features/pcep/odl-bgpcep-pcep-api/pom.xml b/features/pcep/odl-bgpcep-pcep-api/pom.xml
index 55ee7291aed659239b0c547b604ce94993bda159..483d8a028461723a6b595f3744dfc30a73dfb39a 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-api/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml b/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml
index 0bb50723d4c4b4355e0880a2f0dbcd7ba2523008..64e013d831ea205797702449fba3c14386dd8f51 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml b/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml
index 5ac0bb4c5f3ef79ac3f252b333548985d0392528..94a67acfda6e825b811093cc9080e8bb2021c5e1 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-dependencies/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pcep/odl-bgpcep-pcep-impl/pom.xml b/features/pcep/odl-bgpcep-pcep-impl/pom.xml
index 28a9a3c13de21a5f3103594dbdf4e6d79c8e516c..c11bea5500bf3b43952c0972337a66d27fb4cde9 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-impl/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-impl/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     

diff --git a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
index e1a827ddb6a3e55f263210fa9f55c6c8d7250ba6..37af3698ca5e4047014efe4891454d763af69155 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml b/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml
index 850f3edc34336db118701858afcc030802c24f2f..8c5a57274415801f6c8e2e5695d949ddbb235d0a 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-stateful07/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
index e7206d8b6487d4f254127ff0936db83d6f4ef6a7..bf5a06e9c6a194fb2f3f895377e7a83f1c237b94 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pcep/odl-bgpcep-pcep-topology/pom.xml b/features/pcep/odl-bgpcep-pcep-topology/pom.xml
index 378a9a5d6536ff9dd3bed8602a93228dc0f2aad3..8159936744bff656f6970810914495e13befa9a6 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-topology/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-topology/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     

diff --git a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml b/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
index a05d667633651218edf22b741fb7efd740534106..207da7576ca7a624017b89a1d50129ac8857d472 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pcep/odl-bgpcep-pcep/pom.xml b/features/pcep/odl-bgpcep-pcep/pom.xml
index 3150ffe12ac3b14a1c2d996b8658fcacda5a2b2f..43da5d8eb251f572eae8aeececf32de78d3bae6c 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pcep/odl-bgpcep-programming-api/pom.xml b/features/pcep/odl-bgpcep-programming-api/pom.xml
index 1773066b8c1281eed58c3a0671273ef965a21980..504cb0021b4ee2fc6db60bb0304ab14df363add6 100644 (file)
--- a/features/pcep/odl-bgpcep-programming-api/pom.xml
+++ b/features/pcep/odl-bgpcep-programming-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     

diff --git a/features/pcep/odl-bgpcep-programming-impl/pom.xml b/features/pcep/odl-bgpcep-programming-impl/pom.xml
index 13644d04cdf501371927bcc33cfae192b8cd762f..aef15ded5ed36e56df251f44e5244a16ac221831 100644 (file)
--- a/features/pcep/odl-bgpcep-programming-impl/pom.xml
+++ b/features/pcep/odl-bgpcep-programming-impl/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml
index cf89ef7186752e1632df9e3fde6c6e055137913e..3cd5a098569e7f23d0a374af190122a4d7e0ba85 100644 (file)
--- a/features/pcep/pom.xml
+++ b/features/pcep/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -24,7 +24,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>features4-pcep</module>
+        <module>features-pcep</module>
         <module>odl-bgpcep-pcep</module>
         <module>odl-bgpcep-pcep-dependencies</module>
         <module>odl-bgpcep-pcep-api</module>

diff --git a/features/pom.xml b/features/pom.xml
index e8be6c7c97314d3b1a946502cc3a2e31121f1768..5aeb9ab3438d3715ed1d71d205d87b3d448eff1e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 

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 fcbddb4b47cce33e63230f9330a25cf03d39755e..501bfc09ed6103c25d3ebad1cf09f4950ebacde0 100644 (file)
--- a/features/rsvp/features4-rsvp/pom.xml
+++ b/features/rsvp/features-rsvp/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     
     <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features4-rsvp</artifactId>
+    <artifactId>features-rsvp</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 

diff --git a/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml b/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml
index 97efc370cbdf732f377aae08c043bb57e8f2e676..da729e29be6dff9f49f56276b1bd6217f81e9520 100644 (file)
--- a/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml
+++ b/features/rsvp/odl-bgpcep-rsvp-dependencies/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -60,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl4-netty-4</artifactId>
+            <artifactId>odl-netty-4</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/rsvp/odl-bgpcep-rsvp/pom.xml b/features/rsvp/odl-bgpcep-rsvp/pom.xml
index a070a7a02f24c35233b6a18fc8d1c323359c2ca0..8ab8330dafbcf5c51327494fd31dd692fc9c32a8 100644 (file)
--- a/features/rsvp/odl-bgpcep-rsvp/pom.xml
+++ b/features/rsvp/odl-bgpcep-rsvp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml
index 7fe14b955593aeffca1bf514eadc3fd46540d777..657f05dff8b093960959f8035d063c197c878953 100644 (file)
--- a/features/rsvp/pom.xml
+++ b/features/rsvp/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -25,7 +25,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>features4-rsvp</module>
+        <module>features-rsvp</module>
         <module>odl-bgpcep-rsvp</module>
         <module>odl-bgpcep-rsvp-dependencies</module>
     </modules>

diff --git a/parent/pom.xml b/parent/pom.xml
index 9932ee84bba03ccc6bde6aa2c25280417e6b082b..650e8acd53e58e2e01273acca29e9208e13f399c 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath></relativePath>
     </parent>
 

diff --git a/pcep/controller-config/pom.xml b/pcep/controller-config/pom.xml
index 1e217c1035d64b16d46c65c91ea204eed5e73860..6895a1431ead755860234632b5097d49ceb105f4 100644 (file)
--- a/pcep/controller-config/pom.xml
+++ b/pcep/controller-config/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/pcc-mock/pom.xml b/pcep/pcc-mock/pom.xml
index 9160f22869dcccfad84a520ff7313bee10051089..79e12dcde807c20181e7c81b6dd82aee5822179a 100644 (file)
--- a/pcep/pcc-mock/pom.xml
+++ b/pcep/pcc-mock/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/pom.xml b/pcep/pom.xml
index f7cf3b5602c90b2610194f8509f4764816923a2d..ac1a9f664752c3b0dbd6f75f5ca6231d97d29f38 100644 (file)
--- a/pcep/pom.xml
+++ b/pcep/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/testtool/pom.xml b/pcep/testtool/pom.xml
index 6931c21b8d6f7b050d80d6b59981e1a5f3a375cf..ece01759ddc855b6e5a2f7870de7cd96561ab077 100644 (file)
--- a/pcep/testtool/pom.xml
+++ b/pcep/testtool/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

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 d456b48f1c7309f25ee106c54bb24daed6220665..ddc7e2b5d2a5af6ed71bde0d65edd62ba139b26e 100644 (file)
--- 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 4cbe6830c140c0e439006b9024e865c9b3fec26f..8dbf3dde9ba1ef0e8c2fc28e103805c3aaaf23f5 100644 (file)
--- 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<OperationResult> 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<Optional<ReportedLsp>, 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 091b2c53fcf8c020a7b239a9fbecb7363771db58..281595fe142f2b4f029db8afd95b5168cab38c99 100644 (file)
--- 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 4c7af1a3440a1a643efac394f844d2ad661c99f8..c830d1edfc36abfd4fc79ae1e4a34aaf93640573 100644 (file)
--- 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<MockedTopol
         }).when(listener).ensureLspOperational(Mockito.any(EnsureLspOperationalInput.class));
         Mockito.doNothing().when(listener).close();
         Mockito.doReturn(this.instruction).when(this.instructionFuture).get();
+        Mockito.doReturn(true).when(this.instructionFuture).isDone();
         Mockito.doNothing().when(this.instruction).executionCompleted(Mockito.any(InstructionStatus.class), Mockito.any(Details.class));
         Mockito.doReturn(this.instructionFuture).when(this.scheduler).scheduleInstruction(Mockito.any(SubmitInstructionInput.class));
         this.topologyProgramming = new TopologyProgramming(this.scheduler, this.manager);

diff --git a/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java b/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java
index efeb669c9617de7228d05efc5b97d2b6683ddfbf..f65fdb4f5beb5035b05b3b51f0f4ddef3940d92b 100644 (file)
--- a/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java
+++ b/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java
@@ -172,6 +172,7 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest {
             return TunnelProgrammingTest.this.futureRemoveLspOutput;
         }).when(this.topologyService).removeLsp(Mockito.any(RemoveLspInput.class));
         Mockito.doReturn(this.instruction).when(this.instructionFuture).get();
+        Mockito.doReturn(true).when(this.instructionFuture).isDone();
         Mockito.doReturn(this.instructionFuture).when(this.scheduler).scheduleInstruction(Mockito.any(SubmitInstructionInput.class));
 
         createInitialTopology();

diff --git a/pom.xml b/pom.xml
index 2a469936964635e01656d0335468cc96b7dea033..079c121305bcdb15ee65470176c91b98f2869bb1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 
@@ -44,6 +44,7 @@
 
         <!-- Common infra -->
         <module>concepts</module>
+        <module>dependency-version-management</module>
         <module>util</module>
 
         <!-- Subsystems -->
@@ -61,9 +62,8 @@
         <module>testtool-util</module>
         <module>data-change-counter-controller-config</module>
 
-        <module>distribution-karaf</module>
-        <module>dependency-version-management</module>
-
+        <!-- FIXME: re-enable this:
+        <module>distribution-karaf</module-->
     </modules>
 
     <build>

diff --git a/programming/controller-config/pom.xml b/programming/controller-config/pom.xml
index c8d90a4db233e1ababef52202a161cd08ebfe81c..7a1e69a1327508c0c8048ba7988c62209052ba7c 100644 (file)
--- a/programming/controller-config/pom.xml
+++ b/programming/controller-config/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/programming/pom.xml b/programming/pom.xml
index d0dde9e20c9d3c86cc3843f145ba7a5c4ef3a5f3..bb90e3ad9fa60410eb79769d49c1e7f93dc97f48 100644 (file)
--- a/programming/pom.xml
+++ b/programming/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/rsvp/pom.xml b/rsvp/pom.xml
index a1690bf1eca7e6ce94830824508f7fbf30214b1e..5fd228a98f731477cee8c3c7ba8d55b941febcb1 100644 (file)
--- a/rsvp/pom.xml
+++ b/rsvp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

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 94a67aff965bb2186090ab07e1d4c925ae048c8a..6a91adafdb662c7251d126817976ba7d27b119d9 100644 (file)
--- 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 2bf95cc65df69379b39280251641c27ea36ad82d..7724c0c014d6e036c8cb3ea2e14bebe822b1dada 100644 (file)
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>