Bump upstream versions

Adopt:
- odlparent-10.0.2
- infrautils-3.0.1
- yangtools-8.0.5
- mdsal-9.0.3
- controller-5.0.5
- aaa-0.15.4

Change-Id: I9d78b5a9538801854910a0621a9ebab60fac0414
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 8030cefc9a73619d4a06ff0e5251b3817650cba1)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index a98b70ff7b1c6789c32db2a92cd50529e80aadd2..579479d0b9213ac8c907f9eeae51a6b08fc0dfd2 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>10.0.0</version>
+      <version>10.0.2</version>
       <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index 8aebcb29feb4ad7e5c71913d56ae8919e6941be1..b53e335e827e36d41d38b3b0f99090aebff81240 100644 (file)
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index dd317b154a2de97514ecd7d02cfa761c596bfb02..578dcdfa6eb4548807927df23b4a60c389b8b00d 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
index ac5a12c19c97e860fd4ec851681e68b2a5477eb7..1e578fd7de5f1e1522bafc54c2093a8835157bb6 100644 (file)
--- a/features/netconf/features-netconf-testing/pom.xml
+++ b/features/netconf/features-netconf-testing/pom.xml
@@ -12,7 +12,7 @@
   <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>feature-repo-parent</artifactId>
-      <version>10.0.0</version>
+      <version>10.0.2</version>
       <relativePath/>
   </parent>
 

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index a4a6eccdb64754d09217266c1d6454d2994993b6..afe5dac501ca0249520f4935c914548696c615fa 100644 (file)
--- a/features/netconf/features-netconf/pom.xml
+++ b/features/netconf/features-netconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 72438e1dc5909999c86800908d492ed6dfd76cfe..80bcb12bc0b89c84c0804b3310fd654dd3789d8b 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index 212864108aedb2e7eae895241af3094271eaf985..391b70663d1b0d2c1879174f42a8233515c5eab9 100644 (file)
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 00b133f6fb14e488b9153c49ebf6e08a172ab6dc..c187a773485aeff88eb0c27dd41bdcfddcfc079f 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index 76df5d30c28e90750687d22d9f8ff5cb4f43d0fe..f00e3f7304c2efd86328d432a83ab37dd5bdcf1a 100644 (file)
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml
index 0ce9f6433ec7b2a5c1b4cc4b4cc95c301738a52b..c3dba71247e4f6d79c8b6fca5cecddedab070d04 100644 (file)
--- a/features/restconf/odl-mdsal-apidocs/pom.xml
+++ b/features/restconf/odl-mdsal-apidocs/pom.xml
@@ -23,7 +23,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-jackson-2.12</artifactId>
+            <artifactId>odl-jackson-2.13</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml b/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
index 01c4bfa6ab8fe9e8ed343f8ca5c86cefc12f1773..8ecc61262b2e6125af3c4c05d004a1714e8c045d 100644 (file)
--- a/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
+++ b/features/restconf/odl-mdsal-apidocs/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-mdsal-apidocs" version="${project.version}">
-        <feature version="[10,11)">odl-jackson-2.12</feature>
+        <feature version="[10,11)">odl-jackson-2.13</feature>
     </feature>
 </features>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index fb8ce05285d83b24083be884e611b37025b48e21..64eba9444f4ee12009253237d15f9daf7a90b07f 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index f0226e7174f10cf22f25aed50f70cc2713b2c7c6..aa7b33ffee612906de385a11e421cf0dfede13f9 100644 (file)
