Bump odlparent to 5.0.0

This bumps all odlparetn references to 5.0.0.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 8011454168e80ae00bdc516f4194e53ec136c149..632f358feb31fc0c1bc3a6dda7ce2407d78ff97d 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>4.0.9</version>
+      <version>5.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/bgp/bgp-artifacts/pom.xml b/bgp/bgp-artifacts/pom.xml
index 0ae368e7a2d923795303dcc69e034aab3749defb..ff4bd3a42185aa392f924488cf0145ca2976e783 100644 (file)
--- a/bgp/bgp-artifacts/pom.xml
+++ b/bgp/bgp-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/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index 600e9aa5b5a01a91e74c26dba255713c5c69fd73..a58c66a38a0cc4353d21213334ddb634e71f6908 100644 (file)
--- a/bgp/concepts/pom.xml
+++ b/bgp/concepts/pom.xml
@@ -32,6 +32,11 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!--
             FIXME: this is in support of the generated code. This should not

diff --git a/bgp/config-example/pom.xml b/bgp/config-example/pom.xml
index f1fd3f2a4e0c31bcdceaa5852878569b14fb4fe6..24a81b73c998186f135d030b59bef30aac0e7c41 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/bgp/extensions/evpn/pom.xml b/bgp/extensions/evpn/pom.xml
index 39a7bb872cbd05f5002729d9d3b5f591b1a2b1be..bad7db96f684fb8379d609ebeca93b1136f62ada 100644 (file)
--- a/bgp/extensions/evpn/pom.xml
+++ b/bgp/extensions/evpn/pom.xml
@@ -43,6 +43,11 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- test scope dependencies -->
         <dependency>

diff --git a/bgp/extensions/flowspec/pom.xml b/bgp/extensions/flowspec/pom.xml
index c00763f1fd98e2aabd1a0f20e01c79d18c4b3d27..cd4fea7d0c2408688bdc86e084a37303bb62e1bb 100644 (file)
--- a/bgp/extensions/flowspec/pom.xml
+++ b/bgp/extensions/flowspec/pom.xml
@@ -47,6 +47,11 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- test scope dependencies -->
         <dependency>

diff --git a/bgp/extensions/labeled-unicast/pom.xml b/bgp/extensions/labeled-unicast/pom.xml
index 3fa0dae233fc780bdc718978f91da4db2a656bc6..904d67dfd5bd967721a566069e1825f5ebecfa42 100644 (file)
--- a/bgp/extensions/labeled-unicast/pom.xml
+++ b/bgp/extensions/labeled-unicast/pom.xml
@@ -44,6 +44,11 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- test scope dependencies -->
         <dependency>

diff --git a/bgp/extensions/mvpn/pom.xml b/bgp/extensions/mvpn/pom.xml
index e859d4f797e1921ea0d6a62f4be432f701b680a4..42ff200d0a7ef37097c7e69ce5bdf779636aa22b 100644 (file)
--- a/bgp/extensions/mvpn/pom.xml
+++ b/bgp/extensions/mvpn/pom.xml
@@ -51,6 +51,11 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- test scope dependencies -->
         <dependency>

diff --git a/bgp/extensions/pom.xml b/bgp/extensions/pom.xml
index 9018ae4ae8b58a3321408e71dc39823a3b1f7a8b..7c4f7faebc93a4a28b808a261325d51eb12d6964 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/bgp/extensions/route-target/pom.xml b/bgp/extensions/route-target/pom.xml
index 48ad88ec9e2fb7a37a539985515718c526ffa073..75afbe800ba25f9d02add1dca2953d861030abfd 100644 (file)
--- a/bgp/extensions/route-target/pom.xml
+++ b/bgp/extensions/route-target/pom.xml
@@ -48,6 +48,11 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-spec-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- test scope dependencies -->
         <dependency>

