Bump odlparent to 3.1.2

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

diff --git a/benchmark/artifacts/pom.xml b/benchmark/artifacts/pom.xml
index d2b7401727c412085d051415e602371025ea84be..7f1f206754fb259674e568577d99473fe1db6b7d 100644 (file)
--- a/benchmark/artifacts/pom.xml
+++ b/benchmark/artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 4b5af9f41ac05f8381a9edfe4ea5d1ceee2d2ce8..bf0f820f4d471148b5df3e10c93eac0de2f744d8 100644 (file)
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>

diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/benchmark/features-mdsal-benchmark/pom.xml
index 339164e8b6e525e8d18c8fccd3db21f77a2468da..78881647efed79330a66833ee904c2a1bec80648 100644 (file)
--- a/features/benchmark/features-mdsal-benchmark/pom.xml
+++ b/features/benchmark/features-mdsal-benchmark/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml
index ecc028f2c486d356ea087af0479c20a8fd02afd3..f4476a7184db396b17c02f57c48ff3ae49b6910c 100644 (file)
--- a/features/benchmark/odl-benchmark-api/pom.xml
+++ b/features/benchmark/odl-benchmark-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/benchmark/odl-dsbenchmark/pom.xml
index b368ef32886202a5327984ccf3de49cbadf60239..4ec327931a7bd5235183e24c26eb43ed5843021d 100644 (file)
--- a/features/benchmark/odl-dsbenchmark/pom.xml
+++ b/features/benchmark/odl-dsbenchmark/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/benchmark/odl-mdsal-benchmark/pom.xml
index b9a02142f494195bd2c9679b0afd137c71f3a6ce..7df1c36b021d12bb66ca85e1618d668a06c409f2 100644 (file)
--- a/features/benchmark/odl-mdsal-benchmark/pom.xml
+++ b/features/benchmark/odl-mdsal-benchmark/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/benchmark/odl-ntfbenchmark/pom.xml
index 75ee74cb970ef82860a4b648b1048e106079e16a..39a335a83deb623ff4ce62569e97aa99ec6595b6 100644 (file)
--- a/features/benchmark/odl-ntfbenchmark/pom.xml
+++ b/features/benchmark/odl-ntfbenchmark/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/pom.xml b/features/benchmark/pom.xml
index 838e1e6db46c15527a3aa61f54f2ac6a742347f1..22b5ceefa6eefdc87ae72c50225119fec6e07934 100644 (file)
--- a/features/benchmark/pom.xml
+++ b/features/benchmark/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
     <groupId>org.opendaylight.controller</groupId>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.controller</groupId>