--- a/features/yanglib/features-yanglib/pom.xml
+++ b/features/yanglib/features-yanglib/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index c95fd71eff670dd443e13185736b04ee7559c851..0fec13b615c70f6b2d8b0008058f6d3e1f47f9d6 100644 (file)
--- a/features/yanglib/pom.xml
+++ b/features/yanglib/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml
index 18025de5fc74d7b3ed167b85a958ff6f7945d28f..1e10f203a8180f2a1953d8add0ba41d44f25a5a7 100644 (file)
--- a/karaf-static/pom.xml
+++ b/karaf-static/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf-dist-static</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 7ac10ab352248cd9a0adea63d4abd002006b9cf3..aa62a6c37defea5a87e5b2a4ebd5877e5257fb21 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>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
@@ -24,7 +24,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>5.0.3</version>
+        <version>5.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -40,7 +40,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index e0480a8a8418ef5328162101c7ddd28fd538c648..417c7d535ff3a05f114295d42c27a5e326f53f98 100644 (file)
--- a/netconf/models/pom.xml
+++ b/netconf/models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index e2eea1b6fcacc90f0c0adcc9916b4db41ab568b8..6a7b8e6b641d5243dd52aaf8774ad64d9d0b7790 100644 (file)
--- a/netconf/netconf-config/pom.xml
+++ b/netconf/netconf-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/pom.xml b/netconf/pom.xml
index fb37603c94ff5524ba729c87f8242209d0173dfa..c5ee48fd1f4f770d423cdf524da3f8fff53e3693 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml
index 50c61e4d67a12131df1a5a61c4ecf3898822b99b..c1bd09aca07aab116ac0aaadfc080df45a56d5a3 100644 (file)
--- a/netconf/shaded-exificient-jar/pom.xml
+++ b/netconf/shaded-exificient-jar/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml
index 3937f5dbcb5c6bfc20b58031c9d72e6034a11c6a..248cbb197ae1c286bbdba801e1242da3670c1e01 100644 (file)
--- a/netconf/shaded-exificient/pom.xml
+++ b/netconf/shaded-exificient/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml
index e9087aafc6b95b233c45e73e8775e26ef210ba5e..598b908d9248a90887674e473f604743f7565c07 100644 (file)
--- a/netconf/shaded-sshd-jar/pom.xml
+++ b/netconf/shaded-sshd-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml
index 413e2721bc3a86176aa014ca0d2b29a89dba9034..f7233cab0052d22ebf2ecab9d7f7ec98dd556927 100644 (file)
--- a/netconf/shaded-sshd/pom.xml
+++ b/netconf/shaded-sshd/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 836e9685862b528d7f082b79e1d3663554d118bc..a6e455a997a86dbaf17e297b23a98fdf880849aa 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -44,11 +44,11 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -157,17 +157,17 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcpkix-jdk15on</artifactId>
+                                    <artifactId>bcpkix-jdk18on</artifactId>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                     <overWrite>true</overWrite>
-                                    <destFileName>bcpkix-jdk15on.jar</destFileName>
+                                    <destFileName>bcpkix-jdk18on.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcprov-jdk15on</artifactId>
+                                    <artifactId>bcprov-jdk18on</artifactId>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                     <overWrite>true</overWrite>
-                                    <destFileName>bcprov-jdk15on.jar</destFileName>
+                                    <destFileName>bcprov-jdk18on.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -243,7 +243,7 @@
                                           implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                       <manifestEntries>
                                           <Main-Class>org.opendaylight.netconf.test.tool.client.stress.StressClient</Main-Class>
-                                          <Class-Path>. lib lib/bcprov-jdk15on.jar lib/bcpkix-jdk15on.jar</Class-Path>
+                                          <Class-Path>. lib lib/bcprov-jdk18on.jar lib/bcpkix-jdk18on.jar</Class-Path>
                                       </manifestEntries>
                                   </transformer>
                               </transformers>
@@ -318,7 +318,7 @@
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <Main-Class>org.opendaylight.netconf.test.tool.ScaleUtil</Main-Class>
-                                        <Class-Path>. lib lib/bcprov-jdk15on.jar lib/bcpkix-jdk15on.jar</Class-Path>
+                                        <Class-Path>. lib lib/bcprov-jdk18on.jar lib/bcpkix-jdk18on.jar</Class-Path>
                                     </manifestEntries>
                                 </transformer>
                             </transformers>

diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index 6024f24b1684af66b12c558b03bb38a1f63e4b4f..c4fcb17757a1a54d110447183934134244070d93 100644 (file)
--- a/netconf/tools/pom.xml
+++ b/netconf/tools/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index d3803049d1a14c05705b0de977618462469faf85..014c08a462ad849810a14e144245bd15725b6fa3 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>9.0.2</version>
+    <version>9.0.3</version>
     <relativePath/>
   </parent>
 
@@ -25,21 +25,21 @@
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.15.3</version>
+        <version>0.15.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>5.0.3</version>
+        <version>5.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/pom.xml b/pom.xml
index 42c6e3b466f007218e5867b4b8fac8a8598bc041..e75425c37c03b712385715689fe6f8bfb9ce0f62 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 523d6e27e155def32ef6bed54cd97264fe90d5a3..7cfdc455c9bc9dd5609625cf3b110947c078ec86 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>10.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml
index a20d8f675a35f21c026d3f4a173e90548642dcfc..e1e806c925b13c6bca961415bc86031cb5e90c05 100644 (file)
--- a/restconf/restconf-models/pom.xml
+++ b/restconf/restconf-models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index d582fc36b80420b94f5ded3153d2da01bfd80680..2d4e67d3e887253d09b1ab854861e2e3e4742879 100644 (file)
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -190,6 +190,11 @@
       <artifactId>threadpool-config-impl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-assertj</artifactId>

diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index cafcb034fe2e900f1027ed2ddcc47ca539031f57..4b671975aba755f5f4f5db0623a2af606a42b290 100644 (file)
--- a/restconf/sal-rest-connector-config/pom.xml
+++ b/restconf/sal-rest-connector-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>10.0.2</version>
     <relativePath/>
   </parent>