diff --git a/bgp/openconfig-rp-spi/pom.xml b/bgp/openconfig-rp-spi/pom.xml
index bdc59c5a77cffec8c77dad4889bcc62fcf32a70e..e263b9b4ef2dab7f15b5288de754ae4b1ff42952 100644 (file)
--- a/bgp/openconfig-rp-spi/pom.xml
+++ b/bgp/openconfig-rp-spi/pom.xml
@@ -67,6 +67,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- Tests-->
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchBgpNeighborSetHandler.java b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchBgpNeighborSetHandler.java
index c3c96e6f6d854d2d57068b1704202342843ba21d..01c050cd700cbcac6195e8c6214cbd3ab448904c 100644 (file)
--- a/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchBgpNeighborSetHandler.java
+++ b/bgp/openconfig-rp-statement/src/main/java/org/opendaylight/protocol/bgp/openconfig/routing/policy/statement/conditions/MatchBgpNeighborSetHandler.java
@@ -18,8 +18,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
@@ -100,8 +98,8 @@ public final class MatchBgpNeighborSetHandler
     }
 
     private boolean matchBgpNeighborSetCondition(
-            @Nonnull final PeerId fromPeerId,
-            @Nullable final PeerId toPeerId,
+            final PeerId fromPeerId,
+            final PeerId toPeerId,
             final MatchBgpNeighborSet matchBgpNeighborSet) {
 
         final BgpNeighbor from = matchBgpNeighborSet.getFromNeighbor();

diff --git a/bgp/openconfig-spi/pom.xml b/bgp/openconfig-spi/pom.xml
index e1dd0b8d18ad2bd8ca2b10229486757469657856..995509cac6766a1882271739b8edb3dd84a1ce91 100644 (file)
--- a/bgp/openconfig-spi/pom.xml
+++ b/bgp/openconfig-spi/pom.xml
@@ -49,6 +49,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- test scope dependencies -->
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/bgp/openconfig-state/pom.xml b/bgp/openconfig-state/pom.xml
index d2fb2a24b11eba2bc53c74acfd6b77f8fdfd8cd6..87243562057149727825b2c90644b76948019285 100644 (file)
--- a/bgp/openconfig-state/pom.xml
+++ b/bgp/openconfig-state/pom.xml
@@ -83,6 +83,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- test scope dependencies -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/AsNumberUtil.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/AsNumberUtil.java
index 9581754438fdc4df23b566d6f229dda1fb4aaebc..6d22f2d3e32ff3b746030728316e46a3858243a7 100644 (file)
--- a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/AsNumberUtil.java
+++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/AsNumberUtil.java
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.bgp.parser;
 
 import java.util.List;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Open;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
@@ -30,8 +30,7 @@ public final class AsNumberUtil {
      * @param open remote BGP open message
      * @return AsNumber
      */
-    @Nonnull
-    public static AsNumber advertizedAsNumber(final Open open) {
+    public static @NonNull AsNumber advertizedAsNumber(final Open open) {
         // Look for AS4 capability very defensively
         final List<BgpParameters> params = open.getBgpParameters();
         if (params != null) {

diff --git a/bgp/parser-spi/pom.xml b/bgp/parser-spi/pom.xml
index a75901ba7d935ed1f6c0fe1051464d32621fe5fd..f50914fa54e53ff8d36d14fc0fd90056206be11a 100644 (file)
--- a/bgp/parser-spi/pom.xml
+++ b/bgp/parser-spi/pom.xml
@@ -46,6 +46,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/bgp/path-selection-mode/pom.xml b/bgp/path-selection-mode/pom.xml
index b2bc75af41293bc979bb0c9379166b1b1d0a39e2..2e18e761762174a05beb307aae1c64ef91564890 100644 (file)
--- a/bgp/path-selection-mode/pom.xml
+++ b/bgp/path-selection-mode/pom.xml
@@ -65,6 +65,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- test scope dependencies -->
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/bgp/peer-acceptor/pom.xml b/bgp/peer-acceptor/pom.xml
index 1d1c17458e10e7dc3d4101238258b4af7696594b..81ab15a5db44c8df9747e8c2125ea9eafa471637 100644 (file)
--- a/bgp/peer-acceptor/pom.xml
+++ b/bgp/peer-acceptor/pom.xml
@@ -69,6 +69,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- Testing dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/bgp/pom.xml b/bgp/pom.xml
index 5f12090c4a23b48fb8544aa943713193cd1ced01..6df22a8e22ef24a9a334cce5fca4880d6c0458cb 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index 06de9d89e00bbf468975ed42fff239530ac0fd85..fc61927c00b58bd22b66ec0fcc16f5455a499b96 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -161,6 +161,11 @@
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!--Netty -->
         <dependency>
             <groupId>io.netty</groupId>

diff --git a/bgp/rib-mock/pom.xml b/bgp/rib-mock/pom.xml
index faf1e149b29aa3c182d679d7ca66518d685d54a6..76834ef10438274aa7eba816e55b7b59a3b313f2 100644 (file)
--- a/bgp/rib-mock/pom.xml
+++ b/bgp/rib-mock/pom.xml
@@ -62,6 +62,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index 664644ae90d51aa250c47929b3515ba53eb2f9be..1c484f80d4bf7a73c7d3792ed02433ccc09cfccf 100644 (file)
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -113,6 +113,11 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-codec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml
index 2f0c67ac546d9fa718c20eae39d1df4fde559a86..0c0928c3a43b17dbeda4cb7805702d30657fb3ec 100644 (file)
--- a/bgp/topology-provider/pom.xml
+++ b/bgp/topology-provider/pom.xml
@@ -125,6 +125,11 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

diff --git a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/BinaryBGPDumpFileParser.java b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/BinaryBGPDumpFileParser.java
index c98f60272d81d8ea17aa0749ad6151e604c549f7..f1007296bcc04869478d53e30280ecce90edd639 100644 (file)
--- a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/BinaryBGPDumpFileParser.java
+++ b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/BinaryBGPDumpFileParser.java
@@ -12,7 +12,6 @@ import com.google.common.collect.Lists;
 import com.google.common.primitives.UnsignedBytes;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.concurrent.Immutable;
 import org.opendaylight.protocol.util.ByteArray;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +21,6 @@ import org.slf4j.LoggerFactory;
  * (http://www.ripe.net/data-tools/stats/ris/ris-raw-data) The parser detects BGP messages by searching for 16 FF bytes,
  * everything else before or after is ignored.
  */
-@Immutable
 public final class BinaryBGPDumpFileParser {
     private static final Logger LOG = LoggerFactory.getLogger(BinaryBGPDumpFileParser.class);
     private static final int MINIMAL_LENGTH = 19;

diff --git a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java
index e42f6b1f5dff0d16d07fe81e3d29957edf56f320..0a9f363132d057799ac4a4f83e41626ee2261f1d 100644 (file)
--- a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java
+++ b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Locale;
-import javax.annotation.concurrent.Immutable;
 import org.opendaylight.protocol.util.ByteArray;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,7 +30,6 @@ import org.slf4j.LoggerFactory;
  * Read text file, parse BGP messages. File can contain comments or other data. BGP messages are detected using 16 ff
  * marker. New lines and spaces are ignored.
  */
-@Immutable
 public final class HexDumpBGPFileParser {
     private static final int MINIMAL_LENGTH = 19;
     private static final Logger LOG = LoggerFactory.getLogger(HexDumpBGPFileParser.class);

diff --git a/bmp/bmp-artifacts/pom.xml b/bmp/bmp-artifacts/pom.xml
index d67722e75e0fabafe39864057fc579799d286e41..e6f0ee54fea2a342a79f59a157411a24eb18eb11 100644 (file)
--- a/bmp/bmp-artifacts/pom.xml
+++ b/bmp/bmp-artifacts/pom.xml
@@ -13,7 +13,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/bmp/bmp-config-example/pom.xml b/bmp/bmp-config-example/pom.xml
index b5c00e0977022c9e2c884794b737c647d2abba22..00a9d77b3ad6bd91c800f4eda63106967da7772a 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/bmp/bmp-impl/pom.xml b/bmp/bmp-impl/pom.xml
index 97fc42de82ef1b8407560276d4f79a04d4182d7b..7687a500f5bc40fff1575e35b34a25eb448cf270 100644 (file)
--- a/bmp/bmp-impl/pom.xml
+++ b/bmp/bmp-impl/pom.xml
@@ -139,6 +139,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

diff --git a/bmp/bmp-mock/pom.xml b/bmp/bmp-mock/pom.xml
index 43aee84b38db4667e5fbc3edc7d57de7267bf371..a28b1f9d84c1beb45cbb2d2615d9543a6468b6bc 100644 (file)
--- a/bmp/bmp-mock/pom.xml
+++ b/bmp/bmp-mock/pom.xml
@@ -90,6 +90,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
             <artifactId>argparse4j</artifactId>

diff --git a/bmp/bmp-spi/pom.xml b/bmp/bmp-spi/pom.xml
index 77bc56154302fed334b5a417d28dd64890568374..3a9ddc863815e42d40ea70b3b111c44039d23e0c 100644 (file)
--- a/bmp/bmp-spi/pom.xml
+++ b/bmp/bmp-spi/pom.xml
@@ -52,6 +52,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/bmp/pom.xml b/bmp/pom.xml
index ea01bfb5f002fe329312b79320f4fefa211d8579..8e344100f6c03948142f8e36899fbcf3f9fad8cb 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/concepts/pom.xml b/concepts/pom.xml
index f802a25052d12e756441eca4470138a981f2bf12..c2edb9ebc4b4d18b8d22f40bf365cde42d02e938 100644 (file)
--- a/concepts/pom.xml
+++ b/concepts/pom.xml
@@ -39,6 +39,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/config-loader/bmp-monitors-config-loader/pom.xml b/config-loader/bmp-monitors-config-loader/pom.xml
index b4126079b0e839ef237b85e90d0985bf2b940020..244b5cc87f5433c1ebbaaf581bb7fa4c8b733f5b 100644 (file)
--- a/config-loader/bmp-monitors-config-loader/pom.xml
+++ b/config-loader/bmp-monitors-config-loader/pom.xml
@@ -69,6 +69,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>config-loader-impl</artifactId>
@@ -114,4 +119,4 @@
         <url>https://wiki.opendaylight.org/view/BGP_LS_PCEP:Main</url>
         <tag>HEAD</tag>
     </scm>
-</project>
\ No newline at end of file
+</project>

diff --git a/config-loader/config-loader-artifacts/pom.xml b/config-loader/config-loader-artifacts/pom.xml
index 7e3f6b6a2643e87e81a19efae2f4b57d5201cceb..81a0bffc28bc790acfbae6ae4a04aa9ef0320a33 100644 (file)
--- a/config-loader/config-loader-artifacts/pom.xml
+++ b/config-loader/config-loader-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/config-loader/config-loader-impl/pom.xml b/config-loader/config-loader-impl/pom.xml
index 301114a99789333faf78c358a937422cee573e37..92239ea3e3a4b9ea32f74ad118fb79899fa43b3d 100644 (file)
--- a/config-loader/config-loader-impl/pom.xml
+++ b/config-loader/config-loader-impl/pom.xml
@@ -68,6 +68,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- test scope dependencies -->
         <dependency>

diff --git a/config-loader/config-loader-spi/pom.xml b/config-loader/config-loader-spi/pom.xml
index 3407bc2759c6fb2d0e402fa8282e05372de49957..714e3e1d63feda036373fca158532b20633a6524 100644 (file)
--- a/config-loader/config-loader-spi/pom.xml
+++ b/config-loader/config-loader-spi/pom.xml
@@ -40,6 +40,11 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <scm>

diff --git a/config-loader/pom.xml b/config-loader/pom.xml
index 6a2eae29b8c4524b3fa42625b92bf1d6ce6a7bbd..e6cd919afc1a8ca44260a4cec3af5be000ef02ae 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/config-loader/routing-policy-config-loader/pom.xml b/config-loader/routing-policy-config-loader/pom.xml
index 7740232a990e8f0d7f22231e6bbd752c1f5513fa..1dd2c446c53b0d7ba81b4db8ec87f855d7bf41df 100644 (file)
--- a/config-loader/routing-policy-config-loader/pom.xml
+++ b/config-loader/routing-policy-config-loader/pom.xml
@@ -66,6 +66,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- test scope dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -129,4 +134,4 @@
         <url>https://wiki.opendaylight.org/view/BGP_LS_PCEP:Main</url>
         <tag>HEAD</tag>
     </scm>
-</project>
\ No newline at end of file
+</project>

diff --git a/config-loader/topology-config-loader/pom.xml b/config-loader/topology-config-loader/pom.xml
index fa0d26ed815e075f6fc227c43d4ebbb1b29a486f..f3d64b51c16990a06ac159d13b04398b91e0f329 100644 (file)
--- a/config-loader/topology-config-loader/pom.xml
+++ b/config-loader/topology-config-loader/pom.xml
@@ -69,6 +69,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- test scope dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -115,4 +120,4 @@
         <url>https://wiki.opendaylight.org/view/BGP_LS_PCEP:Main</url>
         <tag>HEAD</tag>
     </scm>
-</project>
\ No newline at end of file
+</project>

diff --git a/data-change-counter/pom.xml b/data-change-counter/pom.xml
index 4362dd80ad356639a1449955f77307b7e7b55428..3246843006a9b713c833363c016203e18834dee4 100644 (file)
--- a/data-change-counter/pom.xml
+++ b/data-change-counter/pom.xml
@@ -27,6 +27,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index dc6cdf3454047c9e4ef4fa41046eb040b6ef7123..b9ddc3eb69f7dc970486d5399b194b846b4417be 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>4.0.9</version>
+    <version>5.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index 138dc72a839277b1460c5a6c419b39e7c80675ea..190d289795a8920e5cd91298bc0564870fb3111b 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml
index 23da92eb0a4c8e179e85adaf91a7ad545e7f4122..b1e05141f99b2ee9fb601e6f2f596b97f85086ac 100644 (file)
--- a/features/bgp/pom.xml
+++ b/features/bgp/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/features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml
index 35662752c5c092ff528e91d14fe0b87d8ffb2ff7..869b835d67d4aceaaf926fcbeae6118756aaa916 100644 (file)
--- a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml
+++ b/features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml
@@ -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="[4,5)">odl-netty-4</feature>
+        <feature version="[5,6)">odl-netty-4</feature>
     </feature>
 </features>

diff --git a/features/bgpcep-extras/pom.xml b/features/bgpcep-extras/pom.xml
index c5b23313f97b47168358e7b8affa6821ebc44aa4..a76d0cb77251b536c8feb852ebcc013fba997771 100644 (file)
--- a/features/bgpcep-extras/pom.xml
+++ b/features/bgpcep-extras/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/features/bmp/pom.xml b/features/bmp/pom.xml
index fd281075ee4ff4e95123f9b163df032ab2740cdf..0534b772de34eb9e371f3bda99eba7ed26780331 100644 (file)
--- a/features/bmp/pom.xml
+++ b/features/bmp/pom.xml
@@ -11,7 +11,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/features/concepts/pom.xml b/features/concepts/pom.xml
index 1f5ce784dcfd2bdb491264b87eca9387e404df3a..feb01ad8ba23ef910425ca0052b379151a0b33bc 100644 (file)
--- a/features/concepts/pom.xml
+++ b/features/concepts/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/features/config-loader/pom.xml b/features/config-loader/pom.xml
index 13855e1fadd5dc9412783d0e1bc2c60404ce9bfe..f8ee0b93ac94b067f0cb1854bac30d4711f1ea63 100644 (file)
--- a/features/config-loader/pom.xml
+++ b/features/config-loader/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/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml b/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml
index a0c3efbe8da2c65feb65ee5c4463f0c78487edd1..279fb293a03294d9d0c3765c9895db038d9c0f46 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml
+++ b/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml
@@ -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="[4.0.5,5)">odl-apache-commons-lang3</feature>
+        <feature version="[5,6)">odl-apache-commons-lang3</feature>
     </feature>
 </features>

diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml
index 022368c90487ff0f23b68c736149c2c28b7bd6a2..87d86ec4ccc14fb2f2f76113352bd9a10314cca7 100644 (file)
--- a/features/pcep/pom.xml
+++ b/features/pcep/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/features/pom.xml b/features/pom.xml
index 006fb3314381e537ca4fe781b4368c023c5f6591..cab72423b04abf76c9753c7e1031678aea848601 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml
index eef7a809a2091c9f65db1bc64def6515b4599872..edf23cff849bfe698ea3530bf516ad943c728cfb 100644 (file)
--- a/features/rsvp/pom.xml
+++ b/features/rsvp/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/features/topology/pom.xml b/features/topology/pom.xml
index 0a3d382c8e42665f8919a490d389e61697c08080..c9a4fc31a0ea333bc3f5cfacaad59411394f90c1 100644 (file)
--- a/features/topology/pom.xml
+++ b/features/topology/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/parent/pom.xml b/parent/pom.xml
index c47f175816d908d22dbefb4f3151e30861e10d71..0d1fa72de8b1cfd0e2951a714cf2fe6021ab7191 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/api/pom.xml b/pcep/api/pom.xml
index 9b72500ee637065172a4223b4b69141958c86c5b..16a913271f1555457be804e0f83587c376e91dd6 100644 (file)
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -45,6 +45,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!--
             FIXME: this is in support of the generated code. This should not

diff --git a/pcep/config-example/pom.xml b/pcep/config-example/pom.xml
index 2da3d3816bf18abc88165c74d792a2fbe26955bf..e8e98144fb476e5482e598c801e65962cedfb681 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 24843a45a779a5e8802d727506b76d42695f50d7..c2bb6176ac2b09599f5819014d5d143088d0b3e3 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -84,6 +84,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/pcep/pcc-mock/pom.xml b/pcep/pcc-mock/pom.xml
index 3ade650de3c363837bc1e4b6f351bd4d20178d9a..9bf6dba6294908d258ba64fd2579c20509ce0ce1 100644 (file)
--- a/pcep/pcc-mock/pom.xml
+++ b/pcep/pcc-mock/pom.xml
@@ -64,6 +64,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/pcep/pcep-artifacts/pom.xml b/pcep/pcep-artifacts/pom.xml
index 274d5ae0673c67ad79965f24e42fec650b00f7b0..8297a28397a9d19ea05cba692773e086df4e5bd5 100644 (file)
--- a/pcep/pcep-artifacts/pom.xml
+++ b/pcep/pcep-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/pcep/pom.xml b/pcep/pom.xml
index e3e265fcd7b98b01cc0b66644333a03d2a1eb4b0..d8c4b5830d30fe3b0edc6538d447b0579167783d 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/spi/pom.xml b/pcep/spi/pom.xml
index 439f81d86dcd5b3148f9f5d99c887ac4551e43b8..880d534682e24b0f39b558bf99a324169abf79b9 100644 (file)
--- a/pcep/spi/pom.xml
+++ b/pcep/spi/pom.xml
@@ -66,6 +66,11 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!--test dependencies -->
         <dependency>

diff --git a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestToolPCEPDispatcherDependencies.java b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestToolPCEPDispatcherDependencies.java
index af46e415d9f140aed1b96adc1483558756dacf25..d697edc87103eae0c1fe7b66b672a057bbb3d320 100644 (file)
--- a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestToolPCEPDispatcherDependencies.java
+++ b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestToolPCEPDispatcherDependencies.java
@@ -9,7 +9,6 @@
 package org.opendaylight.protocol.pcep.testtool;
 
 import java.net.InetSocketAddress;
-import javax.annotation.Nonnull;
 import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.pcep.PCEPDispatcherDependencies;
 import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
@@ -21,7 +20,7 @@ public final class TestToolPCEPDispatcherDependencies implements PCEPDispatcherD
     private final KeyMapping keys = KeyMapping.getKeyMapping();
     private final SpeakerIdMapping speakerIds = SpeakerIdMapping.getSpeakerIdMap();
 
-    TestToolPCEPDispatcherDependencies(@Nonnull final InetSocketAddress address) {
+    TestToolPCEPDispatcherDependencies(final InetSocketAddress address) {
         this.address = address;
     }
 

diff --git a/pcep/topology/pom.xml b/pcep/topology/pom.xml
index 00c2833b4d88790f51771381ad8386982fc03e69..fc88ed59bcd092804b0c2dee5033bb4a10b54f5d 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/topology/topology-provider/pom.xml b/pcep/topology/topology-provider/pom.xml
index 6f84dd26197588d82c1045bbb817332b958a9f7e..591f47f4595281e695a53fa1b5dc6e9b7b61b7ab 100644 (file)
--- a/pcep/topology/topology-provider/pom.xml
+++ b/pcep/topology/topology-provider/pom.xml
@@ -113,6 +113,11 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
index 6e003bf6f67f8e1e601b4f4bca7044740ffb1393..141dbf65f53332f77d3a92f1b752678ab02f34ea 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
@@ -703,7 +703,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
         }
 
         @Override
-        public ListenableFuture<OperationResult> apply(@Nonnull final Optional<ReportedLsp> rep) {
+        public ListenableFuture<OperationResult> apply(final Optional<ReportedLsp> rep) {
             if (rep.isPresent()) {
                 LOG.debug("Node {} already contains lsp {} at {}", this.input.getNode(), this.input.getName(),
                         this.lsp);

diff --git a/pcep/topology/topology-spi/pom.xml b/pcep/topology/topology-spi/pom.xml
index cf937f06851942880f59a3eca6fbea1bbd542327..84d3c0b0eda5309aa55130730fc16838d3adf0e0 100644 (file)
--- a/pcep/topology/topology-spi/pom.xml
+++ b/pcep/topology/topology-spi/pom.xml
@@ -57,6 +57,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- Testing dependencies -->
         <dependency>

diff --git a/pcep/topology/topology-stats/pom.xml b/pcep/topology/topology-stats/pom.xml
index 87c79a80c047b42804318883221f99e0d1771178..75c64ecdf6092987872393bc2875d52b3b0d44c9 100644 (file)
--- a/pcep/topology/topology-stats/pom.xml
+++ b/pcep/topology/topology-stats/pom.xml
@@ -80,6 +80,11 @@
             <artifactId>mdsal-binding-dom-adapter</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <scm>

diff --git a/pcep/tunnel/pom.xml b/pcep/tunnel/pom.xml
index 4bfb174d75883b9f85538b0346c92ae21a3afa20..a324f74121c45351d0d9afde3f6e23b341c0bd97 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pcep/tunnel/tunnel-api/pom.xml b/pcep/tunnel/tunnel-api/pom.xml
index e61806ed1014c2684c1516d22ea2f289dfe21bf3..082a19c6f257b0c2d11cfbf19cb798bb8822d6fe 100644 (file)
--- a/pcep/tunnel/tunnel-api/pom.xml
+++ b/pcep/tunnel/tunnel-api/pom.xml
@@ -53,6 +53,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>topology-tunnel-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>programming-topology-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>

diff --git a/pcep/tunnel/tunnel-provider/pom.xml b/pcep/tunnel/tunnel-provider/pom.xml
index cc5a709fdc318cad26b6ad748a0b7d8084c5dd63..b532f48ee6a41e2debd2c2d32602953c7ea4a0d7 100644 (file)
--- a/pcep/tunnel/tunnel-provider/pom.xml
+++ b/pcep/tunnel/tunnel-provider/pom.xml
@@ -122,6 +122,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

diff --git a/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java b/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java
index 17b3380a0e9068388c179bea63b9568210e887b5..55cfb4efec28cc9580ea09393f810327f9779419 100644 (file)
--- a/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java
+++ b/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java
@@ -183,35 +183,38 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest {
         Mockito.doReturn(true).when(this.instruction).checkedExecutionStart();
         Mockito.doNothing().when(this.instruction).executionCompleted(InstructionStatus.Failed, null);
         Mockito.doAnswer(invocation -> {
-            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            final Runnable callback = invocation.getArgument(0);
             callback.run();
             return null;
         }).when(this.instructionFuture).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
+        Mockito.doReturn(false).when(this.futureAddLspOutput).isCancelled();
         Mockito.doAnswer(invocation -> {
-            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            final Runnable callback = invocation.getArgument(0);
             callback.run();
             return null;
         }).when(this.futureAddLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
+        Mockito.doReturn(false).when(this.futureUpdateLspOutput).isCancelled();
         Mockito.doAnswer(invocation -> {
-            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            final Runnable callback = invocation.getArgument(0);
             callback.run();
             return null;
         }).when(this.futureUpdateLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
+        Mockito.doReturn(false).when(this.futureRemoveLspOutput).isCancelled();
         Mockito.doAnswer(invocation -> {
-            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            final Runnable callback = invocation.getArgument(0);
             callback.run();
             return null;
         }).when(this.futureRemoveLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
         Mockito.doAnswer(invocation -> {
-            TunnelProgrammingTest.this.addLspInput = (AddLspInput) invocation.getArguments()[0];
+            TunnelProgrammingTest.this.addLspInput = invocation.getArgument(0);
             return TunnelProgrammingTest.this.futureAddLspOutput;
         }).when(this.topologyService).addLsp(Mockito.any(AddLspInput.class));
         Mockito.doAnswer(invocation -> {
-            TunnelProgrammingTest.this.updateLspInput = (UpdateLspInput) invocation.getArguments()[0];
+            TunnelProgrammingTest.this.updateLspInput = invocation.getArgument(0);
             return TunnelProgrammingTest.this.futureUpdateLspOutput;
         }).when(this.topologyService).updateLsp(Mockito.any(UpdateLspInput.class));
         Mockito.doAnswer(invocation -> {
-            TunnelProgrammingTest.this.removeLspInput = (RemoveLspInput) invocation.getArguments()[0];
+            TunnelProgrammingTest.this.removeLspInput = invocation.getArgument(0);
             return TunnelProgrammingTest.this.futureRemoveLspOutput;
         }).when(this.topologyService).removeLsp(Mockito.any(RemoveLspInput.class));
         Mockito.doReturn(this.instruction).when(this.instructionFuture).get();
@@ -230,7 +233,7 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest {
 
     @Test
     public void testTunnelProgramming() throws InterruptedException, ExecutionException {
-        final Bandwidth bwd = new Bandwidth(new byte[]{0x00, 0x00, 0x00, (byte) 0xff});
+        final Bandwidth bwd = new Bandwidth(new byte[] { 0x00, 0x00, 0x00, (byte) 0xff });
         final ClassType classType = new ClassType((short) 1);
         final String tunnelName = "create-tunnel";
         final NetworkTopologyRef topologyRef = new NetworkTopologyRef(TOPO_IID);

diff --git a/pom.xml b/pom.xml
index f1bdf08bced6291543580f0247f642af8ceaacf1..6265f1c3915f9fa3a8c0b82c02c855e70c47f7df 100644 (file)
--- a/pom.xml
+++ b/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/programming/impl/pom.xml b/programming/impl/pom.xml
index 484e186e7a2bf11766097c1ea4de336cb3042ba2..faebf0b7e1a3094f0b09e31f7afeddcc7b5329a9 100644 (file)
--- a/programming/impl/pom.xml
+++ b/programming/impl/pom.xml
@@ -74,6 +74,11 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!-- Testing dependencies -->
         <dependency>

diff --git a/programming/pom.xml b/programming/pom.xml
index de3ad9cc40e7fdc4e18bc719abc1baf558c6b6c6..e947b27782f11167efd33b42be659fce40348863 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/programming/programming-artifacts/pom.xml b/programming/programming-artifacts/pom.xml
index aa1c706225f74299554dc1513b226ad7ffec5834..70cc7aff7979a98a064faeee80eff576d4d899d9 100644 (file)
--- a/programming/programming-artifacts/pom.xml
+++ b/programming/programming-artifacts/pom.xml
@@ -14,7 +14,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/programming/spi/src/main/java/org/opendaylight/bgpcep/programming/spi/InstructionScheduler.java b/programming/spi/src/main/java/org/opendaylight/bgpcep/programming/spi/InstructionScheduler.java
index 21a23c472397901881470cea85228b26d96e9a6b..d96c9fd89d8712318324b246e9d26318d2e26405 100644 (file)
--- a/programming/spi/src/main/java/org/opendaylight/bgpcep/programming/spi/InstructionScheduler.java
+++ b/programming/spi/src/main/java/org/opendaylight/bgpcep/programming/spi/InstructionScheduler.java
@@ -8,7 +8,7 @@
 package org.opendaylight.bgpcep.programming.spi;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.programming.rev150720.SubmitInstructionInput;
 import org.opendaylight.yangtools.concepts.Identifiable;
@@ -30,6 +30,5 @@ public interface InstructionScheduler extends Identifiable<ServiceGroupIdentifie
      *
      * @return Instruction ID
      */
-    @Nonnull
-    String getInstructionID();
+    @NonNull String getInstructionID();
 }

diff --git a/rsvp/pom.xml b/rsvp/pom.xml
index 8bcf148dfa086e9e2a0610518611c547c0e25147..4be70ca1ed640ee05aa7b069757038dedf609e9b 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/rsvp/rsvp-artifacts/pom.xml b/rsvp/rsvp-artifacts/pom.xml
index 71dd2fef449cdba38398b0c736a838d16583031f..98f836e18ede48132097da8cf3538ebc6effdde7 100644 (file)
--- a/rsvp/rsvp-artifacts/pom.xml
+++ b/rsvp/rsvp-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/rsvp/spi/pom.xml b/rsvp/spi/pom.xml
index 17322af7c25b86d69db534a96c47bb86cb156e51..b1c4485f60b00955a3f74ef1d8aeb7776c244933 100644 (file)
--- a/rsvp/spi/pom.xml
+++ b/rsvp/spi/pom.xml
@@ -40,6 +40,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index 887adeabb5d5175d7b729cf86758f967a783db91..fa1a5966245b9813059abdfd2dae478bb71c508d 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/testtool-parent/pom.xml b/testtool-parent/pom.xml
index 574f118d43c254a1fdb8d096b48f939015416ddd..7840868a1b9d107cd1d4e5dacb9fef4e55825cae 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/topology/pom.xml b/topology/pom.xml
index 1c936246a95c70a10cb02fff8644ac285e446839..ee8ec82144dda38e6f421a113918edb6e2aa6197 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>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/topology/topology-artifacts/pom.xml b/topology/topology-artifacts/pom.xml
index b82a84a673fdf573c779658525c49953086858fe..954a4f61298bace3162866051aaf7654419cc3c0 100644 (file)
--- a/topology/topology-artifacts/pom.xml
+++ b/topology/topology-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>