Bump odlparent to 3.1.2

Change-Id: Id85c9aa0038633cbec58f747841121fd31067eab
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index 3c3e98c57f248697a6fc6f35e65decc5f77eff25..6e5eca1b67ee2d956fd0a80a627c42697f447e75 100644 (file)
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf-connector/odl-message-bus/pom.xml b/features/netconf-connector/odl-message-bus/pom.xml
index 1c29bb15619f25a68ad1b28d972938dc3e3a8030..e88eaafbd4538d2fecdfeba8efbce76ca29fd6c9 100644 (file)
--- a/features/netconf-connector/odl-message-bus/pom.xml
+++ b/features/netconf-connector/odl-message-bus/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
index 92e2fc8aeb7cf7b2a0aed88b3c4d9bf74ee5680f..6aa128681dced518f6d30aeb1d38de4ee8c16c76 100644 (file)
--- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
+++ b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml
index afbee520e01a7842dd2d8fd837e2f79f702f4177..18e563c7414cbe77a8afff9e0a703c6333d250b1 100644 (file)
--- a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml
+++ b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/netconf-connector/odl-netconf-connector-all/pom.xml
index c63daab96e055107158dec89585417beb80895f4..583fe1f19f2d247a453958f83d37b1f15c9c5e8a 100644 (file)
--- a/features/netconf-connector/odl-netconf-connector-all/pom.xml
+++ b/features/netconf-connector/odl-netconf-connector-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
index 6ceceeb5a2e7b7e849a0b41096ddad7e3691e4bc..c37f7b4a8d6dbe887e22edba279766b2b853ee9b 100644 (file)
--- a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
+++ b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml
index e64fe761f7fd1ff82914d515c912d66ab5e77959..cfa1193f7dd5e4341359c0433a1bb616611ce3cb 100644 (file)
--- a/features/netconf-connector/odl-netconf-connector/pom.xml
+++ b/features/netconf-connector/odl-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/odl-netconf-console/pom.xml b/features/netconf-connector/odl-netconf-console/pom.xml
index 1bc22e56cb05a8e2fdcfd92729a4b8d43922204a..60e106027eee13233534308d80d214523b86deba 100644 (file)
--- a/features/netconf-connector/odl-netconf-console/pom.xml
+++ b/features/netconf-connector/odl-netconf-console/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/odl-netconf-topology/pom.xml b/features/netconf-connector/odl-netconf-topology/pom.xml
index 513a48d03b33038a3a2a6ce4a2cc460be3f7507b..9252d0addc7cd4acc4756dbf908d513852efcaaf 100644 (file)
--- a/features/netconf-connector/odl-netconf-topology/pom.xml
+++ b/features/netconf-connector/odl-netconf-topology/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index e828bd8b123bde61e25fc403320d694282237535..28738a0c9ed8430e9e9f4e3e9eed8d05b9528784 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.netconf</groupId>

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index 158193c4090b6b0874a4c8953557e3d52aef95ac..a246f978656bdb55cca4a22f6c9744b34486bd12 100644 (file)
--- a/features/netconf/features-netconf/pom.xml
+++ b/features/netconf/features-netconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
index c3f72cbaef2004cf13044c3f22238cd70735e949..3b53ccd8b80e8ef49d7bb35d5928ae7db6366268 100644 (file)
--- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
+++ b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml
index 7ed633e6d4deaa7103fd1f08c2cef78a9d57fb6c..9287b232bee09ed26666073615c6d7ecf2f6dedd 100644 (file)
--- a/features/netconf/odl-aaa-netconf-plugin/pom.xml
+++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-all/pom.xml b/features/netconf/odl-netconf-all/pom.xml
index f9d64ed10a81993af06b883bd72b5fe18e154dff..833241fbef3a8d36cae6c827058b7881903cdc9b 100644 (file)
--- a/features/netconf/odl-netconf-all/pom.xml
+++ b/features/netconf/odl-netconf-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index e6ebba9366bbed811fee012fc7177444f2c33171..86cbef29535b1e4c97022d8b723f43207dfd3b99 100644 (file)
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/netconf/odl-netconf-client/pom.xml
index 5f6044a7d20173fd06b4131bdc5a2facc5551e4f..9a04a21d6cb93357ee4d3eeb8004c76354aafe32 100644 (file)
--- a/features/netconf/odl-netconf-client/pom.xml
+++ b/features/netconf/odl-netconf-client/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml
index 7e194e371b97b67f68fce6a58cfb937ffc429061..6878e32e079291ba088fb3e2b35af3c329665082 100644 (file)
--- a/features/netconf/odl-netconf-impl/pom.xml
+++ b/features/netconf/odl-netconf-impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-mapping-api/pom.xml b/features/netconf/odl-netconf-mapping-api/pom.xml
index 609b61cbdc6043792a79283465c7570729550742..3cd7ab3a29cdfa3bef936d696c67a5d565aeddb2 100644 (file)
--- a/features/netconf/odl-netconf-mapping-api/pom.xml
+++ b/features/netconf/odl-netconf-mapping-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml
index 518e2410dd47340b95c62bda0fb3363a75878994..449d90a55b5e6bfea2e146b4745a8e8ac93d166b 100644 (file)
--- a/features/netconf/odl-netconf-mdsal/pom.xml
+++ b/features/netconf/odl-netconf-mdsal/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-monitoring/pom.xml b/features/netconf/odl-netconf-monitoring/pom.xml
index 501631b9568d1610c835242a78a40389b4d63a81..4cbf86c9e438a5f9e78972bc3646b9ff85fbb90a 100644 (file)
--- a/features/netconf/odl-netconf-monitoring/pom.xml
+++ b/features/netconf/odl-netconf-monitoring/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml
index d74dce623d810348104da82090f7f13f8d7053e6..f8f2cd5839b66c66084611031c51e52258c6e4a0 100644 (file)
--- a/features/netconf/odl-netconf-netty-util/pom.xml
+++ b/features/netconf/odl-netconf-netty-util/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml
index 71300c618e7dbed233ddaa6bd8e474f211c1f0f7..12ba3b7bb905d45fe210e50a4134ae7c58501db8 100644 (file)
--- a/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml
+++ b/features/netconf/odl-netconf-netty-util/src/main/feature/feature.xml
@@ -6,7 +6,7 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
   -->
