Bump upstreams 63/103163/1
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 8 Nov 2022 19:12:00 +0000 (20:12 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 8 Nov 2022 19:13:53 +0000 (20:13 +0100)
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>
28 files changed:
aaa-encrypt-service/pom.xml
aaa-password-service/pom.xml
aaa-shiro/pom.xml
aaa-shiro/repackaged-shiro-jar/pom.xml
artifacts/pom.xml
docs/pom.xml
features/features-aaa/pom.xml
features/odl-aaa-api/pom.xml
features/odl-aaa-api/src/main/feature/feature.xml
features/odl-aaa-cert/pom.xml
features/odl-aaa-cert/src/main/feature/feature.xml
features/odl-aaa-cli/pom.xml
features/odl-aaa-encryption-service/pom.xml
features/odl-aaa-encryption-service/src/main/feature/feature.xml
features/odl-aaa-password-service/pom.xml
features/odl-aaa-password-service/src/main/feature/feature.xml
features/odl-aaa-shiro/pom.xml
features/odl-aaa-shiro/src/main/feature/feature.xml
features/odl-aaa-web/pom.xml
features/odl-aaa-web/src/main/feature/feature.xml
features/odl-apache-shiro/pom.xml
features/odl-apache-shiro/src/main/feature/feature.xml
features/pom.xml
karaf/pom.xml
parent/pom.xml
pom.xml
web/pom.xml
web/testutils/pom.xml

index 4286c2de0f6068e29d9433f09e3e6db571972f76..9a8ea99ee7f6eeeafa1cd98bb654913e7145c367 100644 (file)
@@ -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>
 
index ad09a7fcd6ee0caa8ec64f5df4bfb754ad1292aa..f2c09d784d09ee3ae6b91993d404268cfa172b3c 100644 (file)
@@ -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>
 
index 457dcf3cd7f4353ab31654116690762428f036af..584aa1fc0bcc1f7b8090b371acf50ec0d2660155 100644 (file)
@@ -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>
 
index d91abb5c04f53ce88762c20d8a58640e3b651cdb..00882d9e541d2ee71a1fccf9e85b074f7efc21cc 100644 (file)
@@ -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>
 
index 71c5e0fd3538895222483fac63e12718ae678980..868f7dd3c8ac924f3614d7bf5f5d61c62dd93593 100644 (file)
@@ -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>
 
index 1dd888858f8a1d610756c2a88230a270d198575a..42750a9000c3391143a5d9a367c0c962df6e1745 100644 (file)
@@ -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>
 
         <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>
                         <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>
index 59be1ed38906b53253b95fdbd6ee90b4fd21d649..92735cfb5d5e379941b281da3d1f952014e16b4c 100644 (file)
@@ -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>
 
index 7d16ad5b4a50890183a336989ace8efaa0e11043..540e17da7bc26cc20f007b7e544bffb2b68a579d 100644 (file)
@@ -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>
index 086d99fa964c5c7af7ec5e2a9c3e4edb6c6d96fd..54a77b1eae0b4218f7f1e852807134e8a9429d37 100644 (file)
@@ -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>
index 83cc727f39770dffde52003cd40350a461f26dff..374d92d0fb2325655cb70bf217f76802ee62d74d 100644 (file)
@@ -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>
index 072d9c3e3ce5f6a9d200539494f51aa6711d9ff2..9ca3d458b6eb4a1a8eac47a43de593e5326e0222 100644 (file)
@@ -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>
index cb7b98f4e5a4ba0522949d892caf2da3c08c3127..01c08cd2f6b679877bac37c14fb6704b6dad1dc0 100644 (file)
@@ -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>
 
index f94e99b9bf3107ba6e13da8f0b4216a6b9ff49f1..2fd0e75aef84802155fb1475bf2ee6cc27e98b74 100644 (file)
@@ -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>
index b84a2b672b8e9b7d12e4988c0f0962d5b2306e4f..288f5f026bb7fdeb79da8c860c596a6b18acd4ad 100644 (file)
@@ -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>
index 029ca745775c0f33bfe190549a40f34a9b2be605..7c6c1a6abd894cbb49c95942bd5f78e7184d545f 100644 (file)
@@ -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>
 
         <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>
index 01cc17601786935c52d29d9e665c6ea5a80557fc..65a0b0e01f447bf14aabdc08fdd714f480b8d87f 100644 (file)
@@ -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>
index 7efe763ce7b5f901cf17fd5e469837d0bc0bd6fb..0e39d36fd1382bbd36130c1ea9dc014916028769 100644 (file)
@@ -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>
 
index 24f00c81d6b2bceb0722b45424c876353cafd575..7fb18b00c86ffa59d7e86b2cc364b16f09e70932 100644 (file)
@@ -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>
index 9932c913f5ac8b2a7ceadcd52fab2ea704fc0625..7057fb6650e6a53af48c84e125136781bd8de1aa 100644 (file)
@@ -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>
index bf84e89f7238997116210ddef0de234003908819..f83fc64ce8d7c005a099d18be3ed969af2be2f90 100644 (file)
@@ -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>
index 5fe98a55a75cf63d25d5cf6026ba08309723485f..1c993fe0752a6c3c06d6f08fa8fdfb9a7c18a026 100644 (file)
@@ -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>
 
index 8ac7089c16c49b0f05a7cc43129a4a4dbdcf11cc..6a664f15cd0fcac34073807245163b08aef28664 100644 (file)
@@ -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>
index 971b56a8821f06f6e6853e137ea90958288fb2d9..805b113222697b7a2a0e6f739b7e359584e4f830 100644 (file)
@@ -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>
 
index 2ba457c59586159e01bc2bc55aad0aead9185935..9737891e56df403fc4ca8cdbcfff3a8abce7707a 100644 (file)
@@ -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>
 
index 69ac25e99fc7d9d7d3372d6b233e93f2ff90806b..821f59e38878d541b35614d97f3f09c8a7abe84c 100644 (file)
@@ -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 7b8a04f3b4e56829f139e32bc86c232622a0355b..0a5499a0daa6bfa0e06cc1a2021d8ed9dc096008 100644 (file)
--- 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>
 
index 15f0411f945b25429607fb34e373070d87682c79..9253ac5ff9853ad6d29baa85cb08945007cb0a6b 100644 (file)
@@ -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>
 
index 15dc12e9424b8b8907ab151eb60fed4f8b772ff9..efd2261253f1eae0dffbd505da62b6ee8392bfdc 100644 (file)
@@ -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>