Bump odlparent to 13.0.0

Align the version with the version used by yangtools-11. Also fixes up
dependencies to pull in optional annotations.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 3898360f2890e8f14e0c42b71156b53079ebcd08..7f9cd05cc9a0ab152ebf403775e46c8a6de2103e 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>12.0.6</version>
+      <version>13.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
index ef1c380484d42529d8124fbe73a62d8118ae62d9..1920aebf131633363810430900d1a9c03ccb4f3a 100644 (file)
--- a/binding/binding-parent/pom.xml
+++ b/binding/binding-parent/pom.xml
@@ -47,6 +47,11 @@
                     <groupId>org.opendaylight.mdsal</groupId>
                     <artifactId>yang-binding</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-annotations</artifactId>
+                    <optional>true</optional>
+                </dependency>
             </dependencies>
             <build>
                 <pluginManagement>

diff --git a/binding/mdsal-binding-api/pom.xml b/binding/mdsal-binding-api/pom.xml
index 61a094740d7d23f2d3ee94cf11b2976f41a97ff0..5df8c7c7aa0273378cdeea0cd6bfb5ebe909042c 100644 (file)
--- a/binding/mdsal-binding-api/pom.xml
+++ b/binding/mdsal-binding-api/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml
index 0bebc73717fc5b8cfcc5b954be8452cafe2629b2..cf1bce35e8b68de918d2bac76180a8b78eb4caf5 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/pom.xml
+++ b/binding/mdsal-binding-dom-adapter/pom.xml
@@ -20,10 +20,19 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-api</artifactId>

diff --git a/binding/mdsal-binding-dom-codec-api/pom.xml b/binding/mdsal-binding-dom-codec-api/pom.xml
index 520f8840e6dc7934c3cdfa3d9f4d335c99fad7c7..53ef25e040aa1d09538a37db64f00f5a2bdd43e5 100644 (file)
--- a/binding/mdsal-binding-dom-codec-api/pom.xml
+++ b/binding/mdsal-binding-dom-codec-api/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>

diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml
index 848a0e124be90800d4a78ecec350c71576d69832..48db4839f78a97767aad65bcd33a34aa5ba39a98 100644 (file)
--- a/binding/mdsal-binding-dom-codec-osgi/pom.xml
+++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-dom-codec-spi/pom.xml b/binding/mdsal-binding-dom-codec-spi/pom.xml
index 8c5605dca4f945702222a3e50e596fbb832d00a6..0f3a976cdc2abf38b493119381075d7e9fe81cfd 100644 (file)
--- a/binding/mdsal-binding-dom-codec-spi/pom.xml
+++ b/binding/mdsal-binding-dom-codec-spi/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml
index 71c4d0844d5f2a1c8f814d0c236331456e2b0126..36e0581d715f8a2b2f52f45a3c568aae33286215 100644 (file)
--- a/binding/mdsal-binding-dom-codec/pom.xml
+++ b/binding/mdsal-binding-dom-codec/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-generator/pom.xml b/binding/mdsal-binding-generator/pom.xml
index 74063c46dcb021d15ff82151d9339e95b4539a3c..7da62a21256753a799b60532e324a7bf19a2edb8 100644 (file)
--- a/binding/mdsal-binding-generator/pom.xml
+++ b/binding/mdsal-binding-generator/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-java-api-generator/pom.xml b/binding/mdsal-binding-java-api-generator/pom.xml
index d00adfc87c44f871e8fed0bae4703c10bc3e6fba..9a3f020438e38ceaff3a88f32654a199d2e43342 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/pom.xml
+++ b/binding/mdsal-binding-java-api-generator/pom.xml
@@ -20,10 +20,19 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>plugin-generator-api</artifactId>