diff --git a/features/config-netty/features-config-netty/pom.xml b/features/config-netty/features-config-netty/pom.xml
index 5213b4665a54b3bb9247046b53e57ae937dafbf5..9d4b5c0f1773c18f50ff85478b3c8b20f8767085 100644 (file)
--- a/features/config-netty/features-config-netty/pom.xml
+++ b/features/config-netty/features-config-netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml
index c0bb29dd75f0e162af6ade8e60399fb271e37ace..2a1d289ea366b11bfaa4714d824044d61e2f9ff0 100644 (file)
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml
index 100db8f87c817b35c9d1979b292850a2d7e8ba49..0cc9527dd856fd7d9572196cb101fa4492b79df3 100644 (file)
--- a/features/config-netty/pom.xml
+++ b/features/config-netty/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/extras/features-extras/pom.xml b/features/extras/features-extras/pom.xml
index 81e7126cb089cdbc18063970a8097d6d51385aaf..a46dead36e829142fe9ba70825ca8467af400a73 100644 (file)
--- a/features/extras/features-extras/pom.xml
+++ b/features/extras/features-extras/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/extras/odl-extras-all/pom.xml b/features/extras/odl-extras-all/pom.xml
index 797522713f9ba2b2fcc5b8e96d7718cca14067e9..fadb4502b7ae869f12ce4e127fcef8f17fbe338f 100644 (file)
--- a/features/extras/odl-extras-all/pom.xml
+++ b/features/extras/odl-extras-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml
index 5536108d1de072a505617a948b0f63fa3ff56f73..347767140ad9781b29a3648047376d780bbe53f1 100644 (file)
--- a/features/extras/odl-jolokia/pom.xml
+++ b/features/extras/odl-jolokia/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/extras/pom.xml b/features/extras/pom.xml
index 2d0f211324d99973dc06f7b2804aab61303dc8cc..4d7c6cace5b055943ad6097ca424dbd4d7995dee 100644 (file)
--- a/features/extras/pom.xml
+++ b/features/extras/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml
index b3f728f21aca32bb5cdcca21053bfb40c5cb3553..23b257372cec88841de3f18172fc0049a4d3b9bd 100644 (file)
--- a/features/mdsal/features-mdsal/pom.xml
+++ b/features/mdsal/features-mdsal/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml
index f464b20fb7f47693acb0d787b29ac2a60856065d..0d116aa2061c1cf199a2b29572e4c8d4af8a781a 100644 (file)
--- a/features/mdsal/odl-clustering-test-app/pom.xml
+++ b/features/mdsal/odl-clustering-test-app/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml
index d75f08b8abe3c1a8207aedda62359cc6135b513a..a9b74841f965fcde1b2e1d61ae564babac2a7eff 100644 (file)
--- a/features/mdsal/odl-controller-mdsal-common/pom.xml
+++ b/features/mdsal/odl-controller-mdsal-common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml
index 2b8554fdce1b5d9c38a70cf9ff9b820a94330c61..2ab2abeea3eb9031b76ea520114f5831bd7e1c82 100644 (file)
--- a/features/mdsal/odl-controller-model-topology/pom.xml
+++ b/features/mdsal/odl-controller-model-topology/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-all/pom.xml b/features/mdsal/odl-mdsal-all/pom.xml
index 83d5e4fc79d0427bc790b5aba911eb656bbaa4a9..37e5a4cefe5c8aa71ff1be58e5429786aa6e135a 100644 (file)
--- a/features/mdsal/odl-mdsal-all/pom.xml
+++ b/features/mdsal/odl-mdsal-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 515821e997f826b65e156cce0de8199dbefcf474..081c71bdf11aeb34f0df87ab9aec02fb0b14a5dc 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 


@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>

-                <version>3.1.0</version>
+                <version>3.1.2</version>

                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
index 48dd0e7da577aae6ca08516c07ca87a835ed12a9..b62ed47adda39cb1a5addb9eb792632c75c19e56 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker-local/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
  -->
  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-mdsal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">

     <feature name="odl-mdsal-broker-local" version="${project.version}">
         <feature version="[3.1.0,4)">odl-lmax-3</feature>
         <feature version="[2.0.3,3)">odl-yangtools-codec</feature>
     <feature name="odl-mdsal-broker-local" version="${project.version}">
         <feature version="[3.1.0,4)">odl-lmax-3</feature>
         <feature version="[2.0.3,3)">odl-yangtools-codec</feature>

diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml
index feb13a329c571cdcc09379acc8a132053b11fcbb..a62ea5191d12e6a0f7a2e0863937da687b5981cb 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/pom.xml
+++ b/features/mdsal/odl-mdsal-broker/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
index 22340f64cc18e038b1f3aecb277cae357387f15a..9a9ea46bbec092f8c47cea3475aabbf7d4437108 100644 (file)
--- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 


@@ -26,7 +26,7 @@
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>

-                <version>3.1.0</version>
+                <version>3.1.2</version>

                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
