Bump upstreams

Adopt:
- odparent-13.0.10
- infrautils-6.0.5
- yangtools-11.0.5
- mdsal-12.0.4
- controller-8.0.4
- aaa-0.18.4
- netconf-6.0.6

Change-Id: Iada1a2c4d0ecfd4fad14430ec450190ffa8305fe
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/algo/pom.xml b/algo/pom.xml
index 1e536fcf41db5ee246ceb2a92201098ef2f0741c..331a9000c4ad970a4602aae369bf71426d6ef60d 100644 (file)
--- a/algo/pom.xml
+++ b/algo/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index fed91607576d8281986ff1266b830c949bdb42e4..981c258dbf96a04aa8b76c884992b7812527ef4d 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>13.0.7</version>
+      <version>13.0.10</version>
       <relativePath/>
     </parent>
 

diff --git a/bgp/config-example/pom.xml b/bgp/config-example/pom.xml
index 1b1f08512efe501d2d85360084ba70b4074d3920..b2afa1e6297df6ffc7bce4a0883ad23e7385c918 100644 (file)
--- a/bgp/config-example/pom.xml
+++ b/bgp/config-example/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/bgp/extensions/pom.xml b/bgp/extensions/pom.xml
index 4110f044710096dd44ee3ffe886f558e90bb84b7..69da4f20750504b88e6a3e4de19e4c6d26410c60 100644 (file)
--- a/bgp/extensions/pom.xml
+++ b/bgp/extensions/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseRouteEntry.java
index c81d711c3fa092ecbfc49a05e7fbdbd4d77e0b9f..0105f22044c61bf18e970b6e4fbb3cec745e348f 100644 (file)
--- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseRouteEntry.java
+++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseRouteEntry.java
@@ -57,22 +57,19 @@ final class BaseRouteEntry<C extends Routes & DataObject & ChoiceIn<Tables>, S e
 
     private RouterIdOffsets offsets = RouterIdOffsets.EMPTY;
     private MapEntryNode[] values = EMPTY_VALUES;
-    private BaseBestPath bestPath;
+    private BaseBestPath bestPath = null;
     private BaseBestPath removedBestPath;
 
-    BaseRouteEntry() {
-    }
-
     @Override
     public boolean removeRoute(final RouterId routerId, final Uint32 remotePathId) {
-        final int offset = this.offsets.offsetOf(routerId);
-        this.values = this.offsets.removeValue(this.values, offset, EMPTY_VALUES);
-        this.offsets = this.offsets.without(routerId);
-        return this.offsets.isEmpty();
+        final int offset = offsets.offsetOf(routerId);
+        values = offsets.removeValue(values, offset, EMPTY_VALUES);
+        offsets = offsets.without(routerId);
+        return offsets.isEmpty();
     }
 
     private MapEntryNode createRoute(final RIBSupport<C, S> ribSup, final String routeKey) {
-        final MapEntryNode route = this.offsets.getValue(this.values, this.offsets.offsetOf(bestPath.getRouterId()));
+        final MapEntryNode route = offsets.getValue(values, offsets.offsetOf(bestPath.getRouterId()));
         return ribSup.createRoute(route, ribSup.createRouteListArgument(routeKey), bestPath.getAttributes());
     }
 
@@ -84,38 +81,38 @@ final class BaseRouteEntry<C extends Routes & DataObject & ChoiceIn<Tables>, S e
         final BasePathSelector selector = new BasePathSelector(localAs);
 
         // Select the best route.
