From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 9 May 2021 19:59:42 +0000 (+0200)
Subject: Integrate upstream MRI projects
X-Git-Tag: v0.14.0~13
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=5c93a7ce156d96f6268625b8d434621893dea1d4;p=aaa.git

Integrate upstream MRI projects

Adopt latest versions, namely;
- odlparent-9.0.1
- yangtools-7.0.1
- infrautils-2.0.1
- mdsal-8.0.0-SNAPSHOT
- controller-4.0.0-SNAPSHOT

This forms the baseline for our next major release.

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

diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index b71e4546d..68ffadbb6 100644
--- a/aaa-encrypt-service/pom.xml
+++ b/aaa-encrypt-service/pom.xml
@@ -10,7 +10,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>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/aaa-password-service/pom.xml b/aaa-password-service/pom.xml
index 0a1ca2162..b9174dc57 100644
--- a/aaa-password-service/pom.xml
+++ b/aaa-password-service/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-lite</artifactId>
-    <version>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index 307179211..5341809e9 100644
--- a/aaa-shiro/pom.xml
+++ b/aaa-shiro/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-lite</artifactId>
-    <version>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/aaa-shiro/repackaged-shiro-jar/pom.xml b/aaa-shiro/repackaged-shiro-jar/pom.xml
index ac1a29832..b8cc213d6 100644
--- a/aaa-shiro/repackaged-shiro-jar/pom.xml
+++ b/aaa-shiro/repackaged-shiro-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 4132deeb3..07db41141 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.1.2</version>
+      <version>9.0.1</version>
       <relativePath/>
     </parent>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index c75b79a13..221186ca7 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>inject.guice.testutils</artifactId>
-            <version>1.9.8</version>
+            <version>2.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -247,11 +247,11 @@
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.11/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.2/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/1.9.8/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.6/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.7/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/3.0.8/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/9.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/2.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/7.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/8.0.0-SNAPSHOT/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/4.0.0-SNAPSHOT/</link>
                     </links>
 
                     <!--groups>
diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index 4bfadf837..1ffbf1fb2 100644
--- a/features/features-aaa/pom.xml
+++ b/features/features-aaa/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index ac314893d..ba2aeadc5 100644
--- a/features/odl-aaa-api/pom.xml
+++ b/features/odl-aaa-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>7.0.7</version>
+            <version>8.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/odl-aaa-api/src/main/feature/feature.xml b/features/odl-aaa-api/src/main/feature/feature.xml
index a2776ae02..040577412 100644
--- a/features/odl-aaa-api/src/main/feature/feature.xml
+++ b/features/odl-aaa-api/src/main/feature/feature.xml
@@ -8,8 +8,8 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-api" version="${project.version}">
-        <feature version="[8.1,9)">odl-servlet-api</feature>
-        <feature version="[8.1,9)">odl-ws-rs-api</feature>
-        <feature version="[7,8)">odl-mdsal-binding-base</feature>
+        <feature version="[9,10)">odl-servlet-api</feature>
+        <feature version="[9,10)">odl-ws-rs-api</feature>
+        <feature version="[8,9)">odl-mdsal-binding-base</feature>
     </feature>
 </features>
diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index 0520c15ec..cf2600d24 100644
--- a/features/odl-aaa-cert/pom.xml
+++ b/features/odl-aaa-cert/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>3.0.8</version>
+            <version>4.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/odl-aaa-cert/src/main/feature/feature.xml b/features/odl-aaa-cert/src/main/feature/feature.xml
index 1d4bad692..890995d19 100644
--- a/features/odl-aaa-cert/src/main/feature/feature.xml
+++ b/features/odl-aaa-cert/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-cert" version="${project.version}">
-        <feature version="[3,4)">odl-mdsal-broker</feature>
+        <feature version="[4,5)">odl-mdsal-broker</feature>
         <configfile finalname="etc/opendaylight/datastore/initial/config/aaa-cert-config.xml">
             mvn:org.opendaylight.aaa/aaa-cert/${project.version}/xml/config
         </configfile>
diff --git a/features/odl-aaa-cli/pom.xml b/features/odl-aaa-cli/pom.xml
index 118de7b44..39ec93af2 100644
--- a/features/odl-aaa-cli/pom.xml
+++ b/features/odl-aaa-cli/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index adcf5b400..862d0f6dc 100644
--- a/features/odl-aaa-encryption-service/pom.xml
+++ b/features/odl-aaa-encryption-service/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>3.0.8</version>
+            <version>4.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/odl-aaa-encryption-service/src/main/feature/feature.xml b/features/odl-aaa-encryption-service/src/main/feature/feature.xml
index 823ceb9be..899a99b96 100644
--- a/features/odl-aaa-encryption-service/src/main/feature/feature.xml
+++ b/features/odl-aaa-encryption-service/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-encryption-service" version="${project.version}">
-        <feature version="[3,4)">odl-mdsal-broker</feature>
+        <feature version="[4,5)">odl-mdsal-broker</feature>
         <configfile finalname="etc/opendaylight/datastore/initial/config/aaa-encrypt-service-config.xml">
             mvn:org.opendaylight.aaa/aaa-encrypt-service-impl/${project.version}/xml/config
         </configfile>
diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index 8d6edfd12..9fc8692e5 100644
--- a/features/odl-aaa-password-service/pom.xml
+++ b/features/odl-aaa-password-service/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>7.0.7</version>
+            <version>8.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>3.0.8</version>
+            <version>4.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/odl-aaa-password-service/src/main/feature/feature.xml b/features/odl-aaa-password-service/src/main/feature/feature.xml
index aec0e9ea6..42c8bd2aa 100644
--- a/features/odl-aaa-password-service/src/main/feature/feature.xml
+++ b/features/odl-aaa-password-service/src/main/feature/feature.xml
@@ -8,8 +8,8 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-password-service" version="${project.version}">
-        <feature version="[7,8)">odl-mdsal-binding-base</feature>
-        <feature version="[3,4)">odl-mdsal-broker</feature>
+        <feature version="[8,9)">odl-mdsal-binding-base</feature>
+        <feature version="[4,5)">odl-mdsal-broker</feature>
         <configfile finalname="etc/opendaylight/datastore/initial/config/aaa-password-service-config.xml">
             mvn:org.opendaylight.aaa/aaa-password-service-impl/${project.version}/xml/aaa-password-service-config
         </configfile>
diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index 0c0a35606..47efc3cee 100644
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-aaa-shiro/src/main/feature/feature.xml b/features/odl-aaa-shiro/src/main/feature/feature.xml
index 59ec7f062..011c5adef 100644
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -23,8 +23,8 @@
         <configfile finalname="/etc/org.opendaylight.aaa.filterchain.cfg">
             mvn:org.opendaylight.aaa/aaa-filterchain/${project.version}/cfg/config
         </configfile>
-        <feature version="[8.1,9)">odl-karaf-feat-jdbc</feature>
-        <feature version="[8.1,9)">odl-karaf-feat-jetty</feature>
-        <feature version="[3,4)">odl-jolokia</feature>
+        <feature version="[9,10)">odl-karaf-feat-jdbc</feature>
+        <feature version="[9,10)">odl-karaf-feat-jetty</feature>
+        <feature version="[4,5)">odl-jolokia</feature>
     </feature>
 </features>
diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index e8ab8be37..818ff0b62 100644
--- a/features/odl-aaa-web/pom.xml
+++ b/features/odl-aaa-web/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>6.0.6</version>
+                <version>7.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/odl-aaa-web/src/main/feature/feature.xml b/features/odl-aaa-web/src/main/feature/feature.xml
index 1b8d8935b..a3d1dffe2 100644
--- a/features/odl-aaa-web/src/main/feature/feature.xml
+++ b/features/odl-aaa-web/src/main/feature/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-web" version="${project.version}">
-        <feature version="[8.1,9)">odl-karaf-feat-jetty</feature>
-        <feature version="[8.1,9)">odl-guava</feature>
-        <feature version="[8.1,9)">odl-jersey-2</feature>
-        <feature version="[6,7)">odl-yangtools-util</feature>
+        <feature version="[9,10)">odl-karaf-feat-jetty</feature>
+        <feature version="[9,10)">odl-guava</feature>
+        <feature version="[9,10)">odl-jersey-2</feature>
+        <feature version="[7,8)">odl-yangtools-util</feature>
     </feature>
 </features>
diff --git a/features/odl-apache-shiro/pom.xml b/features/odl-apache-shiro/pom.xml
index 5d2a3694e..e58d25fa0 100644
--- a/features/odl-apache-shiro/pom.xml
+++ b/features/odl-apache-shiro/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-apache-shiro/src/main/feature/feature.xml b/features/odl-apache-shiro/src/main/feature/feature.xml
index b4a92d465..209d3421c 100644
--- a/features/odl-apache-shiro/src/main/feature/feature.xml
+++ b/features/odl-apache-shiro/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-apache-shiro" version="${project.version}">
-        <feature version="[8,9)">odl-servlet-api</feature>
+        <feature version="[9,10)">odl-servlet-api</feature>
     </feature>
 </features>
diff --git a/features/pom.xml b/features/pom.xml
index 66c6065d8..5782432e9 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 424c72da1..6c165a99a 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 82bb6dabf..c66fbe103 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>7.0.7</version>
+    <version>8.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>3.0.8</version>
+        <version>4.0.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/pom.xml b/pom.xml
index 15b6a0b93..c326e0b3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/web/pom.xml b/web/pom.xml
index c7d12e719..5013f2873 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
diff --git a/web/testutils/pom.xml b/web/testutils/pom.xml
index c30c466cf..334fc7f14 100644
--- a/web/testutils/pom.xml
+++ b/web/testutils/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.9.8</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>