index f3d473b5afa1ecfc1447dec2173c3a5c35b11f97..1cc1ba77531890017d4cd0311f5817569047edd0 100644 (file)
--- a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/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
   -->
   ~ 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-controller-${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-controller-${project.version}">

     <feature name="odl-mdsal-clustering-commons" version="${project.version}">
         <feature version="[3.1.0,4)">odl-akka-system-2.5</feature>
         <feature version="[3.1.0,4)">odl-akka-persistence-2.5</feature>
     <feature name="odl-mdsal-clustering-commons" version="${project.version}">
         <feature version="[3.1.0,4)">odl-akka-system-2.5</feature>
         <feature version="[3.1.0,4)">odl-akka-persistence-2.5</feature>

diff --git a/features/mdsal/odl-mdsal-clustering/pom.xml b/features/mdsal/odl-mdsal-clustering/pom.xml
index fa77b4c2d1a04f4157a27145431c283dce6c93f2..1393376906a7f3ce6a083a727949843722df308b 100644 (file)
--- a/features/mdsal/odl-mdsal-clustering/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
index 51d138a734085720420b64b1c630e5e4df0b98f1..46a7adfe4ecd1fe1b7ed334c96e9c72cf325981f 100644 (file)
--- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
+++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml
index a8d270f28645e7c5a2e566ae8b8080cefde691d9..9aa6362fccee285ea6997fab3f6e2687d5e959bd 100644 (file)
--- a/features/mdsal/odl-mdsal-model-inventory/pom.xml
+++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
index 8f0291bea7fba1adbd602eea392a2598f78f4bff..ae9247f028b611d9a7e5cc5745efb1d612404664 100644 (file)
--- a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
+++ b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 


@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-akka-leveldb-0.7</artifactId>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-akka-leveldb-0.7</artifactId>

-            <version>3.1.0</version>
+            <version>3.1.2</version>

             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml
index eeb28cc0951af8897a37ac6bb552e23e5848defe..d1990b69766da283e09f0571e64a592ed4fe217b 100644 (file)
--- a/features/mdsal/odl-mdsal-remoterpc-connector/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-remoterpc-connector/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
   -->
   ~ 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-controller-${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-controller-${project.version}">

     <feature name="odl-mdsal-remoterpc-connector" version="${project.version}">
         <feature version="[3.1.0,4)">odl-akka-leveldb-0.7</feature>
     </feature>
     <feature name="odl-mdsal-remoterpc-connector" version="${project.version}">
         <feature version="[3.1.0,4)">odl-akka-leveldb-0.7</feature>
     </feature>

diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml
index 58ceb2a2a912de0ab10515cf7de5660abd0a70b5..b6ae09f3afbd95c0c701bfb46cecb1518150c5fd 100644 (file)
--- a/features/mdsal/odl-message-bus-collector/pom.xml
+++ b/features/mdsal/odl-message-bus-collector/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml
index d8dbacc6d0e4ccd2ca42eb311bda7246b4046353..e06cf8def8f65e2493662db23b50879ebb9a3b87 100644 (file)
--- a/features/mdsal/odl-toaster/pom.xml
+++ b/features/mdsal/odl-toaster/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 42e7546897a42a5caf64c9dfc78d8023d467564a..efe21ffe65fe01a83cf2692fe53b79436b84c0a2 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 2971d590dbf4db35d5f7e2f6c27d3ee69b5b7120..469a9a006e2e3eb7c50915f422e2a3d39a346053 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 6da4c1ac7abde9e34273d269c0774a8289a33f81..24efcec14d7c6dba6a7918c7549efd15267a3521 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
index dd577c7a63ff6f52071fd43d4e70e0d68e0973ba..c2bcfb57e96b59b02ee7ebe8c09757a3c280f02a 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index 951b7fd885842717f8c9d98cbe032affb10b337a..076ebc5ae4a5e4a68e1ad87cc51d6c05398494d0 100644 (file)
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index b6753ac2a5ccc98eed157b09952973897fb2b663..21a41afff579aff5a94902da0f2c1e939da6930f 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java
index 3673b24b8c5dcda776a5d67dc9df07da32847ad7..01f922cc61a11d4bd47a954def6b2622cb7410d7 100644 (file)
--- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java
+++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java
@@ -8,7 +8,6 @@
 package org.opendaylight.controller.blueprint.ext;
 
 import com.google.common.base.Strings;
 package org.opendaylight.controller.blueprint.ext;
 
 import com.google.common.base.Strings;

-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URL;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URL;


@@ -160,7 +159,6 @@ public final class OpendaylightNamespaceHandler implements NamespaceHandler {
         return component;
     }
 
         return component;
     }
 

-    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF", justification = "Unrecognised NullableDecl")

     private static ComponentMetadata decorateServiceReferenceType(final Attr attr, final ComponentMetadata component,
             final ParserContext context) {
         if (!(component instanceof MutableServiceReferenceMetadata)) {
     private static ComponentMetadata decorateServiceReferenceType(final Attr attr, final ComponentMetadata component,
             final ParserContext context) {
         if (!(component instanceof MutableServiceReferenceMetadata)) {

diff --git a/opendaylight/commons/jolokia/pom.xml b/opendaylight/commons/jolokia/pom.xml
index da3bae46c51b0a07a48b8e398c23f16d780a2945..bf7a91245a91469dc40379f673183a243d33252c 100644 (file)
--- a/opendaylight/commons/jolokia/pom.xml
+++ b/opendaylight/commons/jolokia/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index 4827669e5310c251e750052808d8fc5d637effac..3ac86873cbdb0494bf0b1f5365f664c5d57809c5 100644 (file)
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index 043d1d557e203c2072615b9cba023173a4514985..cdb0c5755b5e0b329ecb53c59072503965d578f9 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 571037ee0a7e88feb5f7321157be057bdd61065f..68160f292d38cd4e4ca0ade08de464e10fa50076 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml
index f9e25ffaed357b91dbb49e05a12953045ba0cdb7..ec58c9a47fc8c23734ff263f7cfa23f0e1417430 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml
index 06ce0f126312366f817712d2434c384392270f05..7f130beeae3648aa1778e8b699f0053d363c5376 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>

-        <version>3.1.0</version>
+        <version>3.1.2</version>

         <relativePath/>
     </parent>
 
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/features/pom.xml b/opendaylight/md-sal/mdsal-trace/features/pom.xml
index e64942f094bc1a3777ea46f8b0e38308081291ee..f4815fdf8d4bf9cc2537b1f0501342f9bbe98930 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/features/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/pom.xml
index 9ae2e5e7e9cf9cad3ac11072f115b8e5bc1e35f4..12b7c65f83036e265756d73c1ff271d0341edc51 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml
index 7860bd2b7941de67e9cff6c4fbe84d50d50364bc..c755ef465a94a21b39ee697996226dc385298be8 100644 (file)
--- a/opendaylight/md-sal/parent/pom.xml
+++ b/opendaylight/md-sal/parent/pom.xml
@@ -59,7 +59,7 @@
           <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>findbugs</artifactId>
           <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>findbugs</artifactId>

-            <version>3.1.1</version>
+            <version>3.1.2</version>

           </dependency>
         </dependencies>
         <configuration>
           </dependency>
         </dependencies>
         <configuration>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 054ba2cd711152e85a9c90183030c1eed9623cd4..183bc25de2d6a5be650a08cd5bdf687270789187 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
index 9da9ee6a6f9f1f004183df5cdf5d197e00cc28d2..15dbd74d01d9b2d3b3aed4b98fdb414b3943c5ae 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
@@ -15,7 +15,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.io.ByteSource;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.io.ByteSource;

-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.util.Collection;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.util.Collection;


@@ -185,8 +184,6 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior {
     }
 
     @VisibleForTesting
     }
 
     @VisibleForTesting

-    @SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE",
-            justification = "Unrecognised NullableDecl")

     void setSnapshotHolder(@Nullable final SnapshotHolder snapshotHolder) {
         this.snapshotHolder = Optional.fromNullable(snapshotHolder);
     }
     void setSnapshotHolder(@Nullable final SnapshotHolder snapshotHolder) {
         this.snapshotHolder = Optional.fromNullable(snapshotHolder);
     }

diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index c223d22224699f5d25bc54060f001413a9abd848..ff14b683c0d4b68bb6888e8f987e770d479c3cee 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml
index ec78665e357056784e2b9fb39dc4d535790c88fa..c942bcd1eb08e641508163eaf2ce19b29a60c22a 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
 
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java
index 21d391c9d7dc2b23ef8111e1516d3e8d615ef6aa..1d661eb32a57bc7333126020e9729d1eb520d383 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java
@@ -12,7 +12,6 @@ import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.Futures;

-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;


@@ -79,7 +78,6 @@ public abstract class AbstractDOMBrokerWriteTransaction<T extends DOMStoreWriteT
         getSubtransaction(store).write(path, data);
     }
 
         getSubtransaction(store).write(path, data);
     }
 

-    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF", justification = "Unrecognised NullableDecl")

     private static void checkInstanceIdentifierReferencesData(final YangInstanceIdentifier path,
             final NormalizedNode<?, ?> data) {
         Preconditions.checkArgument(data != null, "Attempted to store null data at %s", path);
     private static void checkInstanceIdentifierReferencesData(final YangInstanceIdentifier path,
             final NormalizedNode<?, ?> data) {
         Preconditions.checkArgument(data != null, "Attempted to store null data at %s", path);

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java
index b363551b556feb09e0b35c30002b4798e67f994f..1cb744670e7e5eb6e1c2e32f70e816b38f39bd2a 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java
@@ -19,7 +19,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;

-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;


@@ -180,7 +179,6 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ
     }
 
     @Override
     }
 
     @Override

-    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF", justification = "Unrecognised NullableDecl")

     public Optional<EntityOwnershipState> getOwnershipState(final DOMEntity forEntity) {
         Preconditions.checkNotNull(forEntity, "forEntity cannot be null");
 
     public Optional<EntityOwnershipState> getOwnershipState(final DOMEntity forEntity) {
         Preconditions.checkNotNull(forEntity, "forEntity cannot be null");
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategy.java
index f508ad158906a9094758c7955f913121d34ec854..7102cbbbf096be52bcc1656b39e162e6ce7bf796 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategy.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategy.java
@@ -12,7 +12,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;

-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;


@@ -32,8 +31,6 @@ public class LeastLoadedCandidateSelectionStrategy extends AbstractEntityOwnerSe
     }
 
     @Override
     }
 
     @Override

-    @SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE",
-            justification = "Unrecognised NullableDecl")

     public String newOwner(@Nullable String currentOwner, Collection<String> viableCandidates) {
         Preconditions.checkArgument(viableCandidates.size() > 0);
         String leastLoadedCandidate = null;
     public String newOwner(@Nullable String currentOwner, Collection<String> viableCandidates) {
         Preconditions.checkArgument(viableCandidates.size() > 0);
         String leastLoadedCandidate = null;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/exceptions/NoShardLeaderException.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/exceptions/NoShardLeaderException.java
index fed443b5d4f08f67c4887ab78fd1b630c4d9ce34..0ea2e3c8436ba399c089e0998fef1fa8b8d82801 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/exceptions/NoShardLeaderException.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/exceptions/NoShardLeaderException.java
@@ -8,7 +8,6 @@
 package org.opendaylight.controller.cluster.datastore.exceptions;
 
 import com.google.common.base.Strings;
 package org.opendaylight.controller.cluster.datastore.exceptions;
 
 import com.google.common.base.Strings;

-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

 import javax.annotation.Nullable;
 
 /**
 import javax.annotation.Nullable;
 
 /**


@@ -23,8 +22,6 @@ public class NoShardLeaderException extends RuntimeException {
         super(message);
     }
 
         super(message);
     }
 

-    @SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE",
-            justification = "Unrecognised NullableDecl")

     public NoShardLeaderException(@Nullable String message, String shardName) {
         super(String.format("%sShard %s currently has no leader. Try again later.",
                 (Strings.isNullOrEmpty(message) ? "" : message + ". "), shardName));
     public NoShardLeaderException(@Nullable String message, String shardName) {
         super(String.format("%sShard %s currently has no leader. Try again later.",
                 (Strings.isNullOrEmpty(message) ? "" : message + ". "), shardName));

diff --git a/pom.xml b/pom.xml
index fdb4414a4f2afd7c96c3404eb6ddfdc1bb0e8d20..699a32d2b9741a289189180d1d533baf3a60eb0a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>

-    <version>3.1.0</version>
+    <version>3.1.2</version>

     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>