From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 8 Nov 2022 19:12:00 +0000 (+0100)
Subject: Bump upstreams
X-Git-Tag: v0.17.0~11
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4ced048742e253565acb0545b281b7b556b1545e;p=aaa.git

Bump upstreams

Adopt:
- odlparent-12.0.0
- infrautils-5.0.0
- yangtools-10.0.0
- mdsal-11.0.0-SNAPSHOT
- controller-7.0.0-SNAPSHOT

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

diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index 4286c2de0..9a8ea99ee 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>11.0.1</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/aaa-password-service/pom.xml b/aaa-password-service/pom.xml
index ad09a7fcd..f2c09d784 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>11.0.1</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index 457dcf3cd..584aa1fc0 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>11.0.1</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/aaa-shiro/repackaged-shiro-jar/pom.xml b/aaa-shiro/repackaged-shiro-jar/pom.xml
index d91abb5c0..00882d9e5 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>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 71c5e0fd3..868f7dd3c 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>11.0.1</version>
+      <version>12.0.0</version>
       <relativePath/>
     </parent>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index 1dd888858..42750a900 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>inject.guice.testutils</artifactId>
-            <version>4.0.1</version>
+            <version>5.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -254,11 +254,11 @@
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/11.0.1/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/4.0.1/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/9.0.1/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/10.0.2/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/6.0.2/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/12.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/5.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/10.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/11.0.0-SNAPSHOT/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/7.0.0-SNAPSHOT/</link>
                     </links>
 
                     <!--groups>
diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index 59be1ed38..92735cfb5 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>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index 7d16ad5b4..540e17da7 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>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>10.0.2</version>
+            <version>11.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 086d99fa9..54a77b1ea 100644
--- a/features/odl-aaa-api/src/main/feature/feature.xml
+++ b/features/odl-aaa-api/src/main/feature/feature.xml
@@ -8,9 +8,9 @@
  -->
 <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="[11,12)">odl-jakarta-activation-api</feature>
-        <feature version="[11,12)">odl-servlet-api</feature>
-        <feature version="[11,12)">odl-ws-rs-api</feature>
-        <feature version="[10,11)">odl-mdsal-binding-base</feature>
+        <feature version="[12,13)">odl-jakarta-activation-api</feature>
+        <feature version="[12,13)">odl-servlet-api</feature>
+        <feature version="[12,13)">odl-ws-rs-api</feature>
+        <feature version="[11,12)">odl-mdsal-binding-base</feature>
     </feature>
 </features>
diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index 83cc727f3..374d92d0f 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>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>6.0.2</version>
+            <version>7.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 072d9c3e3..9ca3d458b 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="[6,7)">odl-mdsal-broker</feature>
+        <feature version="[7,8)">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 cb7b98f4e..01c08cd2f 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>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index f94e99b9b..2fd0e75ae 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>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>6.0.2</version>
+                <version>7.0.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </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 b84a2b672..288f5f026 100644
--- a/features/odl-aaa-encryption-service/src/main/feature/feature.xml
+++ b/features/odl-aaa-encryption-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-encryption-service" version="${project.version}">
-        <feature version="[6,7)">odl-controller-blueprint</feature>
-        <feature version="[6,7)">odl-mdsal-broker</feature>
+        <feature version="[7,8)">odl-controller-blueprint</feature>
+        <feature version="[7,8)">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 029ca7457..7c6c1a6ab 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>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>10.0.2</version>
+            <version>11.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>6.0.2</version>
+            <version>7.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 01cc17601..65a0b0e01 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="[10,11)">odl-mdsal-binding-base</feature>
-        <feature version="[6,7)">odl-mdsal-broker</feature>
+        <feature version="[11,12)">odl-mdsal-binding-base</feature>
+        <feature version="[7,8)">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 7efe763ce..0e39d36fd 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>11.0.1</version>
+        <version>12.0.0</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 24f00c81d..7fb18b00c 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="[11,12)">odl-karaf-feat-jdbc</feature>
-        <feature version="[11,12)">odl-karaf-feat-jetty</feature>
-        <feature version="[6,7)">odl-jolokia</feature>
+        <feature version="[12,13)">odl-karaf-feat-jdbc</feature>
+        <feature version="[12,13)">odl-karaf-feat-jetty</feature>
+        <feature version="[7,8)">odl-jolokia</feature>
     </feature>
 </features>
diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index 9932c913f..7057fb665 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>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>9.0.1</version>
+                <version>10.0.0</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 bf84e89f7..f83fc64ce 100644
--- a/features/odl-aaa-web/src/main/feature/feature.xml
+++ b/features/odl-aaa-web/src/main/feature/feature.xml
@@ -2,9 +2,9 @@
 <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>pax-web-http-whiteboard</feature>
-        <feature version="[11,12)">odl-karaf-feat-jetty</feature>
-        <feature version="[11,12)">odl-guava</feature>
-        <feature version="[11,12)">odl-jersey-2</feature>
-        <feature version="[9,10)">odl-yangtools-util</feature>
+        <feature version="[12,13)">odl-karaf-feat-jetty</feature>
+        <feature version="[12,13)">odl-guava</feature>
+        <feature version="[12,13)">odl-jersey-2</feature>
+        <feature version="[10,11)">odl-yangtools-util</feature>
     </feature>
 </features>
diff --git a/features/odl-apache-shiro/pom.xml b/features/odl-apache-shiro/pom.xml
index 5fe98a55a..1c993fe07 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>11.0.1</version>
+        <version>12.0.0</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 8ac7089c1..6a664f15c 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="[11,12)">odl-servlet-api</feature>
+        <feature version="[12,13)">odl-servlet-api</feature>
     </feature>
 </features>
diff --git a/features/pom.xml b/features/pom.xml
index 971b56a88..805b11322 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 2ba457c59..9737891e5 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>11.0.1</version>
+        <version>12.0.0</version>
         <relativePath/>
     </parent>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 69ac25e99..821f59e38 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>10.0.2</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>6.0.2</version>
+        <version>7.0.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/pom.xml b/pom.xml
index 7b8a04f3b..0a5499a0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.1</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/web/pom.xml b/web/pom.xml
index 15f0411f9..9253ac5ff 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>11.0.1</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/web/testutils/pom.xml b/web/testutils/pom.xml
index 15dc12e94..efd226125 100644
--- a/web/testutils/pom.xml
+++ b/web/testutils/pom.xml
@@ -26,7 +26,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>4.0.1</version>
+        <version>5.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>