-<features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-netconf-netty-util" version="${project.version}">
         <feature version="${karaf.version}">ssh</feature>
         <feature version="[3.1.0,4)">odl-netty-4</feature>

diff --git a/features/netconf/odl-netconf-notifications-api/pom.xml b/features/netconf/odl-netconf-notifications-api/pom.xml
index 6ba941a319de8bf0c5cf4fc0b1204e249271c054..db0a354fbddce275030c6bb1436aa9ef2d227e2a 100644 (file)
--- a/features/netconf/odl-netconf-notifications-api/pom.xml
+++ b/features/netconf/odl-netconf-notifications-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-notifications-impl/pom.xml b/features/netconf/odl-netconf-notifications-impl/pom.xml
index 1c4fcc0c444b5ed5d9f06884b88421ab48157ce7..329ec243925c15cc55071690ffa0e1fe98a0500c 100644 (file)
--- a/features/netconf/odl-netconf-notifications-impl/pom.xml
+++ b/features/netconf/odl-netconf-notifications-impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml
index 127c09a3a8356a00802b01b156183ff57896f3bf..f83378443f1eeac9c93ae49280c9c29642a24609 100644 (file)
--- a/features/netconf/odl-netconf-ssh/pom.xml
+++ b/features/netconf/odl-netconf-ssh/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml
index b7fc229018667c588a8dc4997219f4d50b262762..ed22788f5936f565ae9312835b6a96a540e62493 100644 (file)
--- a/features/netconf/odl-netconf-tcp/pom.xml
+++ b/features/netconf/odl-netconf-tcp/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml
index e57c8a16efa28af644d79c84523996820f16fd31..0c8c2d029762ed6a4123824afc48e23b73725170 100644 (file)
--- a/features/netconf/odl-netconf-util/pom.xml
+++ b/features/netconf/odl-netconf-util/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 827106b74e169dac554c1c4d37c5e1a717cc69db..6b72da290cb29a43ebc3aad43174a883cb6edcb6 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 9b19b1a9925bad6ecfebea2c2aaf8712fb33afa7..3fefe7b101956c1d537379b5cb15c790caa94822 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/protocol-framework/features-protocol-framework/pom.xml b/features/protocol-framework/features-protocol-framework/pom.xml
index 55ed435244b0e6c7e18db8f04761eaf5cec88f1e..63ed617e21b040d6fe1bd9ff4594de855ae2171a 100644 (file)
--- a/features/protocol-framework/features-protocol-framework/pom.xml
+++ b/features/protocol-framework/features-protocol-framework/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/protocol-framework/odl-protocol-framework/pom.xml b/features/protocol-framework/odl-protocol-framework/pom.xml
index 336cf2608804c50262cb01976d01c4faab47be47..e62a13bffb20fd723cddbc4e4a28b4fc59e047b2 100644 (file)
--- a/features/protocol-framework/odl-protocol-framework/pom.xml
+++ b/features/protocol-framework/odl-protocol-framework/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/protocol-framework/pom.xml b/features/protocol-framework/pom.xml
index 88387b71d4ed9ea4be6793c8130d4e541188e39e..88fa05af2963be125f31874c362c7dc569e7759e 100644 (file)
--- a/features/protocol-framework/pom.xml
+++ b/features/protocol-framework/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index 02c37c939f89d68874c1b0c3c93610d39b5123da..80cb728acce981698b35628845f2ffe56bd7540f 100644 (file)
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml
index 4d0682e35a991c00bcd123d11ed24812191893b0..9de39ef1da88ac48117dcbcf054de6f1270aec89 100644 (file)
--- a/features/restconf/odl-mdsal-apidocs/pom.xml
+++ b/features/restconf/odl-mdsal-apidocs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-jackson-2.8</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.2</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml b/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
index 58a753b6351ec94b17d75e401fd75f2ed3dc535a..52ad5e11afd6151f2ef74e0c0d8793d461bcb518 100644 (file)
--- a/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
+++ b/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
@@ -6,7 +6,7 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
   -->
