From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 1 Jun 2022 01:02:09 +0000 (+0200)
Subject: Adopt 2022.09 upstreams
X-Git-Tag: v0.16.0~13
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=145ceb8f6e2c3ea49c7d65fff8f20fe87ad77df8;p=aaa.git

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 fb3084fd9..76f3be6bb 100644
--- 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 b9a418346..b988c5d49 100644
--- 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 4468ee7c6..6379c5db7 100644
--- 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 446d65a97..d04be8553 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>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 fa521c17a..17fa96dec 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>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 c0a8becf0..3e2335c0e 100644
--- 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 0f22b09b4..130635f9e 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>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 79f7eb2ed..04b466ddb 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>10.0.0</version>
+        <version>11.0.0</version>
         <relativePath/>
     </parent>
 
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 663325b67..95dd88d3e 100644
--- 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 67fba3249..023b8e30e 100644
--- 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 c4e242e85..86463e230 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>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 025f60249..d13511ed4 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>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 a114213b5..086d99fa9 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="[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 d0dc38e80..23a070093 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>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 733ec6170..072d9c3e3 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="[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 6c3ed6261..ed5511a49 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>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 d2f1da4a2..012621aed 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>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 b9af6e401..b84a2b672 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="[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 a4d918df7..c794fea53 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>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 74455f17f..01cc17601 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="[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 5742f426b..d0e296947 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>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 d714fff14..24f00c81d 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="[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 122f6e038..47a4fa8ac 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>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 47528abd7..d3f1fd9ca 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="[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 4455fb0af..dfc95637f 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>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 29c2225b0..8ac7089c1 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="[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 4b32cfcfd..663e59756 100644
--- 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 d73e207c6..ee55ebf24 100644
--- 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 c16f50168..90e071c99 100644
--- 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 e94c9c264..4bfed90a4 100644
--- 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 0baf0299d..6f4983194 100644
--- 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 09bf63c2b..9bfea25ad 100644
--- 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 4793e277f..fc11d4fe9 100644
--- 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>