Adopt 2022.09 upstreams

Adopt:
- odlparent-11.0.0
- infrautils-4.0.0
- yangtools-9.0.0
- mdsal-10.0.0
- controller-6.0.0

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

diff --git a/aaa-authn-api/pom.xml b/aaa-authn-api/pom.xml
index fb3084fd9ce8d78fa97253bca78a97395d565b3d..76f3be6bb83de96c2ec4a9ea72fa4585c2abedf9 100644 (file)
--- a/aaa-authn-api/pom.xml
+++ b/aaa-authn-api/pom.xml
@@ -24,8 +24,8 @@
   <dependencies>
     <!-- external dependencies -->
     <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index b9a41834671af4772e48ac28712422a301c10d15..b988c5d49aada1e60db4042a74aee347ebda5814 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -37,7 +37,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <!-- Bouncy Castle dependency -->
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcprov-jdk18on</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/aaa-encrypt-service/api/pom.xml b/aaa-encrypt-service/api/pom.xml
index 4468ee7c65cda594cc860d080f7eaabb85130e99..6379c5db7d60b969cb42a66ffafafe4dfba13e01 100644 (file)
--- a/aaa-encrypt-service/api/pom.xml
+++ b/aaa-encrypt-service/api/pom.xml
@@ -17,11 +17,11 @@
   <dependencies>
     <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>
   </dependencies>
 </project>

diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index 446d65a97fdf86737052a96c79106572944ea777..d04be85538cc7c3c765b38db1bd8baa28cee7bff 100644 (file)
--- 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>10.0.0</version>
+    <version>11.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-password-service/pom.xml b/aaa-password-service/pom.xml
index fa521c17adb5624343b950c5c8d5b7e853a99778..17fa96dec53c8d047ad19ca4c2a237384f7fa4c6 100644 (file)
--- 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>10.0.0</version>
+    <version>11.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index c0a8becf0ab162e1346438eb33071516723ebb01..3e2335c0e0f75417a3305a8e6fe51201076de673 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -77,8 +77,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>org.osgi.service.http.whiteboard</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -114,21 +114,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
 
         <!-- Testing Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
@@ -149,10 +134,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.truth</groupId>
-            <artifactId>truth</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-password-service-impl</artifactId>

diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index 0f22b09b414345f1324c31d59272db75d46447b0..130635f9ee38fefd55c0c2668c1dcca88832d610 100644 (file)
--- 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>10.0.0</version>
+    <version>11.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-shiro/repackaged-shiro-jar/pom.xml b/aaa-shiro/repackaged-shiro-jar/pom.xml
index 79f7eb2edbd9c48848ddfcbd20682905f8860fb5..04b466ddbcb4b11badf23187800ca24abba74f91 100644 (file)
--- 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 663325b6767c4cd05668c8f8df4a9e0f3d158e64..95dd88d3e5ff78cfe20e2b51c343152225443f88 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>10.0.0</version>
+      <version>11.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 67fba3249626bce2376f8394298b0e78e266108d..023b8e30e48637032daecd15fadeb4e8ad9c3fc0 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>inject.guice.testutils</artifactId>
-            <version>3.0.0</version>
+            <version>4.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -126,11 +126,23 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <artifactId>org.osgi.framework</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>org.osgi.service.component</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.http.whiteboard</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
         </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
@@ -242,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/10.0.0/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/3.0.0/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/8.0.3/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/9.0.2/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/5.0.3/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/11.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/4.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/9.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/10.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/6.0.0/</link>
                     </links>
 
                     <!--groups>

diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index c4e242e85edd1b09976a85abfb838ee55a6e75ad..86463e230c8872b061a169a41b01ab2b771924de 100644 (file)
--- 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index 025f6024954dbc7b935ea4c5b1f31a38ac516ce0..d13511ed49e1aa6766f55df5e24a1b19776dd57f 100644 (file)
--- 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>9.0.2</version>
+            <version>10.0.0</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 a114213b56a4d41b69696f2a9f3b499beb3ef04c..086d99fa964c5c7af7ec5e2a9c3e4edb6c6d96fd 100644 (file)
--- 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="[10,11)">odl-jakarta-activation-api</feature>
-        <feature version="[10,11)">odl-servlet-api</feature>
-        <feature version="[10,11)">odl-ws-rs-api</feature>
-        <feature version="[9,10)">odl-mdsal-binding-base</feature>
+        <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>
 </features>

diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index d0dc38e80720cef2011f9abe7162a056b7d80cf9..23a070093f4a8ce4c503d4f7560683d5e2210cdc 100644 (file)
--- 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>5.0.3</version>
+            <version>6.0.0</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 733ec6170cb10a451221f5aed7508d1ba0a5393c..072d9c3e3ce5f6a9d200539494f51aa6711d9ff2 100644 (file)
--- 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="[5,6)">odl-mdsal-broker</feature>
+        <feature version="[6,7)">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 6c3ed6261926f2ed3dc6f8998ddb13663a6d309d..ed5511a4920e6e65141ca6b989331661705860e3 100644 (file)
--- 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index d2f1da4a2e0b87c7426b806cc242182d84e3da91..012621aedb3f9ad298f1fe9c7e137e3d807c812f 100644 (file)
--- 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>5.0.3</version>
+                <version>6.0.0</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 b9af6e401d469c53375dd66fec04d95acdd2cfec..b84a2b672b8e9b7d12e4988c0f0962d5b2306e4f 100644 (file)
--- 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="[5,6)">odl-controller-blueprint</feature>
-        <feature version="[5,6)">odl-mdsal-broker</feature>
+        <feature version="[6,7)">odl-controller-blueprint</feature>
+        <feature version="[6,7)">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 a4d918df7f81dc149ea23687f8993c802ade542d..c794fea53796e1da165792c049c7e172e16cd692 100644 (file)
--- 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>9.0.2</version>
+            <version>10.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>5.0.3</version>
+            <version>6.0.0</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 74455f17fbeca22f0f59a2e12e2a496f39c0540b..01cc17601786935c52d29d9e665c6ea5a80557fc 100644 (file)
--- 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="[9,10)">odl-mdsal-binding-base</feature>
-        <feature version="[5,6)">odl-mdsal-broker</feature>
+        <feature version="[10,11)">odl-mdsal-binding-base</feature>
+        <feature version="[6,7)">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 5742f426b40f0c9224fc8e009b547123a82406ce..d0e29694724526c6d2352f48a08646832388b717 100644 (file)
--- 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>10.0.0</version>
+        <version>11.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 d714fff14fb9c4819c56d397dcb26948af2997fa..24f00c81d6b2bceb0722b45424c876353cafd575 100644 (file)
--- 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="[10,11)">odl-karaf-feat-jdbc</feature>
-        <feature version="[10,11)">odl-karaf-feat-jetty</feature>
-        <feature version="[5,6)">odl-jolokia</feature>
+        <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>
 </features>

diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index 122f6e03854364a3827f6264bba8bc9b0d1bcece..47a4fa8aca48c8dd0df3f3ee74f922dccf97b6d1 100644 (file)
--- 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>8.0.3</version>
+                <version>9.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 47528abd7addba9a51ca24761667728248bf9bd0..d3f1fd9ca39e44d0cfb621a365cc01bae653658b 100644 (file)
--- 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="[10,11)">odl-karaf-feat-jetty</feature>
-        <feature version="[10,11)">odl-guava</feature>
-        <feature version="[10,11)">odl-jersey-2</feature>
-        <feature version="[8,9)">odl-yangtools-util</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>
 </features>

diff --git a/features/odl-apache-shiro/pom.xml b/features/odl-apache-shiro/pom.xml
index 4455fb0af2f3a8539436301105d3c43986ebb1da..dfc95637f7fe7877eb10f702ce113c45398e86fd 100644 (file)
--- 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>10.0.0</version>
+        <version>11.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 29c2225b0c2d7a5d8f296aed0732a2cfed06574d..8ac7089c16c49b0f05a7cc43129a4a4dbdcf11cc 100644 (file)
--- 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="[10,11)">odl-servlet-api</feature>
+        <feature version="[11,12)">odl-servlet-api</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 4b32cfcfd13837027dc98de8fdb1c57367d4f778..663e597562048d832647a89ea6ba6e6e3019037b 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index d73e207c6b401668628ad4a0f428e48847f6c46c..ee55ebf2421b2d4c068da4e69516f32d034cd263 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index c16f5016817288d7953a858f3ed09377fbfdcee5..90e071c99bc4348b2b956df30b4e851ebfd51971 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>9.0.2</version>
+    <version>10.0.0</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>5.0.3</version>
+        <version>6.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/pom.xml b/pom.xml
index e94c9c264aad360d49f12b664118e8b2742c13bc..4bfed90a4dc7a58043efe355cafe3335fc13b0ba 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/web/impl-jetty/pom.xml b/web/impl-jetty/pom.xml
index 0baf0299d925906f5a7bae928badba67c0a2bfc3..6f4983194c6d8905b744555b5ff04c9cf8648bf4 100644 (file)
--- a/web/impl-jetty/pom.xml
+++ b/web/impl-jetty/pom.xml
@@ -47,8 +47,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
       <optional>true</optional>
     </dependency>
   </dependencies>

diff --git a/web/pom.xml b/web/pom.xml
index 09bf63c2b98182e7a773e851d221e0e9a5452697..9bfea25ad38ea8a6c26fe1fb8b92f7f0a6274fac 100644 (file)
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/web/servlet-api/pom.xml b/web/servlet-api/pom.xml
index 4793e277f590d5b7fb64f6c8dcafbeb53a18aee9..fc11d4fe9c4b226c492001c8cc4f1736d53db708 100644 (file)
--- a/web/servlet-api/pom.xml
+++ b/web/servlet-api/pom.xml
@@ -31,8 +31,8 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
 
         <dependency>