-<features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-mdsal-apidocs" version="${project.version}">
         <feature version="[3.1.0,4)">odl-jackson-2.8</feature>
     </feature>

diff --git a/features/restconf/odl-restconf-all/pom.xml b/features/restconf/odl-restconf-all/pom.xml
index cea087c19b93edbf06f02f743aa5f56395af1592..b501d63f34ff4ac24bcb2f0bbc4a2147db9809ae 100644 (file)
--- a/features/restconf/odl-restconf-all/pom.xml
+++ b/features/restconf/odl-restconf-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/restconf/odl-restconf-base/pom.xml b/features/restconf/odl-restconf-base/pom.xml
index 9dc17251e03b2dd431204fb4b3223b1ff409af31..f8e9f060eed9fcca215c32b33702b1f058b05695 100644 (file)
--- a/features/restconf/odl-restconf-base/pom.xml
+++ b/features/restconf/odl-restconf-base/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index 4ae676ab2d53306339cdc3796acb6988d6e7284e..b7eddf7aadc48137409de76038e124155f4be889 100644 (file)
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@ -6,15 +6,13 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 
@@ -129,7 +127,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-jackson-2.8</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.2</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/restconf/odl-restconf-common/src/main/feature/feature.xml b/features/restconf/odl-restconf-common/src/main/feature/feature.xml
index d9fabb8c3c314ad584da2c5434e9db0891f74376..738e15a99c713c1a71983b77ee214f047fd4c152 100644 (file)
--- a/features/restconf/odl-restconf-common/src/main/feature/feature.xml
+++ b/features/restconf/odl-restconf-common/src/main/feature/feature.xml
@@ -6,7 +6,7 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
   -->
