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>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 2cf87d5b91645cb51cecd40d632876bc4ea0082c..e2725ce3b70e5bcd7bc3261039e8b710466bc72d 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 31074a072d3a36837b15d3936946124818db1a71..8bcf1516a8987bf940d183653d1ba0a01a3e65f3 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 08051991ecb8c655e2dd090a12789f8f7a87c97f..62a5e5e0d2622976fcda4a30c7c5ea462a9e6675 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 7682d6202e36bf3e404d82b0232f7a8f81254109..77f9a90ef1fb52803b6c365d51153fbe76e3a5a8 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 1cc43a93caa9f66530240fd64fa02b63e04131cf..8744af45ef539675878b504d81001f62191551f6 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 935b103b4b4a76e33e6cfb39f64a0ef80f3e8ac0..d07e095057ae0e6c6073b9b7ead4e941bf178c1b 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 2d13012dd9768c2a0cb3b0bf31d899a593406fe8..905f7451f9a2335e5f7f68a2011b62402c09728f 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 6c0eb860b9ac6f97979976c6f824b9e042cc1dd9..ef805915c095fd3c5462edb4f4d5abf51e62660b 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 702097d4596cd678941aedb3bb6678fdcc5a79c8..23869115739d2fb9f035d82512ba4bef0704365c 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 90b2f78d081a50c693d3a5314ae769109d14e3cd..b3a01ecf9cac5306382c5107329e777491c38af2 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 3e693424e3ff2aa5bc8066909682d94c1dde279b..2db35258fa67bfef2c9bd4859774d0dcebc91f0d 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 6a586e6f64ca8729637dc65914fa1873a7ddae19..275e2e5366a4daddbc787e9eaa2a31a7d0a1d8cd 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 7b6ecb457c12dcde69bf5c8c96e417ffb2a47be5..9b62753272f2c484a48dbc83e76c326d4e1acd47 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 fe528e146db84abee8b66fc251b3d70aed416c04..eb76604a0f9c2d388a233e1e8d3db657fbf10052 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 830b276e64b6607b3424813dfeb3baadccc425c4..ce1591e9371aaae4ce02b790c30a9d5ff951304c 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 a3cbe39f93e0d9d46055c4bcaad114cd686bbe3d..f2da48f038595813c92200684409c5577f98205d 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 3dbc8f087e1ba07a066558d344171f9388658d83..5c3f0dc089f6d7d28c8e7f5f27548878de0f738f 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 e205e8a14f267d906b403f9447171ecd8798e21e..70214f56a9a0546e3f6567231caf5edbf5e7dd1e 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 eb4bc07aa40e9e72bd8a369431955a6e5a9a4349..7a40967d2a74ed275dce2972481fe756d36a1bc6 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 2b7b9401beb022c9fd799085aef2ba81cd38b30e..5a5b3aaf6f7bb5d2a625eb7f66ec9812043136ad 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 b8215a31d6c222c7bbd6d32e644655868bb3e7f4..737ccb3ff83884fb715b756d10c924badd1c60d9 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 d2847a1a0e9ef2b7393089557f9ae4845da83678..6e5e662503de80ebd30d79cef012446ad6bab26b 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 92d1a73f1e942dee94bd768d50fb944b83f42170..9bed7951422c9a1fac89d10fd56b11c344345eab 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 cfc31327e1fd1f481ec38df3625bcceeafc09734..554311557ada71a7af5324e451f8c8cc13a2f453 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 ae366bfb23ba26b48e0b7255b8edd1aa34caed08..3b41141b44e48c51a575796cad008b46d7ad5dde 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 d1dad734fa02df84750ab256c7c7a5bd93a24c55..c7dc80f937e8ad797c0ff3a8935fe6cd51846292 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 090fc9cb695606afc0d9ddf631a448b2802fc181..dc2d1cdb51675980cdb9becf79edebd3682f6ad3 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 f932c30782c87757d05a0c346728745611ff3ed3..7bd5ccf5d80f8102b2db4f6e31a8da09ebf89d2f 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 73f66d6436a67d1c5bc9b60e03490d31e5970a56..ee1ebf2a992369fc94ce6367628cd9225c2f5834 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 e31ca4192b25ab679e29babb736452abeba595dd..77d3e065ba7ca4b4a4b67f6aa859abb29c5b682d 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>