-        for (int i = 0; i < this.offsets.size(); ++i) {
-            final RouterId routerId = this.offsets.getKey(i);
-            final ContainerNode attributes = ribSupport.extractAttributes(this.offsets.getValue(this.values, i));
+        for (int i = 0; i < offsets.size(); ++i) {
+            final RouterId routerId = offsets.getKey(i);
+            final ContainerNode attributes = ribSupport.extractAttributes(offsets.getValue(values, i));
             LOG.trace("Processing router id {} attributes {}", routerId, attributes);
             selector.processPath(routerId, attributes);
         }
 
         // Get the newly-selected best path.
         final BaseBestPath newBestPath = selector.result();
-        final boolean modified = newBestPath == null || !newBestPath.equals(this.bestPath);
+        final boolean modified = newBestPath == null || !newBestPath.equals(bestPath);
         if (modified) {
-            if (this.offsets.isEmpty()) {
-                this.removedBestPath = this.bestPath;
+            if (offsets.isEmpty()) {
+                removedBestPath = bestPath;
             }
-            LOG.trace("Previous best {}, current best {}", this.bestPath, newBestPath);
-            this.bestPath = newBestPath;
+            LOG.trace("Previous best {}, current best {}", bestPath, newBestPath);
+            bestPath = newBestPath;
         }
         return modified;
     }
 
     @Override
     public int addRoute(final RouterId routerId, final Uint32 remotePathId, final MapEntryNode route) {
-        int offset = this.offsets.offsetOf(routerId);
+        int offset = offsets.offsetOf(routerId);
         if (offset < 0) {
-            final RouterIdOffsets newOffsets = this.offsets.with(routerId);
+            final RouterIdOffsets newOffsets = offsets.with(routerId);
             offset = newOffsets.offsetOf(routerId);
 
-            this.values = newOffsets.expand(this.offsets, this.values, offset);
-            this.offsets = newOffsets;
+            values = newOffsets.expand(offsets, values, offset);
+            offsets = newOffsets;
         }
 
-        this.offsets.setValue(this.values, offset, route);
+        offsets.setValue(values, offset, route);
         LOG.trace("Added route {} from {}", route, routerId);
         return offset;
     }
@@ -131,12 +128,12 @@ final class BaseRouteEntry<C extends Routes & DataObject & ChoiceIn<Tables>, S e
 
     @Override
     public List<AdvertizedRoute<C, S>> newBestPaths(final RIBSupport<C, S> ribSupport, final String routeKey) {
-        if (this.bestPath == null) {
+        if (bestPath == null) {
             return Collections.emptyList();
         }
         final MapEntryNode route = createRoute(ribSupport, routeKey);
-        final AdvertizedRoute<C, S> adv = new AdvertizedRoute<>(ribSupport, route, this.bestPath.getAttributes(),
-                this.bestPath.getPeerId(), this.bestPath.isDepreferenced());
+        final AdvertizedRoute<C, S> adv = new AdvertizedRoute<>(ribSupport, route, bestPath.getAttributes(),
+                bestPath.getPeerId(), bestPath.isDepreferenced());
         LOG.trace("Selected best route {}", route);
         return Collections.singletonList(adv);
     }
@@ -144,11 +141,11 @@ final class BaseRouteEntry<C extends Routes & DataObject & ChoiceIn<Tables>, S e
     @Override
     public List<ActualBestPathRoutes<C, S>> actualBestPaths(final RIBSupport<C, S> ribSupport,
             final RouteEntryInfo entryInfo) {
-        if (this.bestPath == null) {
+        if (bestPath == null) {
             return Collections.emptyList();
         }
         final MapEntryNode route = createRoute(ribSupport, entryInfo.getRouteKey());
-        return Collections.singletonList(new ActualBestPathRoutes<>(ribSupport, route, this.bestPath.getPeerId(),
-                this.bestPath.getAttributes(), this.bestPath.isDepreferenced()));
+        return Collections.singletonList(new ActualBestPathRoutes<>(ribSupport, route, bestPath.getPeerId(),
+                bestPath.getAttributes(), bestPath.isDepreferenced()));
     }
 }
\ No newline at end of file

diff --git a/bgp/pom.xml b/bgp/pom.xml
index 3f1560659d95d1b15130496ebee7cc25797db143..37439bcd5166cde136b90a31185d42acf0e6a4a4 100644 (file)
--- a/bgp/pom.xml
+++ b/bgp/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml
index 13da626f01cfa52a4e9191a787fa982e28e27e08..f76e62017829f73d2b5d4acaeb1d7141cd8a6725 100644 (file)
--- a/binding-parent/pom.xml
+++ b/binding-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>12.0.3</version>
+        <version>12.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/bmp/bmp-config-example/pom.xml b/bmp/bmp-config-example/pom.xml
index fb25fa949623c067eaa05e74bb912a860cb35200..e3c6790aa92616f878d7a5831a8061e1b6fc1e94 100644 (file)
--- a/bmp/bmp-config-example/pom.xml
+++ b/bmp/bmp-config-example/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
index 951178928fbc9533a10fd93a6c5bdf0220a543f7..eef9ba3020262092024b8e92fa1000f0b48ab98d 100644 (file)
--- a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
+++ b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
@@ -25,7 +25,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public final class BmpMockSession extends SimpleChannelInboundHandler<Notification<?>> implements BmpSession {
-
     private static final Logger LOG = LoggerFactory.getLogger(BmpMockSession.class);
 
     private static final Ipv4AddressNoZone NEXT_HOP = new Ipv4AddressNoZone("1.1.1.1");
@@ -36,8 +35,8 @@ public final class BmpMockSession extends SimpleChannelInboundHandler<Notificati
     private final int prePolicyRoutesCount;
     private final int postPolicyRoutesCount;
 
-    private InetSocketAddress remoteAddress;
-    private Channel channel;
+    private InetSocketAddress remoteAddress = null;
+    private Channel channel = null;
 
     public BmpMockSession(final int peersCount, final int prePolicyRoutesCount, final int postPolicyRoutesCount) {
         this.peersCount = peersCount;

diff --git a/bmp/pom.xml b/bmp/pom.xml
index fe83b47f994ce7f58f0adb98d9f9f71fd946b9e8..20d9e68f935a6af71520f07a8eafbed15d600393 100644 (file)
--- a/bmp/pom.xml
+++ b/bmp/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/config-loader/pom.xml b/config-loader/pom.xml
index e16d32c839cab7d78297d8f888d9c559a5a84d44..83c097a50c329409329e9d870ce014271fed30ba 100644 (file)
--- a/config-loader/pom.xml
+++ b/config-loader/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 04e5c900626a6ffcc9e79a2e1155713d3e386321..dc0ae4f04315d4a775f74296718c345ca2bd3e4d 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>13.0.7</version>
+    <version>13.0.10</version>
     <relativePath/>
   </parent>
 

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index 1a65714e853d1d05afe1f458b77364109ee979a8..1ef024604175266289e2eda24b56764775e39282 100644 (file)
--- a/feature-repo-parent/pom.xml
+++ b/feature-repo-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index b8d54e10b99ad334ab623eca842c84f2452a8c7b..73b3887704a3d25dc7726e93a2320f6f2011d612 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>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/graph/pom.xml b/graph/pom.xml
index 2fdee6e56ba119712b8a37470d8882ad651d8f70..3c64e55b73cb45c9a52729bcb9573b7b38631c49 100644 (file)
--- a/graph/pom.xml
+++ b/graph/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index a99e5c65f18ca859e17fcb3880cc2b1bd1d72773..f26427efd31b7bf4bc26b74522d87d5600ba5604 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
@@ -47,7 +47,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>8.0.3</version>
+                <version>8.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -55,7 +55,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>11.0.4</version>
+                <version>11.0.5</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -63,7 +63,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>12.0.3</version>
+                <version>12.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>6.0.5</version>
+                <version>6.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -79,7 +79,7 @@
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>6.0.4</version>
+                <version>6.0.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/pcep/config-example/pom.xml b/pcep/config-example/pom.xml
index f849a0f867a93e63af3280e8ccfdef872e5529e9..efa5a7383e2d8ebfd3eb23e41d4b64263c54c73f 100644 (file)
--- a/pcep/config-example/pom.xml
+++ b/pcep/config-example/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java
index 36b127e8be2ede23e7b458c20230d496103c6fe3..322a891d4fc4d1c367931d706525e7da22bd38c2 100644 (file)
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java
+++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java
@@ -20,12 +20,14 @@ import org.slf4j.LoggerFactory;
 
 public class TimerHandler {
     private static final Logger LOG = LoggerFactory.getLogger(TimerHandler.class);
-    private final int disconnectAfter;
+
     private final Timer timer = new HashedWheelTimer();
-    private PCCDispatcherImpl pccDispatcher;
+    private final int disconnectAfter;
     private final int reconnectAfter;
     private final Optional<Uint64> syncOptDBVersion;
     private final PCCsBuilder pcCsBuilder;
+
+    private PCCDispatcherImpl pccDispatcher = null;
     private boolean reconnectActive = false;
 
     public TimerHandler(final PCCsBuilder pcCsBuilder, final Optional<Uint64> syncOptDBVersion,
@@ -39,11 +41,10 @@ public class TimerHandler {
     final class DisconnectTask implements TimerTask {
         @Override
         public void run(final Timeout timeout) {
-            LOG.debug("Disconnects PCCs, reconnect after {} seconds", TimerHandler.this.reconnectAfter);
-            TimerHandler.this.pccDispatcher.close();
-            if (TimerHandler.this.reconnectAfter > 0) {
-                TimerHandler.this.timer.newTimeout(new ReconnectTask(),
-                        TimerHandler.this.reconnectAfter, TimeUnit.SECONDS);
+            LOG.debug("Disconnects PCCs, reconnect after {} seconds", reconnectAfter);
+            pccDispatcher.close();
+            if (reconnectAfter > 0) {
+                timer.newTimeout(new ReconnectTask(), reconnectAfter, TimeUnit.SECONDS);
             }
         }
     }
@@ -52,19 +53,18 @@ public class TimerHandler {
         @Override
         public void run(final Timeout timeout) {
             LOG.debug("Reconnecting PCCs}");
-            TimerHandler.this.pcCsBuilder.createPCCs(TimerHandler.this.syncOptDBVersion.orElse(Uint64.ONE),
-                Optional.empty());
+            pcCsBuilder.createPCCs(syncOptDBVersion.orElse(Uint64.ONE), Optional.empty());
         }
     }
 
     protected void createDisconnectTask() {
-        if (this.disconnectAfter > 0 && !this.reconnectActive && this.syncOptDBVersion.isPresent()) {
-            this.timer.newTimeout(new DisconnectTask(), this.disconnectAfter, TimeUnit.SECONDS);
-            this.reconnectActive = true;
+        if (disconnectAfter > 0 && !reconnectActive && syncOptDBVersion.isPresent()) {
+            timer.newTimeout(new DisconnectTask(), disconnectAfter, TimeUnit.SECONDS);
+            reconnectActive = true;
         }
     }
 
     public void setPCCDispatcher(final PCCDispatcherImpl dispatcher) {
-        this.pccDispatcher = dispatcher;
+        pccDispatcher = dispatcher;
     }
 }

diff --git a/pcep/pom.xml b/pcep/pom.xml
index 480474b8ab384d8fb8ea37fe21362fc9ea865950..2d3ca0faaf5c962d08edb68b82a4830ab3d0db6a 100644 (file)
--- a/pcep/pom.xml
+++ b/pcep/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/server/pom.xml b/pcep/server/pom.xml
index 209ac2adc63b03fb0ba7232f70667b276a5e8055..10cfff301bec59ec3c37f93661dd99cfd7eb568c 100644 (file)
--- a/pcep/server/pom.xml
+++ b/pcep/server/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/topology/pom.xml b/pcep/topology/pom.xml
index bffd23c525b3955ea6713b05b408481c69010b33..41d3e4cee2feedb81112f24d1a6b351ef3b4fcf9 100644 (file)
--- a/pcep/topology/pom.xml
+++ b/pcep/topology/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java
index 755b66f5c63dd5226b459258ebaa3c39ff9b8044..848096e9bc7390806a0cd3257b4ce2ff6176e950 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java
@@ -9,6 +9,7 @@ package org.opendaylight.bgpcep.pcep.topology.provider;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.util.Timeout;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
@@ -54,6 +55,7 @@ final class PCEPRequest {
 
     // Manipulated via STATE
     @SuppressWarnings("unused")
+    @SuppressFBWarnings(value = "URF_UNREAD_FIELD", justification = "https://github.com/spotbugs/spotbugs/issues/2749")
     private volatile State state = State.UNSENT;
 
     // Guarded by state going to State.DONE

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySingleton.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySingleton.java
index 33088cd41e9e8208f8ec006660ad6ed580134419..136439158d8693d7bc0737043ad32fe580d0204b 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySingleton.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySingleton.java
@@ -158,8 +158,6 @@ final class PCEPTopologySingleton {
 
     @GuardedBy("this")
     private State state;
-    @GuardedBy("this")
-    private SettableFuture<?> cleanupFuture;
 
     private PCEPTopologySingleton(final PCEPTopologySingleton previous, final ListenableFuture<?> future) {
         tracker = previous.tracker;

diff --git a/pcep/tunnel/pom.xml b/pcep/tunnel/pom.xml
index 956ee8491d565a6a47892f2d8485ff9232bb9a7c..c976f83dabbc532f67bb34a56024e8cff0ceb847 100644 (file)
--- a/pcep/tunnel/pom.xml
+++ b/pcep/tunnel/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index f107134b9354f55da06dcf83de1e28a6a75948b0..b3dfe18d262a03a0018743a4ef49f2ca47b95c32 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/programming/pom.xml b/programming/pom.xml
index e7a7b11732c0ff4c42fcbe55a61652f13a3d0eac..79e39f3d0774ca7070f2a571b40d2490d7e587bb 100644 (file)
--- a/programming/pom.xml
+++ b/programming/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/rsvp/pom.xml b/rsvp/pom.xml
index 617c2c768f3bd0487e9b863abb51d6c680295021..3bf79eb1bc7745f43d6f9770c6258a064ab9eacd 100644 (file)
--- a/rsvp/pom.xml
+++ b/rsvp/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index 8227b5b65ea77230c6aadbb13a755b1fc0cf50f4..2048df92d707a930110f1420bb009ba6f679bb6f 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/testtool-parent/pom.xml b/testtool-parent/pom.xml
index a1927c286594278ac5a8c018c306eb18b10c711f..7561bc1d8e9ca13f66bc3bebf60568933d4e7cd2 100644 (file)
--- a/testtool-parent/pom.xml
+++ b/testtool-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 

diff --git a/topology/pom.xml b/topology/pom.xml
index 491f35f01c2958de5b5b5053421eaa4683362f04..4d86e42ed705bbc382ef9d9d5fff67297317e784 100644 (file)
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>