Bump odlparent to 6.0.0 26/84226/22
authorRobert Varga <robert.varga@pantheon.tech>
Thu, 5 Sep 2019 16:36:01 +0000 (18:36 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 8 Oct 2019 08:18:20 +0000 (10:18 +0200)
This bumps odlparent to 6.0.0 as part of Magnesium MRI.

Change-Id: I19505dd80b832cd6ed8b68daf471d9e90d3dfdd2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
53 files changed:
artifacts/pom.xml
bgp/bgp-artifacts/pom.xml
bgp/config-example/pom.xml
bgp/extensions/pom.xml
bgp/openconfig-rp-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/impl/BGPRibPolicyImpl.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractCommunityHandler.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/AbstractExtCommunityHandler.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchAsPathSetHandler.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchBgpNeighborSetHandler.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchClusterIdSetHandler.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchOriginatorIdSetHandler.java
bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchRoleSetHandler.java
bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java
bgp/pom.xml
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImpl.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java
bmp/bmp-artifacts/pom.xml
bmp/bmp-config-example/pom.xml
bmp/pom.xml
config-loader/config-loader-artifacts/pom.xml
config-loader/pom.xml
distribution-karaf/pom.xml
feature-repo-parent/pom.xml
features/bgp/pom.xml
features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml
features/bgpcep-extras/pom.xml
features/bmp/pom.xml
features/concepts/pom.xml
features/config-loader/pom.xml
features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml
features/pcep/pom.xml
features/pom.xml
features/rsvp/pom.xml
features/topology/pom.xml
parent/pom.xml
pcep/config-example/pom.xml
pcep/pcep-artifacts/pom.xml
pcep/pom.xml
pcep/topology/pom.xml
pcep/tunnel/pom.xml
pom.xml
programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java
programming/pom.xml
programming/programming-artifacts/pom.xml
rsvp/pom.xml
rsvp/rsvp-artifacts/pom.xml
single-feature-parent/pom.xml
testtool-parent/pom.xml
topology/pom.xml
topology/topology-artifacts/pom.xml

index d6598c5c6ea07da560c936f82478c3c1706cd4d5..b3a94e8fe3681320e0057f91cdfe8728c5958aa2 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>5.0.2</version>
+      <version>6.0.0</version>
       <relativePath/>
     </parent>
 
index 3b07dafc4ff932224cb78029bc9409ed0ee72ea1..02004f593a70c916fd73d6cb1d2d9b06a3b38c0a 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 297e314eb19604289758c19a45fd1f07cb916ea4..aff7543186ced72a9e8d4e2a258564dbc1af3334 100644 (file)
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 790615d1b06df0bc00d834ff8ab600225d6bae30..39cf9a48f8987f565e384cba08a26b9639ecba9f 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index fc90a335b4f1746d5c700f2c3193a07a4398f75f..390a48dbd0096696776730143830c89a603e91b7 100644 (file)
@@ -14,6 +14,7 @@ import static org.opendaylight.protocol.bgp.openconfig.routing.policy.spi.regist
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -85,6 +86,8 @@ final class BGPRibPolicyImpl implements BGPRibRoutingPolicy {
         this.ribBaseParameters = new PolicyRIBBaseParametersImpl(localAs, originatorId, clusterId);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private List<Statement> loadStatements(final String key) throws ExecutionException, InterruptedException {
         final ReadTransaction tr = this.databroker.newReadOnlyTransaction();
         final Optional<Statements> result =
index 6f081c0a0a2cfcf8c6bea9066044e5ddc3d65e81..10a759d89f4008883aa419ed28168dba0b88bfbd 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -49,6 +50,8 @@ public class AbstractCommunityHandler {
         this.databroker = requireNonNull(dataBroker);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private List<Communities> loadCommunitySet(final String key) throws ExecutionException, InterruptedException {
         final ReadTransaction tr = this.databroker.newReadOnlyTransaction();
         final Optional<CommunitySet> result =
index 6d557a699eb1903b897063a079d7104c02fcc0a8..f6f57312c6ae41f01e1e28ed9fb044ca90d492dd 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -50,6 +51,8 @@ public class AbstractExtCommunityHandler {
         this.databroker = requireNonNull(databroker);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private List<ExtendedCommunities> loadCommunitySet(final String key)
             throws ExecutionException, InterruptedException {
         final ReadTransaction tr = this.databroker.newReadOnlyTransaction();
index 505698fbd8e9d09c45948b04659c1e50c23c482d..faa449024fe5686730ceba27b530b7e4dea94017 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -66,6 +67,8 @@ public final class MatchAsPathSetHandler implements BgpConditionsPolicy<MatchAsP
         this.dataBroker = requireNonNull(dataBroker);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private AsPathSet loadSets(final String key) throws ExecutionException, InterruptedException {
         final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction();
         final Optional<AsPathSet> result = tr.read(LogicalDatastoreType.CONFIGURATION,
index a0dfe0192654364f602377a65a27ae7022ae911c..7f14294ab972dc09a3c28ff005d8cdcebaae240c 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -62,6 +63,8 @@ public final class MatchBgpNeighborSetHandler
         this.dataBroker = requireNonNull(dataBroker);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private List<PeerId> loadRoleSets(final String key) throws ExecutionException, InterruptedException {
         final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction();
         final Optional<NeighborSet> result = tr.read(LogicalDatastoreType.CONFIGURATION,
index 5f784b7f0e5ff8dc5867fcde20fc910d9e88c04e..01917c09b326077198c7022cd1cbcbccfba87259 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -63,6 +64,8 @@ public final class MatchClusterIdSetHandler
         this.dataBroker = requireNonNull(dataBroker);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private ClusterIdSet loadSets(final String key) throws ExecutionException, InterruptedException {
         final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction();
         final Optional<ClusterIdSet> result = tr.read(LogicalDatastoreType.CONFIGURATION,
index 2edead40d50610b1b0c325a31ef4fcbad4c89197..be9e63d16d738219de6e6195bc7b53977f16fc46 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import org.apache.commons.lang3.StringUtils;
@@ -60,6 +61,8 @@ public final class MatchOriginatorIdSetHandler
         this.dataBroker = requireNonNull(dataBroker);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private OriginatorIdSet loadSets(final String key) throws ExecutionException, InterruptedException {
         final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction();
         final Optional<OriginatorIdSet> result = tr.read(LogicalDatastoreType.CONFIGURATION,
index d805444f4da860f6d92d75e1632fe46412dbf2d6..800ea1450108b095fc50821c5ebb177d7b334bec 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -63,6 +64,8 @@ public final class MatchRoleSetHandler implements BgpConditionsAugmentationPolic
         this.dataBroker = requireNonNull(dataBroker);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private List<PeerRole> loadRoleSets(final String key) throws ExecutionException, InterruptedException {
         final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction();
         final Optional<RoleSet> result = tr.read(LogicalDatastoreType.CONFIGURATION,
index c813bc8f5d2453302ac203e4669930a6abb0562d..b2c0db760ad026f523ffcbcfb8dcb5cf7f428659 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.MoreExecutors;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -126,6 +127,8 @@ public final class StateProviderImpl implements TransactionChainListener, AutoCl
         this.scheduleTask = this.scheduler.scheduleAtFixedRate(task, 0, this.timeout, SECONDS);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private synchronized void updateBGPStats(final WriteTransaction wtx) {
         final Set<String> oldStats = new HashSet<>(this.instanceIdentifiersCache.keySet());
         this.stateCollector.getRibStats().stream().filter(BGPRibState::isActive).forEach(bgpStateConsumer -> {
index 34a4e33f431186da8056ac9513328353ec7a6e7e..1adbd53031f9d5c10d94743ab29e2308aa2d6428 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 60e9068de4a87f7f19fec08aab90a498b3158785..fefa55bfedc52e5dfb42af5793a6c6539aa1f70c 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory;
 import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy;
@@ -49,6 +50,8 @@ public final class CodecsRegistryImpl implements CodecsRegistry {
         return new CodecsRegistryImpl(codecFactory, classStrategy);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private Codecs createContext(final RIBSupport<?, ?, ?, ?> ribSupport) {
         final Codecs codecs = new CodecsImpl(ribSupport);
         if (this.latestCodecTree != null) {
index 3a7c53846dcc3e65dc5ba12452a585cc46ae0d46..2f0aaaff8fe0365edba7855ef500350d06cf574a 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.opendaylight.protocol.bgp.rib.impl.spi.CodecsRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContext;
 import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContextRegistry;
@@ -50,6 +51,8 @@ final class RIBSupportContextRegistryImpl implements RIBSupportContextRegistry {
         return new RIBSupportContextRegistryImpl(extensions, codecs);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private RIBSupportContextImpl createRIBSupportContext(final RIBSupport<?, ?, ?, ?> support) {
         return new RIBSupportContextImpl(support, this.codecs);
     }
index 6b118ff4f7be7695413a846b86102054dc34906d..22a9daadd6fef2d40aab7cca7cd6ffa7c2b08916 100644 (file)
@@ -16,6 +16,7 @@ import com.google.common.cache.LoadingCache;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.MoreExecutors;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -117,6 +118,8 @@ public final class BgpDeployerImpl implements ClusteredDataTreeChangeListener<Bg
         LOG.info("BGP Deployer {} started.", this.networkInstanceName);
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private Optional<PeerGroup> loadPeerGroup(final InstanceIdentifier<PeerGroup> peerGroupIid)
             throws ExecutionException, InterruptedException {
         final ReadTransaction tr = this.dataBroker.newReadOnlyTransaction();
index e6d6a8ffcc7a77f406a17da36fb038ae7e53542c..4dd599dfad4d2b2a78c0db5ee6acbbb8d45286c1 100644 (file)
@@ -12,6 +12,7 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.FluentFuture;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.util.concurrent.Future;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -85,6 +86,8 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
         this.rpcRegistry = rpcRegistry;
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static List<OptionalCapabilities> getBgpCapabilities(final AfiSafis afiSafis, final RIB rib,
                                                           final BGPTableTypeRegistryConsumer tableTypeRegistry) {
         final List<OptionalCapabilities> caps = new ArrayList<>();
@@ -122,6 +125,8 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
         return caps;
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static Optional<byte[]> getPassword(final KeyMapping key) {
         if (key != null) {
             return Optional.of(Iterables.getOnlyElement(key.values()));
@@ -310,7 +315,7 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
                             Collections.emptySet(), gracefulRestartTimer, false, llGracefulRestarts));
         }
 
-        private synchronized void instantiateServiceInstance() {
+        synchronized void instantiateServiceInstance() {
             this.isServiceInstantiated = true;
             LOG.info("Peer instantiated {}", this.neighborAddress);
             this.bgpPeer.instantiateServiceInstance();
@@ -321,7 +326,7 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
             }
         }
 
-        private synchronized FluentFuture<? extends CommitInfo> closeServiceInstance() {
+        synchronized FluentFuture<? extends CommitInfo> closeServiceInstance() {
             if (!this.isServiceInstantiated) {
                 LOG.info("Peer {} already closed", this.neighborAddress);
                 return CommitInfo.emptyFluentFuture();
index b9d3189b3494dd373e41cc25b5c1f0f0aabb2554..ceb813f5b96144e22f73aeb7937ac6ae94af7df0 100644 (file)
@@ -9,6 +9,7 @@ package org.opendaylight.protocol.bgp.rib.impl.protocol;
 
 import static java.util.Objects.requireNonNull;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -96,11 +97,15 @@ public class BGPReconnectPromise<S extends BGPSession> extends DefaultPromise<Vo
      * @return true if initial connection was established successfully, false if initial connection failed due
      *         to e.g. Connection refused, Negotiation failed
      */
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private synchronized boolean isInitialConnectFinished() {
         requireNonNull(this.pending);
         return this.pending.isDone() && this.pending.isSuccess();
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private synchronized void reconnect() {
         requireNonNull(this.pending);
         this.pending.reconnect();
index 909ca437dec32229bf7fa6790239e2f111f97e9f..296ad8b37e0e1754ef56ff2fbfe2547d387f37dd 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 2ead7d4998c0bb9073d8e5fb05dd5fb91895b3dd..6917f4984b4f5f90c2e8fe20204137433a27ff55 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 1293eed2508c4f547a05c1f59cbde03ffe0366cb..b18c1ac38acc1c5cbd6fc8e26d77ca3cae982553 100644 (file)
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index bb1490bd75ace98b9e54af6e0a5acbb483fc608d..5748d3ebadf92abcc6663f39617ed596aef74567 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 8bfc9368d3b37461d76b18df7c0c974567f2255d..d2a1e57d0c18e357696ff83863d4c8acc293e519 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 4fc5c5d5e94b8b8567a66787713089cb38e7699b..1691c549cfed7378893ee572953981cba5998493 100644 (file)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>5.0.2</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 
index eb057d041d4149aba4a84bbf1de540463540af58..78c2d0ad1592e43bd8b2c2815338f7f276bc40c3 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 6360e8c12f0c94609763fb446829625a304e8840..e95414d33fbce9bd85951aafd18d290f25198f4d 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 869b835d67d4aceaaf926fcbeae6118756aaa916..42ca28efd39849180fd4642639377be73ad94d65 100644 (file)
@@ -8,6 +8,6 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-bgpcep-${project.version}">
     <feature name="odl-bgpcep-extras-dependencies" version="${project.version}">
-        <feature version="[5,6)">odl-netty-4</feature>
+        <feature version="[6,7)">odl-netty-4</feature>
     </feature>
 </features>
index 6cbbc601b7547aa030097f3cb53a0e3fb8d9651e..4947829ec030d261cfa1215e2c68b9cea93a2fe4 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index d58386d8897e29a3c54dc1b57b89883f6abd9ab9..3d1bafe962ae5a1ed9cf90d819f321a8bd7db97a 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 56a9fc30c61aa3cb8e77de0c0d5dc025596404ac..6b7225d7564b650ee4cc40a76e9614fbb01110db 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 8b500c2111d0d71e568929a5b416bf1a8307302f..eae4140af23cc715bf321efc9905e4e55d976965 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 279fb293a03294d9d0c3765c9895db038d9c0f46..a03f2dca42195725b3c1e8bac601cf3aeb895bd6 100644 (file)
@@ -8,6 +8,6 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-bgpcep-${project.version}">
     <feature name="odl-bgpcep-pcep-tunnel-provider" version="${project.version}">
-        <feature version="[5,6)">odl-apache-commons-lang3</feature>
+        <feature version="[6,7)">odl-apache-commons-lang3</feature>
     </feature>
 </features>
index b89674de9180163767cbff8e14e676dd3d7bff49..fe7c7067c173ed3695d65c45c53a74605d9c8212 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index d3c4815ca25d4eba766fcd6f56e61ac217deac4a..d84bf89e219c2fc62fafba310874276b00856826 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 55f5710d1c2672b081c77ed7bdc6397d60636d54..acc79257a11b8eb7629ebb53145038ca91ff3c82 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index d4e6e8d4ed26fd2680ad3173cc7c4c7c5c0dc8f2..9b08b873050654f059a5885e18c416859bde948a 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 0c229837408d7ad43e29f9268165e4a2e8a80d92..14e855bd8f079a5cdd26082b55f1da3b37384d2d 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 76427a35c0cc797c4fdf392a37d53ed0400d3eed..c9afb7d7ea79723476c926324aaf4b8a8d482e93 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 9fe84180996f5db83eb93d05b2b7774abdc872f2..f7ab5cbf92c92df41e2ed718c9b0f609506058cf 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 51c4c644df9c907b84c3636cabd5b9af317a7962..b9d9229acf78ad30f2a4e62a3a8c22c8e9f55cce 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 51e1f0d4a83488dd242a7e7b76e428af1de91fc8..dddfbe9c428fe711fed2ce9e38dd133d1492e4d6 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index a603d0d21a3c4eb82454bd6552c5a8dcc491fd16..ca381bab2208d5995dc27e5cea7f30bc371a9c66 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 746bf63abd5afd28bb4463032d02d78617be5fc1..66a05f2bf342bcf5b685eaaccf54ecab42ffc1bd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 15e5ac47cd1c94b137e273f4e66ab9af9f69885c..b0f62cebec19541750530a0677f2bfd2041da5db 100644 (file)
@@ -16,6 +16,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.util.Timeout;
 import io.netty.util.Timer;
 import java.math.BigInteger;
@@ -386,6 +387,8 @@ public final class ProgrammingServiceImpl implements ClusterSingletonService, In
         instruction.timeout();
     }
 
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private synchronized void tryScheduleDependants(final InstructionImpl instruction) {
         // Walk all dependants and try to schedule them
         final Iterator<InstructionImpl> it = instruction.getDependants();
index 7a993b866a01a456ff5f7987a9c47e9d3afa486d..d1a3085a2c298c2a7c2bc9a9b56b15296a1a4cfc 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 35e766caa539b9f2d1bdcb02a5024810859bf0e9..a42cf73a7bf1338b8fc24dffc159a1efe01b1db9 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index f3fb82184eeb822ef0a04820525362f8c35fd06d..fc8060803e3f1793165d3c5361d0f6e4cc05360d 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 48f8c01e8fab8fca1a9448daf0d65bcbcfb2b4e8..229e540a18a0f8eeeb9f2747916594e96f20adbe 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index a34edbc8161678595184ea8b927a13724010e12a..58a2edcf4751c63125d219683489c9a7cc3c4027 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 9bf737315ed54f96326983c682416be56ad15d28..f2441c5ddaba4aef5b5d04488aeb76a48fc79c8e 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 3ffc1998320060a89588fdec615dc99474be0e58..c3431289380009adce2ac501090bbad3a3477d36 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>
 
index 0a01029a136a74ce8f4bf28b199517a535da4875..55e909022790fc1e5456aa1c5713da1a17da1f9f 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.2</version>
+        <version>6.0.0</version>
         <relativePath/>
     </parent>