From 2784365c641276937882da90529f25691868690d Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Wed, 7 Aug 2019 15:41:32 +0200
Subject: [PATCH] Bump to Sodium

- odlparent to 5.0.1
- mdsal to 4.0.4
- yangtools to 3.0.4
- controller to 1.10.0-SNAPSHOT
- netconf to 1.7.0-SNAPSHOT
- restconf to 1.10.0-SNAPSHOT

https://wiki.opendaylight.org/view/Sodium_platform_upgrade
- JSR305 explicitly added in poms to use javax.annotation.Nullable

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id167a8770bc33c4782bdc20c69e4f56d3770e0e6
---
 api/pom.xml                                  |  2 +-
 artifacts/pom.xml                            |  2 +-
 common/pom.xml                               | 13 ++++++++++---
 features/features-transportpce/pom.xml       |  2 +-
 features/odl-transportpce-api/pom.xml        |  4 ++--
 features/odl-transportpce-ordmodels/pom.xml  | 10 +++++-----
 features/odl-transportpce-stubmodels/pom.xml |  2 +-
 features/odl-transportpce/pom.xml            | 10 +++++-----
 features/pom.xml                             |  2 +-
 karaf/pom.xml                                |  2 +-
 networkmodel/pom.xml                         | 12 ++++++++++--
 olm/pom.xml                                  | 13 ++++++++++---
 ordmodels/common/pom.xml                     |  2 +-
 ordmodels/device/pom.xml                     |  4 ++--
 ordmodels/network/pom.xml                    |  2 +-
 ordmodels/pom.xml                            |  4 ++--
 ordmodels/service/pom.xml                    |  2 +-
 pce/pom.xml                                  | 11 +++++++++--
 pom.xml                                      |  2 +-
 renderer/pom.xml                             | 14 +++++++++++---
 servicehandler/pom.xml                       |  4 ++--
 test-common/pom.xml                          | 14 +++++++++++---
 22 files changed, 89 insertions(+), 44 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 2c824c5b7..c1bcc18c3 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 175d279d7..6f1acdcb2 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/common/pom.xml b/common/pom.xml
index 43ad4ef5a..462bb238d 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>3.0.10</version>
+        <version>4.0.4</version>
         <relativePath />
     </parent>
 
@@ -24,14 +24,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.9.2-SNAPSHOT</version>
+                <version>1.10.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
-                <version>1.6.2-SNAPSHOT</version>
+                <version>1.7.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -102,6 +102,13 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Sodium bump: javax.annotation.Nullable and friends -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 <!-- skipping test since this is a util project / folder -->
diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml
index a0c3c2d45..f503ab7ac 100644
--- a/features/features-transportpce/pom.xml
+++ b/features/features-transportpce/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index 33d9bd812..1d51e7306 100644
--- a/features/odl-transportpce-api/pom.xml
+++ b/features/odl-transportpce-api/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <netconf.version>1.6.2-SNAPSHOT</netconf.version>
+    <netconf.version>1.7.0-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index c9be6d4a3..52c630571 100644
--- a/features/odl-transportpce-ordmodels/pom.xml
+++ b/features/odl-transportpce-ordmodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
@@ -22,10 +22,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>feature</packaging>
 
   <properties>
-    <mdsal.version>1.9.2-SNAPSHOT</mdsal.version>
-    <restconf.version>1.9.2-SNAPSHOT</restconf.version>
-    <yangtools.version>2.1.11</yangtools.version>
-    <netconf.version>1.6.2-SNAPSHOT</netconf.version>
+    <mdsal.version>1.10.0-SNAPSHOT</mdsal.version>
+    <restconf.version>1.10.0-SNAPSHOT</restconf.version>
+    <yangtools.version>3.0.4</yangtools.version>
+    <netconf.version>1.7.0-SNAPSHOT</netconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml
index 37e7c8a83..6b330339e 100644
--- a/features/odl-transportpce-stubmodels/pom.xml
+++ b/features/odl-transportpce-stubmodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 3be5b45d3..370328fae 100644
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
@@ -24,10 +24,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <properties>
     <mdsal.model.version>0.13.2</mdsal.model.version>
-    <mdsal.version>1.9.2-SNAPSHOT</mdsal.version>
-    <yangtools.version>2.1.11</yangtools.version>
-    <netconf.version>1.6.2-SNAPSHOT</netconf.version>
-    <restconf.version>1.9.2-SNAPSHOT</restconf.version>
+    <mdsal.version>1.10.0-SNAPSHOT</mdsal.version>
+    <yangtools.version>3.0.4</yangtools.version>
+    <netconf.version>1.7.0-SNAPSHOT</netconf.version>
+    <restconf.version>1.10.0-SNAPSHOT</restconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
diff --git a/features/pom.xml b/features/pom.xml
index 93e79c051..32967e785 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index c17daf928..038f5856e 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index a0b84f6a3..5ed928310 100644
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -72,5 +72,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- Sodium bump: javax.annotation.Nullable and friends -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <optional>true</optional>
+    </dependency>
+
   </dependencies>
 </project>
diff --git a/olm/pom.xml b/olm/pom.xml
index 8724d3805..5dde38ab8 100644
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
@@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -83,6 +83,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <!-- Sodium bump: javax.annotation.Nullable and friends -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index d4932a013..72ba57d05 100644
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 9068ee09f..0e74824a4 100644
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index c40790a86..c7a3b0dfb 100644
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index 5cb4e51c1..d76ee118d 100644
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
@@ -82,7 +82,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index d00589f63..ae05a6a28 100644
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/pce/pom.xml b/pce/pom.xml
index 4bdffc318..b410cf96c 100644
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -17,7 +17,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
@@ -87,13 +87,20 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
-      <version>1.9.2-SNAPSHOT</version>
+      <version>1.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-binding-dom-codec</artifactId>
     </dependency>
+
+    <!-- Sodium bump: javax.annotation.Nullable and friends -->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <repositories>
diff --git a/pom.xml b/pom.xml
index 744f3eff2..a8a447f99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>4.0.11</version>
+    <version>5.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/renderer/pom.xml b/renderer/pom.xml
index 5395d911a..2e6847e62 100644
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
@@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.6.2-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -84,6 +84,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>2.19.0</version>
       <scope>test</scope>
     </dependency>
+
+    <!-- Sodium bump: javax.annotation.Nullable and friends -->
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <optional>true</optional>
+    </dependency>
+
   </dependencies>
 
 </project>
diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index 760b5756d..b839da5af 100644
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.10</version>
+    <version>4.0.4</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.9.2-SNAPSHOT</version>
+        <version>1.10.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/test-common/pom.xml b/test-common/pom.xml
index e07fca661..7196ec6e7 100644
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>4.0.11</version>
+        <version>5.0.1</version>
         <relativePath/>
     </parent>
 
@@ -25,14 +25,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.9.2-SNAPSHOT</version>
+                <version>1.10.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.1.11</version>
+                <version>3.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -75,5 +75,13 @@
             <artifactId>transportpce-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- Sodium bump: javax.annotation.Nullable and friends -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <optional>true</optional>
+        </dependency>
+
     </dependencies>
 </project>
-- 
2.36.6