Bump karaf to 4.4.5

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12353604
https://github.com/jetty/jetty.project/releases/tag/jetty-9.4.53.v20231009

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

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 3f147ecdd35b9b3a7925c59c00addf12f335dc5c..280a43b4c3f2a867787341db555f1143c834f546 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -122,18 +122,10 @@
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-remove-bc.patch"
                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                        failonerror="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                      token="commons-io/commons-io/2.13.0" value="commons-io/commons-io/2.15.1" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                      token="org.apache.commons/commons-lang3/3.13.0" value="org.apache.commons/commons-lang3/3.14.0" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.22/pax-web-features-8.0.22-features.xml"
-                      token="/2.15.2" value="/2.15.3" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.22/pax-web-features-8.0.22-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/8.0.22/pax-web-features-8.0.22-features.xml"/>
                 <!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->
                 <echo file="${project.build.directory}/assembly/etc/startup.properties" append="true">
 # The following are added by opendaylight-karaf-resources

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-remove-bc.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-remove-bc.patch
index 8147eaef348d3956d353bf85370ebb8f356e522f..64dd82f50770607d642fe160e6e9572d8075132d 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-remove-bc.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-remove-bc.patch
@@ -1,20 +1,20 @@
---- /home/nite/odl/odlparent/karaf/opendaylight-karaf-resources/target/assembly/system/org/apache/karaf/features/standard/4.4.4/standard-4.4.4-features.xml.orig       2023-09-12 20:39:16.336539563 +0200
-+++ /home/nite/odl/odlparent/karaf/opendaylight-karaf-resources/target/assembly/system/org/apache/karaf/features/standard/4.4.4/standard-4.4.4-features.xml    2023-09-12 20:39:15.733533811 +0200
+--- /home/nite/odl/odlparent/karaf/opendaylight-karaf-resources/target/assembly/system/org/apache/karaf/features/standard/4.4.5/standard-4.4.5-features.xml.orig       2023-09-12 20:39:16.336539563 +0200
++++ /home/nite/odl/odlparent/karaf/opendaylight-karaf-resources/target/assembly/system/org/apache/karaf/features/standard/4.4.5/standard-4.4.5-features.xml    2023-09-12 20:39:15.733533811 +0200
 @@ -1004,9 +1004,6 @@
-         <bundle start-level="30">mvn:org.apache.sshd/sshd-osgi/2.10.0</bundle>
-         <bundle start-level="30">mvn:org.apache.sshd/sshd-scp/2.10.0</bundle>
-         <bundle start-level="30">mvn:org.apache.sshd/sshd-sftp/2.10.0</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-osgi/2.11.0</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-scp/2.11.0</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-sftp/2.11.0</bundle>
 -      <bundle start-level="30">mvn:org.bouncycastle/bcutil-jdk18on/1.75</bundle>
 -        <bundle start-level="30">mvn:org.bouncycastle/bcprov-jdk18on/1.75</bundle>
 -        <bundle start-level="30">mvn:org.bouncycastle/bcpkix-jdk18on/1.75</bundle>
-         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.4.4</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.4.5</bundle>
      </feature>
 
 @@ -1461,7 +1458,6 @@
 
-     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="4.4.4">
+     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="4.4.5">
          <feature>jaas</feature>
 -        <bundle dependency="true" start-level="30">mvn:org.bouncycastle/bcprov-jdk18on/1.75</bundle>
          <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/5.3.3.RELEASE_2</bundle>
-         <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/4.4.4</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/4.4.5</bundle>
      </feature>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index a5a81b0787bf2839e1db43e5e6ae7db9746bad2e..a2efef9f95dda97afe65ee5326c0cd1dff8ba191 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -195,7 +195,7 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-bom</artifactId>
             <type>pom</type>
-            <version>9.4.52.v20230823</version>
+            <version>9.4.53.v20231009</version>
         </dependency>
         <dependency>
             <groupId>org.gaul</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index f56ca0f1a7c6f981314ade6e59f3fc15a12542a4..4469a3a62e3eb3b701f2af7478ad5e465505ae7c 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -38,7 +38,7 @@
     <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>
 
     <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
-    <karaf.version>4.4.4</karaf.version>
+    <karaf.version>4.4.5</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -672,7 +672,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.52.v20230823</version>
+        <version>9.4.53.v20231009</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>