Code Review / aaa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: e3dba66)
Bump upstreams 06/109806/5
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 16 Jan 2024 09:27:18 +0000 (10:27 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Mon, 22 Jan 2024 09:14:12 +0000 (10:14 +0100)
Adopt:
- yangtools-13.0.1
- mdsal-13.0.0
- controller-9.0.0

Change-Id: If209af390b1333bf8273bacff623cdd5a8f1ed28
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
15 files changed:
aaa-cert/pom.xml patch | blob | history
aaa-shiro/impl/pom.xml patch | blob | history
docs/pom.xml patch | blob | history
features/odl-aaa-api/pom.xml patch | blob | history
features/odl-aaa-api/src/main/feature/feature.xml patch | blob | history
features/odl-aaa-cert/pom.xml patch | blob | history
features/odl-aaa-cert/src/main/feature/feature.xml patch | blob | history
features/odl-aaa-encryption-service/pom.xml patch | blob | history
features/odl-aaa-encryption-service/src/main/feature/feature.xml patch | blob | history
features/odl-aaa-password-service/pom.xml patch | blob | history
features/odl-aaa-password-service/src/main/feature/feature.xml patch | blob | history
features/odl-aaa-shiro/src/main/feature/feature.xml patch | blob | history
features/odl-aaa-web/pom.xml patch | blob | history
features/odl-aaa-web/src/main/feature/feature.xml patch | blob | history
parent/pom.xml patch | blob | history

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index 78a463c5147a6e1f7a5d76d32daad95a26ab8744..07e799b03dd619d2dc2faf5febd661bcefd78f00 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -22,23 +22,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>aaa-encrypt-service</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-api</artifactId>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-
-    <!-- Bouncy Castle dependency -->
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk18on</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>aaa-encrypt-service</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index 6a44cfa0fc95af3200b8b30929eface8b93f6965..95c44a3e4a24d71516c9295a70961af128e7ab55 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -22,6 +22,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn-api</artifactId>
diff --git a/docs/pom.xml b/docs/pom.xml
index 96e3cad5aca0eeee236c6ba7f8e54f775f560690..d775ce0b52b54747e79b3f67de7d7a30d82b7b65 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -258,9 +258,9 @@
 
                         <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.0.10/</link>
                         <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/6.0.5/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/11.0.5/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/12.0.4/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/8.0.4/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/13.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/13.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/9.0.0/</link>
                     </links>
 
                     <!--groups>
diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index 652b7bf954c53b55e6b3373c832f5bf73fd24173..70deeb9e91d40d371c6bfb0cd35866a380cefc58 100644 (file)
--- a/features/odl-aaa-api/pom.xml
+++ b/features/odl-aaa-api/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>12.0.4</version>
+            <version>13.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 de77fc8390fd08d017306a3e48f1a072f34fa9fd..30198d84402cc38e2712381cd8cfc18e96b0a8b7 100644 (file)
--- a/features/odl-aaa-api/src/main/feature/feature.xml
+++ b/features/odl-aaa-api/src/main/feature/feature.xml
@@ -11,6 +11,6 @@
         <feature version="[13,14)">odl-jakarta-activation-api</feature>
         <feature version="[13,14)">odl-servlet-api</feature>
         <feature version="[13,14)">odl-ws-rs-api</feature>
-        <feature version="[12,13)">odl-mdsal-binding-base</feature>
+        <feature version="[13,14)">odl-mdsal-binding-base</feature>
     </feature>
 </features>
diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index 00fbb958e84b2bfe4f7cb2c1a4266c9096b2c2dd..eb5755ab12fb14184119c8bae674086dea2761cd 100644 (file)
--- a/features/odl-aaa-cert/pom.xml
+++ b/features/odl-aaa-cert/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>8.0.4</version>
+            <version>9.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 c4583e35630f74e39df23de878be17003261852b..87cb3b3e7e5f2563f6228c15201c16e62a20297e 100644 (file)
--- a/features/odl-aaa-cert/src/main/feature/feature.xml
+++ b/features/odl-aaa-cert/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-cert" version="${project.version}">
-        <feature version="[8,9)">odl-controller-blueprint</feature>
-        <feature version="[8,9)">odl-mdsal-broker</feature>
+        <feature version="[9,10)">odl-controller-blueprint</feature>
+        <feature version="[9,10)">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-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index f6acfca65fd907660be952ff694d1f72a2c82bfa..db556e5064fb35d666dc1c7f6c54a053e3eaf4dc 100644 (file)
--- a/features/odl-aaa-encryption-service/pom.xml
+++ b/features/odl-aaa-encryption-service/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>8.0.4</version>
+                <version>9.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 64b0effbe7176f434586a28f73add101fea17f2b..41672b16d1a9feb7bf2d9399d016fde25d212652 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,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="[8,9)">odl-mdsal-broker</feature>
-        <feature version="[8,9)">odl-controller-blueprint</feature>
+        <feature version="[9,10)">odl-mdsal-broker</feature>
+        <feature version="[9,10)">odl-controller-blueprint</feature>
     </feature>
 </features>
diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index 2224753ac312dd87559dba0b60f465717738ec9a..588deb41ba19d3c60bd94bcfb217bd0b130cf364 100644 (file)
--- a/features/odl-aaa-password-service/pom.xml
+++ b/features/odl-aaa-password-service/pom.xml
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>12.0.4</version>
+            <version>13.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>8.0.4</version>
+            <version>9.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 49ff470dad26cc819fa4ea855ffd3e4fd28ad2a5..97080c0a4587c1c911f4a5e9a54fca9fba197463 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="[12,13)">odl-mdsal-binding-base</feature>
-        <feature version="[8,9)">odl-mdsal-broker</feature>
+        <feature version="[13,14)">odl-mdsal-binding-base</feature>
+        <feature version="[9,10)">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/src/main/feature/feature.xml b/features/odl-aaa-shiro/src/main/feature/feature.xml
index 9cf4f8b243d2c616bb4cada8ddba70a67ee8830c..775a75dd4c809af1da1a71ed5a6a18b9ed2e92d2 100644 (file)
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -25,6 +25,6 @@
         </configfile>
         <feature version="[13,14)">odl-karaf-feat-jdbc</feature>
         <feature version="[13,14)">odl-karaf-feat-jetty</feature>
-        <feature version="[8,9)">odl-jolokia</feature>
+        <feature version="[9,10)">odl-jolokia</feature>
     </feature>
 </features>
diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index c2e7215e8fe57d86c9f91749e77e8efe245ca833..f59e09990298a2b7b90b537615a7d6d3a5d9b757 100644 (file)
--- a/features/odl-aaa-web/pom.xml
+++ b/features/odl-aaa-web/pom.xml
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>11.0.5</version>
+                <version>13.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 7bbe5cdeb5380e494347226b315b395198a08976..e6e2500fbab8ea2ef3834d80f2155bcf068eb42b 100644 (file)
--- a/features/odl-aaa-web/src/main/feature/feature.xml
+++ b/features/odl-aaa-web/src/main/feature/feature.xml
@@ -5,6 +5,6 @@
         <feature version="[13,14)">odl-karaf-feat-jetty</feature>
         <feature version="[13,14)">odl-guava</feature>
         <feature version="[13,14)">odl-jersey-2</feature>
-        <feature version="[11,12)">odl-yangtools-util</feature>
+        <feature version="[13,14)">odl-yangtools-util</feature>
     </feature>
 </features>
diff --git a/parent/pom.xml b/parent/pom.xml
index c1038af03ef7b0e778fb5853c0cda6300532b0d2..fb127aed9b10f747fb3be19f51a480cf4ca82374 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>12.0.4</version>
+    <version>13.0.0</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>8.0.4</version>
+        <version>9.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
Authentication, Authorization, Accounting