Bump upstream versions

Adopt:
- odlparent-9.0.14
- infrautils-2.0.14
- yangtools-7.0.16
- mdsal-8.0.14
- controller-4.0.11
- aaa-0.14.12

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 1cd735f666e040ac190f9e4ea5542c9b49629a36..151370e231dfdd55cae99e6552db78f26ccaba47 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>9.0.13</version>
+      <version>9.0.14</version>
       <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index 5de0027f34a6a9618f9041fba41a6edee52120bf..0c44645cb237999809eaa1b0339a19b1fde0e6b8 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index e55970a377787c944fb00b3a07e02dfc2858a38d..7a57ea1dc462c76b71d7024a6744ee781577a5fb 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
index 2b6bd6f1093dad52663179e635aba7029a23aa6b..347e2697fe864282c8d909bd48adeb0c392b3a81 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>9.0.13</version>
+      <version>9.0.14</version>
       <relativePath/>
   </parent>
 

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index 4bd01d89aa54f07457274cc2ea288dc1c3159e76..b80d5dedc6c23a558ffeaf923656839d7152d317 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 6f9bab14a5909746bc4cc3881c498441040b31c2..e2ee01316c05c21405d18fdfa3d7f22b1e5b58b9 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index 9bd8e1b9f60d202be2a76b084ff9f60541d2a53b..14316a8246ca221ec2b41bef99a27bdfc9e91bda 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 2f33b3c68668dd06421157a7e604b22bc12733dc..2f30c2f7bdc863442a350e4a88d628e617ad9bb8 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index 680f2a31f6263fe018d8bec95a6b74cb16aad3cf..52841e0bdc0548844dfe3d3ca551fd229394c6e2 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml
index 686a991190fdbfb9c346d8ee344ae83d9ffc77b8..5e2a87f5533cb7b659a7f2298a6ff5cb23a3f37d 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 9b85a26f6f8c832a39d999f0d5fc02ffda75fb95..1fb7033d45900c7f24ee114f87153a8631705c7f 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="[9,10)">odl-jackson-2.12</feature>
+        <feature version="[9,10)">odl-jackson-2.13</feature>
     </feature>
 </features>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 9227a7e923b37a0a0519b8af07679f7ed498c72c..73d8d0616d5888bd129841606952f3fa2bd627ed 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index f3e49d99ea2b716a2e5e0216d0676e5143d0b070..76165ebf41802100de9b1c93e3286899b1298fe2 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index cb73e4784a38772406b96e13e92951a5c3702f12..1daa2f58c52c0bd1a16ba4553e375dd4053c13e5 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml
index ea6130f3c1dd50038e7dd38d2ae7a0053f76d63f..2e4d653f43c0522ed90753c47219f2691e1cab29 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index dc3b8ee8b71f2be896788cce5a3b9bad7ff5cbaf..5e699fdd2cc9807459dd4b605e3bbee79fde62a7 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
@@ -24,7 +24,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>4.0.10</version>
+        <version>4.0.11</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -40,7 +40,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>2.0.13</version>
+        <version>2.0.14</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index 1c72a770f706e707f2f8c0c18c394354ffbc191d..3a1b2318d25290eb77a5cf8eb4650461118a6703 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index 749b38edd6db4c69fac4ffa9f7b60ea4c06d6727..68dd9546284d47c4cf3a2d73d3f3010364da51b4 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/pom.xml b/netconf/pom.xml
index ffc92eb5ec5af29a85e985dadb34089a4f9672b0..99a24ef1a2556712b6b69f2fc33ae48d2ee08534 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml
index 8a18c5714768face2fb2ced13cf38b3c927f2fc8..8454cb089cd9c92117accbb9dea0e27af1e992fc 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml
index 0656b55c08061182db067b1f1da7d79e30bb8315..30f1843d68687890f6015a81242bdcdb521de8f8 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml
index 7a1722e1b9c943f594f871b03dc19bdb7d8c936a..c2f5c1c6ffd60e78562868e6340c4e6f340d013c 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml
index 6f5fdca73ca08de972c8432df59edeb5e60cc8fa..0b5842feffdb527c7f11097bbcbb13846bbc3a6c 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 51e4cf0c8f293b6415b39dbcb668ec80fb535880..67d4d067c734b31699c0ecddef5a13600988d3e9 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 166f04c9a09d6fc3c977a8b0a892e2e9f5e2651e..f03babae04c8b8f42d5d9eae30649d4194eaa05f 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index 5c8846b2141b39d7703e75a1c5b878e28bb826b3..eafe5a714699267aeb1c105a7e3d0c20708b1f25 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>8.0.11</version>
+    <version>8.0.14</version>
     <relativePath/>
   </parent>
 