diff --git a/binding/mdsal-binding-loader/pom.xml b/binding/mdsal-binding-loader/pom.xml
index 55c361eb416d86c1354c121a2e385ffc79e20042..e7962ca28dad5ea3e42460039f6216d6da8e3524 100644 (file)
--- a/binding/mdsal-binding-loader/pom.xml
+++ b/binding/mdsal-binding-loader/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-model-ri/pom.xml b/binding/mdsal-binding-model-ri/pom.xml
index 832c46cf06160934898e11c4e19e322f1a4add84..d492a74b0f44ecc87cdd19e6f745a78b78c66154 100644 (file)
--- a/binding/mdsal-binding-model-ri/pom.xml
+++ b/binding/mdsal-binding-model-ri/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>

diff --git a/binding/mdsal-binding-runtime-api/pom.xml b/binding/mdsal-binding-runtime-api/pom.xml
index e5f74bc9456e8a1448ae68fa7052f6588b2a6edf..ac663144fc0ae599f0aa96126d80916247038869 100644 (file)
--- a/binding/mdsal-binding-runtime-api/pom.xml
+++ b/binding/mdsal-binding-runtime-api/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-runtime-spi/pom.xml b/binding/mdsal-binding-runtime-spi/pom.xml
index 25eef423662186c6fc8a735016a0c14ba6949b80..62c47216303123e6ad0d92b14d2f85fc51c89a56 100644 (file)
--- a/binding/mdsal-binding-runtime-spi/pom.xml
+++ b/binding/mdsal-binding-runtime-spi/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -27,7 +32,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/binding/mdsal-binding-spec-util/pom.xml b/binding/mdsal-binding-spec-util/pom.xml
index 7cadfa6915a3d4a17ee8a703bdc00336922236c9..5978478d379f793590e14ae8e956f927410b9798 100644 (file)
--- a/binding/mdsal-binding-spec-util/pom.xml
+++ b/binding/mdsal-binding-spec-util/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-spi/pom.xml b/binding/mdsal-binding-spi/pom.xml
index 34b3f72ffb3e32dc655b3234f2cd455280f42cba..c7a96b15487e4b31c4a48557dfb53a734ce8680a 100644 (file)
--- a/binding/mdsal-binding-spi/pom.xml
+++ b/binding/mdsal-binding-spi/pom.xml
@@ -21,6 +21,15 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-api</artifactId>
@@ -29,9 +38,5 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
     </dependencies>
 </project>

diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index b84c59f6ea37e93bd457cda68ce6120d1befa8c5..56c5e50178226a1b34d68e9173bc86fc89459dfe 100644 (file)
--- a/binding/mdsal-binding-test-utils/pom.xml
+++ b/binding/mdsal-binding-test-utils/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/binding/mdsal-binding-util/pom.xml b/binding/mdsal-binding-util/pom.xml
index 85c841d2ced66dfe74e95d8fabe77187a45742f8..1303715009f35da9a2e82cca06dd99cfa3f111ef 100644 (file)
--- a/binding/mdsal-binding-util/pom.xml
+++ b/binding/mdsal-binding-util/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/pom.xml b/binding/pom.xml
index 8b7bd66eda1180b7dcebc62a7026da87151715a9..97a7318ad94ac8c662b6af9a42ec25fddba7eb93 100644 (file)
--- a/binding/pom.xml
+++ b/binding/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/binding/yang-binding/pom.xml b/binding/yang-binding/pom.xml
index cfacc58c67919051cfdbae4c924862830a4725c3..505bc65dccaaf17a05374c9c2694e4ab103c0ad8 100644 (file)
--- a/binding/yang-binding/pom.xml
+++ b/binding/yang-binding/pom.xml
@@ -22,6 +22,15 @@
     <description>Java binding for YANG</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
@@ -34,10 +43,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.powermock</groupId>

