Bump MRI upstreams

Adopt:
- odlparent-9.0.7
- yangtools-7.0.9
- mdsal-8.0.6
- controller-4.0.4
- infrautils-2.0.7
- aaa-0.14.4

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 085a8535efb0598bdaf49014cfb30c16bd0ed68e..e55a504d8ad2477bcced127b2166bf3868e5bdb4 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.6</version>
+      <version>9.0.7</version>
       <relativePath/>
     </parent>
 

diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index b18a183ec47263bc29b379f8a96a3a32d5d1c5e8..ee640e0118b2ce2bf360ba1cd1fa1da25deea1c7 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 66d774811a05728813c9e8d15423f242ac8837ff..0e25aee422f85d97949da26be88e834d7b0f7794 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml
index 6c591fbf7e95fa588c5e641f32d85bb6d19b6c6a..a9e878d77dcf4c93a97f89875f16fa3aee32e863 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.6</version>
+      <version>9.0.7</version>
       <relativePath/>
   </parent>
 

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index 370d1b3718789fb5162f4c38823a18e9748818fe..7ed01f678981765b5a7fa4ad3276e89efe44719c 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 5ea3a7838859d5d59d245e351d5492eb992ca4a5..2aae6eef56870733f0c0b7a84670db0c8626fd32 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index 61d2f12cfc5fa0f26dc5568a2ddf7856c6b7fccf..48de63d8e532d8bd9bf3fa3035c9132dc2c41e2b 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 4b03267ad91746ca7613b01ad217a2a2156b1db2..7e03348894b950dc8d9fd1c3987b485f9c48d3f3 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index d6b4474fd24d143251671ae2724a0fc56522e402..ea86baeaf36262dad138ea3668bd597012d8176a 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index f317fcd7455d69f6ac54089e27aa5b88dea51f60..930afc07aee942fa2ffb40662d660aeb84d2633f 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index 769099b224bba3d718904ba033b904e0128e4f25..6e57e78694c070ce11f4bc9d98c2a8754d65b8b4 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index c7936b773dc262c6d346b5b56cf147f06c6c79eb..986a76693aac5012cbd09a78ac214c959fbcfd8e 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml
index f4598e145ef8dc60ee55bae4554e37c44b3f63e2..ac923d6ee04204f2596df5b987863dbcc05f2475 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index b11c08226d4b271d7d13d97c9b7d7eab59d92b11..d8f797a14722c8e9ab3eef2ec9b84779a97b511c 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.6</version>
+    <version>9.0.7</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.3</version>
+        <version>4.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>2.0.6</version>
+        <version>2.0.7</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index ace506e9867127f98234367ad9976ed010cb499e..516035c5ad074b07a01f1c614343355f76bfef75 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index a7a2455b94f375d191440f1367ccbadc87e05dd8..bb5fdb92a522631af049483a29f34920bde150eb 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/pom.xml b/netconf/pom.xml
index a90737ecb5dc0be3b304333e13fa4647aa2dd037..b48561b9adb59966930d43d0453e338d0cc89767 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml
index f40490dde49a60e1aa2fc9d5b3378b4f22a094bb..1fb6b7aef951620ae27f34c82972d256b3f01b2c 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml
index 99843218d110b8641149dbe8359374f86ac00d6b..24cbe92f85b04fb4b4624649b6aa2ce95439f6ee 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml
index f5ae1ed3b93c1c5e528dd7fec83d565370da1d1a..acaae72ba03cf5be4b5c20adcbf1b5369ca5571d 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml
index 57c732b4c3f7196bba049eed1f62b25724b9cafc..920a53005a9bd9e226fe016fbf052309c55c4be5 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index cf38d013ac45888c3f4b4def0da39061942e6f23..23ff60aec44d439b9fe5c5fa441e68031cc1d760 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index a478521e0d5dc63d7f8696122add725d8665d58e..3d2d8e3b1c72675ca0bd0a152960e1e1f95560b2 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.5</version>
+    <version>8.0.6</version>
     <relativePath/>
   </parent>
 
@@ -25,21 +25,21 @@
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.14.3</version>
+        <version>0.14.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>4.0.3</version>
+        <version>4.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>2.0.6</version>
+        <version>2.0.7</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/pom.xml b/pom.xml
index e50c5fad02b0ec64228115229703327fb936042e..46a4dca337cf65549f2fad65c0a211149b352c62 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 4deab342ae5344ff1acf67e72efa77cd3b05760f..4e53be40a1ad5b092bafbd655f587e3c9b012d37 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.6</version>
+        <version>9.0.7</version>
         <relativePath/>
     </parent>
 

diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml
index ab25fe57b56656b30cc5df8d96b4b0bcae8742db..1fc55db91e30e9f62c1c4f264c251616969380bb 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>
 

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
index b847a053da17241186e154d994fcb91dd121234c..ac0ee801db1b970d5fb365da0f50823b23913db0 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
@@ -54,7 +54,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
 
     public NnToXmlTest() {
         super(schemaContext, null);
-        this.xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
+        xmlBodyWriter = new NormalizedNodeXmlBodyWriter();
     }
 
     @BeforeClass
@@ -97,8 +97,8 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
             "<not-existing>value</not-existing>", "<lfLfrefNegative>value</lfLfrefnegative>"));
         final Throwable rootCause = Throwables.getRootCause(ex);
         assertThat(rootCause, instanceOf(IllegalArgumentException.class));
-        assertEquals("Data tree child (basic:module?revision=2013-12-02)not-existing not present",
-            rootCause.getMessage());
+        assertEquals("Data tree child (basic:module?revision=2013-12-02)not-existing not present in schema parent "
+            + "(basic:module?revision=2013-12-02)cont", rootCause.getMessage());
     }
 
     @Test
@@ -313,7 +313,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
     private void nnToXml(final NormalizedNodeContext normalizedNodeContext, final String... xmlRepresentation)
             throws Exception {
         final OutputStream output = new ByteArrayOutputStream();
-        this.xmlBodyWriter.writeTo(normalizedNodeContext, null, null, null, this.mediaType, null, output);
+        xmlBodyWriter.writeTo(normalizedNodeContext, null, null, null, mediaType, null, output);
 
         for (String element : xmlRepresentation) {
             assertTrue(output.toString().contains(element));

diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index db9f163f77ec1a389d5e459c121d4b9c707f5cf8..4bf3e47187ef30f187bb081dda85e59ff1edd92d 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.6</version>
+    <version>9.0.7</version>
     <relativePath/>
   </parent>