-<features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-restconf-common" version="${project.version}">
         <feature version="[3.1.0,4)">odl-karaf-feat-jetty</feature>
         <feature version="[3.1.0,4)">odl-jackson-2.8</feature>

diff --git a/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml b/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml
index ee2fffaceffcbe1668e46111d3f44500970836fb..caf1055f85c7bcada94b7dfe9f9fc4de37ce140e 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
index 9fb62b3eb80952b64bace70d58288bd6c8998401..6ab5c901526ccff083c63872c52368ce48fef293 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml
index a4940392f4326e3015e29ca83dbfdc495c0f8060..7b08360eb995d77d945393a67345031c8e9ac758 100644 (file)
--- a/features/restconf/odl-restconf-noauth/pom.xml
+++ b/features/restconf/odl-restconf-noauth/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml
index 003d60c814424288f76e1d839e4bd381fc067b8b..15306dc1f5f69a6164131f215cb98b05b304d040 100644 (file)
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/restconf/odl-restconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/restconf/odl-restconf/src/main/feature/feature.xml b/features/restconf/odl-restconf/src/main/feature/feature.xml
index 8d583bf3bef0f76a087d7639f337e12edcb8ba9c..db943789d293f0f876cb67f3c2304479a77fa2bd 100644 (file)
--- a/features/restconf/odl-restconf/src/main/feature/feature.xml
+++ b/features/restconf/odl-restconf/src/main/feature/feature.xml
@@ -6,7 +6,7 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
   -->
-<features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-restconf" version="${project.version}">
         <feature version="[3.1.0,4)">odl-jackson-2.8</feature>
     </feature>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 2df20b9a4a7255e15fb295cc77240b330346d015..6d9f1892e3dc520367e1792858a4571cd03f0383 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
     <artifactId>features-restconf-aggregator</artifactId>

diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index 6f853577489acfcccd1fb2d72cd02655c74301a3..6293b4f0f7ecb3d2f03d751e121309d69d0e179f 100644 (file)
--- a/features/yanglib/features-yanglib/pom.xml
+++ b/features/yanglib/features-yanglib/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml
index 2a73a76e70b31b421f09d33024f91f578ca34ebe..614aa3bc25c94cc6bce1bd9ad3432e264c3f5848 100644 (file)
--- a/features/yanglib/odl-yanglib/pom.xml
+++ b/features/yanglib/odl-yanglib/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/odl-yanglib/src/main/feature/feature.xml b/features/yanglib/odl-yanglib/src/main/feature/feature.xml
index f8acb42040b3bb24e145ecd942fc023227d302d4..9612d4913305dccdb3816ee056293bdf288e2b83 100644 (file)
--- a/features/yanglib/odl-yanglib/src/main/feature/feature.xml
+++ b/features/yanglib/odl-yanglib/src/main/feature/feature.xml
@@ -6,7 +6,7 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
   -->
-<features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-yanglib" version="${project.version}">
         <feature version="[3.1.0,4)">odl-karaf-feat-jetty</feature>
     </feature>

diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index 7577a509ad50a747b892adeef0ee6addb45ca9b5..eaced2535aecc1d50e9359b1db351f078508269d 100644 (file)
--- a/features/yanglib/pom.xml
+++ b/features/yanglib/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 1fecd96e1ab884bac850c2290d89c99ed9b53ca3..41a24102c083f4249270202859d3ff86f9021b93 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>

diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index 50af9b9974efce4c93841dbb6176a776db321c0f..737de17f36df5c87a7bbbff37f89b330fde8d4a7 100644 (file)
--- a/netconf/models/pom.xml
+++ b/netconf/models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/netconf-artifacts/pom.xml b/netconf/netconf-artifacts/pom.xml
index a56e932b5aa0ac9e2c64a4e13148e1891c799675..be58318e98534fbe4ae2d9fdf32d928813e41def 100644 (file)
--- a/netconf/netconf-artifacts/pom.xml
+++ b/netconf/netconf-artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
       <relativePath/>
     </parent>
 

diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index 66a9ff3adf733925838fadf3094c18866c25df34..dfe93f575eca31d37672d386d91b5f88818d2729 100644 (file)
--- a/netconf/netconf-config/pom.xml
+++ b/netconf/netconf-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/netconf-parent/pom.xml b/netconf/netconf-parent/pom.xml
index 98ee2e75867e2253043f044d79715cbba599fefc..acb0b824a9e4b7a4529d391ca567daaf6699ec11 100644 (file)
--- a/netconf/netconf-parent/pom.xml
+++ b/netconf/netconf-parent/pom.xml
@@ -58,14 +58,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <!-- TODO Remove the dependencies when upgrading to odlparent 3.1.1 or later -->
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>findbugs</artifactId>
-            <version>3.1.1</version>
-          </dependency>
-        </dependencies>
         <configuration>
           <failOnError>true</failOnError>
         </configuration>

diff --git a/netconf/netconf-topology-config/pom.xml b/netconf/netconf-topology-config/pom.xml
index 1e3353662ce3bc8f8129297f74b3dcf13267beb6..06509e07617c62f131fff40192ae2b841232c716 100644 (file)
--- a/netconf/netconf-topology-config/pom.xml
+++ b/netconf/netconf-topology-config/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 4ff9aa326fd017695332c651efff8a6c1d64544e..1f26843fc0a222bb7f2bf11b836d60059adacd37 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index 700699a41cb4fdde061f6057f15ed390b095483a..fcdbc0a35ce1e4e615128d45c7421069bc0ea44c 100644 (file)
--- a/netconf/tools/pom.xml
+++ b/netconf/tools/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 5a578f02320c25ae6ed0a899039b2f46ee451baa..6ae5c38495dffce5579840059c8a810453cd412f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/protocol-framework/pom.xml b/protocol-framework/pom.xml
index d95d93e2fd8d7a8c27019f1da51c4ce90fbac56b..558ddd41bcff7a58fcfd09feae5a8d787b13eea6 100644 (file)
--- a/protocol-framework/pom.xml
+++ b/protocol-framework/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 945e966c4b0aa6d6d300ed7211f192cdce6a048c..8c80b93ae6a9a1abead18c483195adda14bb3aae 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/restconf-artifacts/pom.xml b/restconf/restconf-artifacts/pom.xml
index ed4f1b2ab34f501d36262541b68330cbbee403d9..3a31580640b9b90f7537df8e307cedc038edd951 100644 (file)
--- a/restconf/restconf-artifacts/pom.xml
+++ b/restconf/restconf-artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.2</version>
       <relativePath/>
     </parent>
 

diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml
index 1f164c01d15373888ee4fa7a40b89a3bf7b5efda..7d758a4c7dad898d3553d4b14c5773c6c1505c97 100644 (file)
--- a/restconf/restconf-models/pom.xml
+++ b/restconf/restconf-models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
 

diff --git a/restconf/restconf-parent/pom.xml b/restconf/restconf-parent/pom.xml
index 7e6a0dd9c9bd3179b3da1331aced2b06e14a977d..b5bb71c3202a4aff75b6296e3fc632035b51162c 100644 (file)
--- a/restconf/restconf-parent/pom.xml
+++ b/restconf/restconf-parent/pom.xml
@@ -70,14 +70,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <!-- TODO Remove the dependencies when upgrading to odlparent 3.1.1 or later -->
-        <dependencies>
-          <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>findbugs</artifactId>
-            <version>3.1.1</version>
-          </dependency>
-        </dependencies>
         <configuration>
           <failOnError>true</failOnError>
         </configuration>

diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index 134976edc5b8f006bc8ec533b9190492a05f51d6..3c71908ca91eef629793d924e598e4f6180dce48 100644 (file)
--- a/restconf/sal-rest-connector-config/pom.xml
+++ b/restconf/sal-rest-connector-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>