diff --git a/binding/yang-binding/src/main/java/module-info.java b/binding/yang-binding/src/main/java/module-info.java
index 2aba738bf7a280bde49277dd88b17a7e329ba277..c4015e8eae242f45e032ad520ead84b020bf444a 100644 (file)
--- a/binding/yang-binding/src/main/java/module-info.java
+++ b/binding/yang-binding/src/main/java/module-info.java
@@ -16,6 +16,8 @@ module org.opendaylight.yangtools.yang.binding {
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
-    requires static com.github.spotbugs.annotations;
+    // FIXME: yeah, because ... we use this in public classes, so tools need
+    //        to resolve it. Why exactly?!
+    requires static transitive com.github.spotbugs.annotations;
     requires static org.checkerframework.checker.qual;
 }

diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml
index cdc0e4d63304ef28d3d786d07c53290702b87da7..ca58e8e0d283f0fb3904642f30b3384f308635a8 100644 (file)
--- a/common/mdsal-common-api/pom.xml
+++ b/common/mdsal-common-api/pom.xml
@@ -21,10 +21,19 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
@@ -37,6 +46,7 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
index 83de49a669752f563bbabbd48bb1795d36a93c60..d65fd3c2900841355e2bcce5e10fe99df0b80fa7 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 8115528e6c36aa67f50305c5c17c35e8ce79bad9..f2e3a2c531aa989ec3c9564f63699551f5296ad1 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -376,6 +376,10 @@
         </dependency>
 
         <!-- Also add dependencies we are using -->
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
@@ -390,6 +394,10 @@
             <artifactId>org.apache.karaf.shell.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>
@@ -578,7 +586,7 @@
                         <link>https://google.github.io/guava/releases/31.1-jre/api/docs/</link>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/12.0.6/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.0.0/</link>
                         <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/11.0.0-SNAPSHOT/</link>
                     </links>
                     <groups>

diff --git a/dom/dom-parent/pom.xml b/dom/dom-parent/pom.xml
index bb75f3791d8e89906a70bd7bf8d04802b7e87111..02edb3022d2eaa2a28b73b20817faa32d670cdc9 100644 (file)
--- a/dom/dom-parent/pom.xml
+++ b/dom/dom-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/dom/mdsal-dom-api/pom.xml b/dom/mdsal-dom-api/pom.xml
index 19bfecb8d80c74caee43e7d9bc255f236e385bed..0fcf967f6664b9f28f28ee1ebe40f621636f280a 100644 (file)
--- a/dom/mdsal-dom-api/pom.xml
+++ b/dom/mdsal-dom-api/pom.xml
@@ -21,6 +21,15 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-common-api</artifactId>

diff --git a/dom/mdsal-dom-broker/pom.xml b/dom/mdsal-dom-broker/pom.xml
index ef61f0266a018c5af9731acc97c768db04c31864..551e75e2a6b19746c3ce719ad58775e6616c1713 100644 (file)
--- a/dom/mdsal-dom-broker/pom.xml
+++ b/dom/mdsal-dom-broker/pom.xml
@@ -20,10 +20,19 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-common-api</artifactId>

diff --git a/dom/mdsal-dom-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml
index b80980e051725f7b67be37fb1f02016faaf066d2..54f35f71d43f78b1578a382d50e84b5419aa894d 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore/pom.xml
+++ b/dom/mdsal-dom-inmemory-datastore/pom.xml
@@ -21,11 +21,15 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-common-api</artifactId>
@@ -79,6 +83,7 @@
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>
             <classifier>annotations</classifier>
+            <optional>true</optional>
         </dependency>
 
         <!-- Test Dependencies -->

diff --git a/dom/mdsal-dom-schema-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml
index 05704197bb925cd49283982b09d7eb8f3c65a4d5..e0756287b97320b18cab9800349a21396d0a7547 100644 (file)
--- a/dom/mdsal-dom-schema-osgi/pom.xml
+++ b/dom/mdsal-dom-schema-osgi/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-spi</artifactId>

