Bump odlparent version to 5.0.0

Change-Id: I82b08404b577a9bbd67eec9a372b2a447a805d8f
Signed-off-by: Faseela K <faseela.k@ericsson.com>
Signed-off-by: R P Karthika <r.p.karthika@ericsson.com>

diff --git a/alivenessmonitor/alivenessmonitor-impl/pom.xml b/alivenessmonitor/alivenessmonitor-impl/pom.xml
index de0427a320274f409c43fd1459908396c8e7a55e..ec393ec73174a114b3bc0e3702c6062432f3e6b5 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl/pom.xml
+++ b/alivenessmonitor/alivenessmonitor-impl/pom.xml
@@ -50,7 +50,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependencies>
   </dependencyManagement>
 
+
   <dependencies>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>alivenessmonitor-api</artifactId>

diff --git a/alivenessmonitor/pom.xml b/alivenessmonitor/pom.xml
index 2077db3834872c8c9f4e2fff58aff6afc047c1c6..84a170034a94d1cbab8d38cae7ee117cd3f81c0a 100644 (file)
--- a/alivenessmonitor/pom.xml
+++ b/alivenessmonitor/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/arputil/pom.xml b/arputil/pom.xml
index ebdcbc89fbb0156ba0048ee0043c4cbe05f8acfe..2f44628221ba25bc2770bc9a67a9353049a57f13 100644 (file)
--- a/arputil/pom.xml
+++ b/arputil/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index df2115e91a80038f459792f829fa5e6109d9564f..58de50f30b3d1b1474613f33b8dff6ad76078a91 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/checkstyle/pom.xml b/commons/checkstyle/pom.xml
index b6f15135078117c873695da652af63b2d300463d..a55258324052eaf9d687477fc7c7aed7cf5121d6 100644 (file)
--- a/commons/checkstyle/pom.xml
+++ b/commons/checkstyle/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</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/commons/pom.xml b/commons/pom.xml
index 23fb62712292eadcc62a071620e91b7d9373fe89..b129a9a5adde7ca9b385e86f1556899d6b3c29c9 100644 (file)
--- a/commons/pom.xml
+++ b/commons/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/fcapsapplication/pom.xml b/fcapsapplication/pom.xml
index 92319f25693bcc1f492286a8c04a503cea45ab64..96b2d10dfa6bf907144dfaf0d4e0c888dc3679ad 100644 (file)
--- a/fcapsapplication/pom.xml
+++ b/fcapsapplication/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>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/fcapsmanager/countermanager/src/main/java/org/opendaylight/genius/fcapsmanager/countermanager/PMRegistrationListener.java b/fcapsmanager/countermanager/src/main/java/org/opendaylight/genius/fcapsmanager/countermanager/PMRegistrationListener.java
index e0c270d730c1619a0dab0af668914c4bb13487d3..42050985c2b9057899e538686122b036386a46ae 100644 (file)
--- a/fcapsmanager/countermanager/src/main/java/org/opendaylight/genius/fcapsmanager/countermanager/PMRegistrationListener.java
+++ b/fcapsmanager/countermanager/src/main/java/org/opendaylight/genius/fcapsmanager/countermanager/PMRegistrationListener.java
@@ -85,7 +85,7 @@ public class PMRegistrationListener implements Runnable {
         try {
             delegate = new ObjectName("JMImplementation:type=MBeanServerDelegate");
         } catch (MalformedObjectNameException e) {
-            LOG.error("Malformed object name: {} ", e);
+            LOG.error("Malformed object", e);
             return;
         }
         NotificationFilterSupport filter = new NotificationFilterSupport();
@@ -97,7 +97,7 @@ public class PMRegistrationListener implements Runnable {
         try {
             mbs.addNotificationListener(delegate, delegateListener, filter, null);
         } catch (InstanceNotFoundException e) {
-            LOG.error("Instance not found: {}", e);
+            LOG.error("Instance not found", e);
             return;
         }
         Poller poller = new Poller(bundleContext, this);

diff --git a/fcapsmanager/pom.xml b/fcapsmanager/pom.xml
index 67af994ced753428216a784bc0b13faa1e220593..007d718fe1ef5743f33cc0f56804f86ac08a1698 100644 (file)
--- a/fcapsmanager/pom.xml
+++ b/fcapsmanager/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>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/genius-features/pom.xml b/features/genius-features/pom.xml
index c6773a04b45bf821b49270a2730b42094b22a8a7..4bc7b51d6d57821041323cf3b2affd9befae8d1c 100644 (file)
--- a/features/genius-features/pom.xml
+++ b/features/genius-features/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml
index c678b84c3b7be2bc3bf0df7d7f4bf90d54c03c5f..c39810131bb995611d7f9dc03225db8151b6c007 100644 (file)
--- a/features/odl-genius-api/pom.xml
+++ b/features/odl-genius-api/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius-api/src/main/feature/feature.xml b/features/odl-genius-api/src/main/feature/feature.xml
index 4a69461116f06c30134879b32b4f92dfece181af..d1d06be237006dde797e15002f81b8427bc0d083 100644 (file)
--- a/features/odl-genius-api/src/main/feature/feature.xml
+++ b/features/odl-genius-api/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-genius-api">
     <feature name="odl-genius-api">
-        <feature version="[4.0.5,5)">odl-apache-commons-net</feature>
+        <feature version="[5,6)">odl-apache-commons-net</feature>
     </feature>
 </features>

diff --git a/features/odl-genius-fcaps-application/pom.xml b/features/odl-genius-fcaps-application/pom.xml
index be463c10e66c008c5cbf650227a51b37d9207e3d..8d067942ccd551748d6467563c400a63869fa157 100644 (file)
--- a/features/odl-genius-fcaps-application/pom.xml
+++ b/features/odl-genius-fcaps-application/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius-fcaps-framework/pom.xml b/features/odl-genius-fcaps-framework/pom.xml
index bc5792a7a6b35e9fac6f202563cf3961dfdd5e72..89e22701306583c0e1f7c587ad3301e2c153aed3 100644 (file)
--- a/features/odl-genius-fcaps-framework/pom.xml
+++ b/features/odl-genius-fcaps-framework/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius-rest/pom.xml b/features/odl-genius-rest/pom.xml
index 0a269c9c7c1ee977da3e77d0a6c6098c72e14eba..1a14a9082125acbfcdbb70d23e3fa733e3da251d 100644 (file)
--- a/features/odl-genius-rest/pom.xml
+++ b/features/odl-genius-rest/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml
index 0353643ff6d0adc2dd9cbfbe5568d307425ac3d8..704544061999ecf52bd6b2a960a434526b876f2e 100644 (file)
--- a/features/odl-genius/pom.xml
+++ b/features/odl-genius/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 1d5c523da4ae057d2e2dacf57bf455c774f0713a..40754563eeddd6b107b9263a20f6fbcf917d7d35 100644 (file)
--- a/features/pom.xml
+++ b/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>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/idmanager/idmanager-impl/pom.xml b/idmanager/idmanager-impl/pom.xml
index 24264a88b4b4133ecf5885f0e2a40cb64cef8030..8f491168b4702b9aebd86f2b3d2ec6e89a845267 100644 (file)
--- a/idmanager/idmanager-impl/pom.xml
+++ b/idmanager/idmanager-impl/pom.xml
@@ -76,6 +76,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>blueprint-maven-plugin-annotation</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <optional>true</optional>
+    </dependency>
 
     <!-- Testing Dependencies -->
     <dependency>

diff --git a/idmanager/pom.xml b/idmanager/pom.xml
index 27abc6dcc5ebc7df22688f613ac41c432f2f9257..f0354a7517a6102968b118f9928df4ce1e9f2b95 100644 (file)
--- a/idmanager/pom.xml
+++ b/idmanager/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/interfacemanager/interfacemanager-impl/pom.xml b/interfacemanager/interfacemanager-impl/pom.xml
index fdd8af6315c4dc6731647d6cd842459a6a5eb36f..ed0ea07f03ae2679e53ec682dc5acef5cbdf4d3f 100644 (file)
--- a/interfacemanager/interfacemanager-impl/pom.xml
+++ b/interfacemanager/interfacemanager-impl/pom.xml
@@ -145,6 +145,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>blueprint-maven-plugin-annotation</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <optional>true</optional>
+    </dependency>
     <!-- for infrautils metrics APIs -->
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
index da0c7862fa514daeeb5f305ffefe6e29943b3b44..2cd19dcc247f34bdf3a67fa1caa345306e6c97b5 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
@@ -707,7 +707,7 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
 
         OvsdbBridgeAugmentation bridge = node.augmentation(OvsdbBridgeAugmentation.class);
         if (bridge == null) {
-            LOG.error("Node {} has no bridge augmentation");
+            LOG.error("Node {} has no bridge augmentation", nodeIid);
             return null;
         }
 

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/NodeConnectorStatsImpl.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/NodeConnectorStatsImpl.java
index 00905e30a9d646f36678dcfebbb75ab9da5cd680..98caf4be87ae1e7ce3826e907a9163534301cd4e 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/NodeConnectorStatsImpl.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/pmcounters/NodeConnectorStatsImpl.java
@@ -151,7 +151,7 @@ public class NodeConnectorStatsImpl extends AsyncClusteredDataTreeChangeListener
         @Override
         public void run() {
             if (LOG.isTraceEnabled()) {
-                LOG.trace("Requesting port stats - {}");
+                LOG.trace("Requesting port stats");
             }
             for (String node : nodes) {
                 LOG.trace("Requesting AllNodeConnectorStatistics and flow table statistics for node - {}", node);

diff --git a/interfacemanager/pom.xml b/interfacemanager/pom.xml
index c83636b8cb1da9af000c187dc0935392d4ead304..be28bb109b09c9853f78afaa0d8791d435e2b179 100644 (file)
--- a/interfacemanager/pom.xml
+++ b/interfacemanager/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/ipv6util/pom.xml b/ipv6util/pom.xml
index e3fc09a8dbded3434a46b62d3de98d24b8426bed..e1239f40dbed6229686beddeda07f28846097be9 100644 (file)
--- a/ipv6util/pom.xml
+++ b/ipv6util/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/itm/itm-impl/pom.xml b/itm/itm-impl/pom.xml
index 613307a4eb610b4a0e35a4c6f966aa9552cf11ab..4752a5970c16899607da90e67728a3d1ded4e6ed 100644 (file)
--- a/itm/itm-impl/pom.xml
+++ b/itm/itm-impl/pom.xml
@@ -129,6 +129,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>idmanager-api</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <optional>true</optional>
+    </dependency>
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InternalTunnelListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InternalTunnelListener.java
index d3aaa540833049aeb11e65b3565667dbb44e14b3..6a3b4bebd09dd52c3d0b90fe32f6ba1f74482aeb 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InternalTunnelListener.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InternalTunnelListener.java
@@ -55,7 +55,7 @@ public class InternalTunnelListener extends AbstractSyncDataTreeChangeListener<I
 
     @Override
     public void add(@NonNull InstanceIdentifier<InternalTunnel> key, @NonNull InternalTunnel internalTunnel) {
-        LOG.debug("ADD of Interface {} received in InternalTunnelListenerITM");
+        LOG.debug("ADD of Interface {} received in InternalTunnelListenerITM", internalTunnel);
         RendererInternalTunnelDeleteWorker configWorker = new RendererInternalTunnelDeleteWorker(key, internalTunnel);
         coordinator.enqueueJob(getKeyForEnqueuing(internalTunnel), configWorker, ITMConstants.JOB_MAX_RETRIES);
     }

diff --git a/itm/pom.xml b/itm/pom.xml
index 5304e2a4bd84d7b49e87cad2c4bc0172695abc66..7419be6ea2196573f94d52d42baa7a735334616d 100644 (file)
--- a/itm/pom.xml
+++ b/itm/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index ea85995ce413e00e0436c52e6f23e4da5a2f5f09..1574d01ff47a1b81bc270ca5cad649416a51a96b 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/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>karaf4-parent</artifactId>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/lockmanager/lockmanager-impl/pom.xml b/lockmanager/lockmanager-impl/pom.xml
index 8706c4d3f9143771559adf6687e45a8402bc8023..3a1018cf6d00057d0490626e5518c3b9544f0176 100644 (file)
--- a/lockmanager/lockmanager-impl/pom.xml
+++ b/lockmanager/lockmanager-impl/pom.xml
@@ -55,6 +55,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>blueprint-maven-plugin-annotation</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <optional>true</optional>
+    </dependency>
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>org.opendaylight.genius</groupId>

diff --git a/lockmanager/pom.xml b/lockmanager/pom.xml
index fdfb4dc3ee3a4442cae44b56c9209f68a486f3a7..b447eb09d3d845911a5d3255f7b4a2552643a379 100644 (file)
--- a/lockmanager/pom.xml
+++ b/lockmanager/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunner.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunner.java
index 8b74681dc105398389401cfed9822993927b4f7e..8ed84ffd4e38bae13de89d46fa33d4f669c179b3 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunner.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunner.java
@@ -10,10 +10,11 @@ package org.opendaylight.genius.infra;
 import com.google.common.annotations.Beta;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Future;
 import java.util.function.Function;
-import javax.annotation.CheckReturnValue;
+
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunnerImpl.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunnerImpl.java
index ac835ac21b25699b2cb302408fadd4df11aa7c81..41d18bdc6eca1e287df3a74ba20cbc3a85a088b0 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunnerImpl.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedNewTransactionRunnerImpl.java
@@ -11,9 +11,10 @@ import com.google.common.annotations.Beta;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 import java.util.function.Function;
-import javax.annotation.CheckReturnValue;
 import javax.inject.Inject;
+
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactory.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactory.java
index b61380996c384b2646eaf60a26c71a9833faffdb..945b6262a88e1a3d1e72d29d273b623d44d505bd 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactory.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactory.java
@@ -10,9 +10,10 @@ package org.opendaylight.genius.infra;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Future;
-import javax.annotation.CheckReturnValue;
+
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactoryImpl.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactoryImpl.java
index de4fe2a7a315650bdb03a521ad2ce0c48594c956..4b1eada25a3f83f6dd45e0a0bf6ccda9490abf4a 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactoryImpl.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/infra/ManagedTransactionFactoryImpl.java
@@ -11,9 +11,10 @@ import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
 
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
-import javax.annotation.CheckReturnValue;
+
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.TransactionFactory;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;

diff --git a/mdsalutil/pom.xml b/mdsalutil/pom.xml
index 32ed159579e89a9c1ccdcd966211dfbff1ba3970..446bffbecd96d798ad470f7a4f620a3907f47114 100644 (file)
--- a/mdsalutil/pom.xml
+++ b/mdsalutil/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/networkutils/pom.xml b/networkutils/pom.xml
index d3efdca2678f9a9a67031a38e23228acb7d09a1f..97196a86cff760d5b873423013b34e95e98dc875 100644 (file)
--- a/networkutils/pom.xml
+++ b/networkutils/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index cd58ded1e23149328381376c16c8a9b1d456fcf7..eaea33fec96f8fca17adc0c1aa0d1f0d1b631c4f 100644 (file)
--- a/pom.xml
+++ b/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>
-    <version>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>