@@ -25,21 +25,21 @@
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.14.10</version>
+        <version>0.14.12</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>4.0.10</version>
+        <version>4.0.11</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>2.0.13</version>
+        <version>2.0.14</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/pom.xml b/pom.xml
index 09f139b3502f96aa98bd89282d07d48024a0986e..1afcabfd6391115f70426f28b7c6a9eb4557eff9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 673c0f84b9c94df5dcd3d0316be6d80a50833c0c..237c449ac88e434e459a47c1bbb42a68bd1afd8a 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>9.0.13</version>
+        <version>9.0.14</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml
index b25bd764680e93ef9014fd1f9d55a385b41b8e03..1f57da20b0484809ebeaa77fbe25c51f75dc8232 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>
 

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java
index 8d9217693435db71c3e2a2cdcfb6e7f8ebde37ce..d7f0a79357079620760da488f30b4ff19151f0ed 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java
@@ -15,7 +15,6 @@ import static org.mockito.Mockito.when;
 
 import java.text.ParseException;
 import java.util.List;
-import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.junit.Before;
 import org.junit.Test;
@@ -157,8 +156,7 @@ public abstract class AbstractFieldsTranslatorTest<T> {
         when(containerJukebox.dataChildByName(LIBRARY_Q_NAME)).thenReturn(containerLibrary);
 
         when(augmentedContainerLibrary.getQName()).thenReturn(AUGMENTED_LIBRARY_Q_NAME);
-        when(containerJukebox.dataChildByName(AUGMENTED_LIBRARY_Q_NAME))
-                .thenReturn(augmentedContainerLibrary);
+        when(containerJukebox.dataChildByName(AUGMENTED_LIBRARY_Q_NAME)).thenReturn(augmentedContainerLibrary);
 
         when(containerPlayer.getQName()).thenReturn(PLAYER_Q_NAME);
         when(containerJukebox.dataChildByName(PLAYER_Q_NAME)).thenReturn(containerPlayer);
@@ -172,10 +170,9 @@ public abstract class AbstractFieldsTranslatorTest<T> {
         when(leafSpeed.getQName()).thenReturn(SPEED_Q_NAME);
         when(leafSpeed.isAugmenting()).thenReturn(true);
         when(containerPlayer.dataChildByName(SPEED_Q_NAME)).thenReturn(leafSpeed);
-        when(containerPlayer.getDataChildByName(SPEED_Q_NAME)).thenReturn(leafSpeed);
         doReturn(List.of(leafSpeed)).when(speedAugmentation).getChildNodes();
         doReturn(List.of(speedAugmentation)).when(containerPlayer).getAvailableAugmentations();
-        when(speedAugmentation.findDataChildByName(SPEED_Q_NAME)).thenReturn(Optional.of(leafSpeed));
+        when(speedAugmentation.dataChildByName(SPEED_Q_NAME)).thenReturn(leafSpeed);
     }
 
     private void initTestServicesSchemaNodes(final EffectiveModelContext schemaContext) {

diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index ddbc879ae127d28f1cd9a79b2cf6eef652e0dfc3..47c4712ba6a8227c685cd29b786a5eb17273ac9c 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>9.0.13</version>
+    <version>9.0.14</version>
     <relativePath/>
   </parent>