diff --git a/dom/mdsal-dom-spi/pom.xml b/dom/mdsal-dom-spi/pom.xml
index c9aa935a0ded2ca37c9aa6bfeefe5d7ad4c4d46f..d12205b67597fb03be6b4d6e4a120bbc3dfb1dfe 100644 (file)
--- a/dom/mdsal-dom-spi/pom.xml
+++ b/dom/mdsal-dom-spi/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-api</artifactId>

diff --git a/dom/pom.xml b/dom/pom.xml
index b77327e19fd975f6b3d2c5b4f130af09a97f64fc..383c96d86bfc6e55aa80c2b6f4b4493149784144 100644 (file)
--- a/dom/pom.xml
+++ b/dom/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/entityownership/mdsal-eos-binding-adapter/pom.xml b/entityownership/mdsal-eos-binding-adapter/pom.xml
index dc065fef5a32e9810339c9561431926db204d9bb..fee9b279150776a9c2bfcbcd50d221251c6c5cf9 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/pom.xml
+++ b/entityownership/mdsal-eos-binding-adapter/pom.xml
@@ -19,6 +19,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/entityownership/mdsal-eos-dom-simple/pom.xml b/entityownership/mdsal-eos-dom-simple/pom.xml
index fe2eae57f9b306a60e1689dd3244ef7162051681..305f4a8030272bb87f9f146c2788ec8fcae94aad 100644 (file)
--- a/entityownership/mdsal-eos-dom-simple/pom.xml
+++ b/entityownership/mdsal-eos-dom-simple/pom.xml
@@ -19,6 +19,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/entityownership/pom.xml b/entityownership/pom.xml
index 5b125aed560d997edb0c0493f8bcc44453436d7f..cba2ca450e705545ab94f0f172b652bcd8ced724 100644 (file)
--- a/entityownership/pom.xml
+++ b/entityownership/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml
index 7831d59744de78e6d2415652c8a5b30c7e420a1f..6d046f60012bc0dae7beff73b76eb8daeef3e90b 100644 (file)
--- a/features/feature-parent/pom.xml
+++ b/features/feature-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-mdsal-experimental/pom.xml b/features/features-mdsal-experimental/pom.xml
index fd368db81a527cc078d46ca4b6ea0ccbc458e50b..70be74c17e7fe0899d258393cb5e398029e3edc0 100644 (file)
--- a/features/features-mdsal-experimental/pom.xml
+++ b/features/features-mdsal-experimental/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml
index 4987c2a7741d311d2bbd2c85e71665c65083a34d..ac79a0087a1f7ff9b24e65e9b799a373f36a4975 100644 (file)
--- a/features/features-mdsal/pom.xml
+++ b/features/features-mdsal/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml
index f0241cb04c6be86ef819fa8feaa2ef88327d42f5..8819e78312b0ab4843765b61cfc46efb2fe7f37f 100644 (file)
--- a/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml
+++ b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml
@@ -3,7 +3,7 @@
     <feature name="odl-mdsal-replicate-netty" version="${project.version}">
         <configfile finalname="etc/org.opendaylight.mdsal.replicate.netty.sink.cfg">mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/sink</configfile>
         <configfile finalname="etc/org.opendaylight.mdsal.replicate.netty.source.cfg">mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/source</configfile>
-        <feature version="[11,12)">odl-netty-4</feature>
+        <feature version="[12,14)">odl-netty-4</feature>
         <feature version="[11,12)">odl-yangtools-codec</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 587ede951eb60d42a9b64cb625b53ad9f97894b5..9f1d04561dc8bcff0e0c888526af45015821ea34 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 6fa2da0b4ae110771ccac886862d0e877c12f248..537effd266a806d3c0a1afdb1c071f507a994747 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>12.0.6</version>
+    <version>13.0.0</version>
     <relativePath/>
 </parent>
 

diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index f70aa5ad08272bd48488a2221c257ad5133191a2..19c05a80783a1a0b2d010400f2abe854ddcf712e 100644 (file)
--- a/model/iana/pom.xml
+++ b/model/iana/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/ietf/ietf-type-util/pom.xml b/model/ietf/ietf-type-util/pom.xml
index 47b750d02e424486168428c32348c33d1043e16f..185e581412b1a01a3cd8eff865e7d6cb822a29b5 100644 (file)
--- a/model/ietf/ietf-type-util/pom.xml
+++ b/model/ietf/ietf-type-util/pom.xml
@@ -25,6 +25,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/model/ietf/ietf-type-util/src/main/java/module-info.java b/model/ietf/ietf-type-util/src/main/java/module-info.java
index 20ae0d45a377a4d2285acc32344f8037879fd55a..01c578c5a2089e20db7601b5269e3e58fc2238ec 100644 (file)
--- a/model/ietf/ietf-type-util/src/main/java/module-info.java
+++ b/model/ietf/ietf-type-util/src/main/java/module-info.java
@@ -11,5 +11,5 @@ module org.opendaylight.mdsal.model.ietf.type.util {
     requires com.google.common;
 
     // Annotations
-    requires static org.eclipse.jdt.annotation;
+    requires static transitive org.eclipse.jdt.annotation;
 }

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index 6bb643d640e17ff1c93614628480cd5e4fb1bd93..7640ceb20c8636ef5566a0b5776b89a88316fe4b 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index 04ea617ce836d47eb429e2069f21dabfa736525b..deb657d22d9b848a5984077af5f799f51fc62463 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/netty/pom.xml b/netty/pom.xml
index 7df3b29ebf6ea4457e486d20d0c185b7b4767a9c..ac4607540985dfddc3b2d92cf2af6911dfe24f85 100644 (file)
--- a/netty/pom.xml
+++ b/netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index bbbe324be35242ee4d20815e274661d8576f04b6..31d87446c11c12261173f4ba522aa810da94961b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/replicate/pom.xml b/replicate/pom.xml
index 78d37e25f2bf581d8390ebbe0d93f704ad7d6dbc..f570943ecbea708c7ed61afdd3fe7de63d4ea15d 100644 (file)
--- a/replicate/pom.xml
+++ b/replicate/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/singleton-service/mdsal-singleton-dom-impl/pom.xml b/singleton-service/mdsal-singleton-dom-impl/pom.xml
index 7086658aa50af5d13758e6f2de8449ffbeea074d..6068436c2c537e4eea1c9a1f9e029a44355aa518 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/pom.xml
+++ b/singleton-service/mdsal-singleton-dom-impl/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -27,7 +32,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml
index 246c567810dce7b58829bb52fdf794c1f5c79e34..0fc723c19f3b7be529b9bc81fc918c16ef2f138d 100644 (file)
--- a/singleton-service/pom.xml
+++ b/singleton-service/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/trace/mdsal-trace-impl/pom.xml b/trace/mdsal-trace-impl/pom.xml
index a6920203db9a7d2ae552c5b23d679d8dcf112358..9a3389bbb0a5ce6d9a72796838d8e5ceaed8df5e 100644 (file)
--- a/trace/mdsal-trace-impl/pom.xml
+++ b/trace/mdsal-trace-impl/pom.xml
@@ -20,6 +20,11 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-trace-api</artifactId>

diff --git a/trace/pom.xml b/trace/pom.xml
index b4764f98470bfb3a5d5c1cfa47831ba23e7c1b9f..f082423a36deb856137163c4233a04159b971b01 100644 (file)
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/yanglib/pom.xml b/yanglib/pom.xml
index 3ebb8ca89d00db80ca11afbc0fdeca0cf89adb47..ec8ec3460f4b418a522bc3d70c4ad69c5b0a57e6 100644 (file)
--- a/yanglib/pom.xml
+++ b/yanglib/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.0</version>
         <relativePath/>
     </parent>