Code Review / odlparent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: fe616ae)
Bump Karaf to 4.4.6 40/111340/3
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 9 Apr 2024 15:20:25 +0000 (17:20 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 12 Apr 2024 18:05:14 +0000 (20:05 +0200)
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12354057
https://github.com/jetty/jetty.project/releases/tag/jetty-9.4.54.v20240208

Change-Id: I77bdb45e1fb53ab2f41a7b8d61f488daeef640fc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
karaf/opendaylight-karaf-resources/pom.xml patch | blob | history
karaf/opendaylight-karaf-resources/src/main/patches/karaf-remove-bc.patch patch | blob | history
odlparent-dependency-check/pom.xml patch | blob | history
odlparent/pom.xml patch | blob | history

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index dd8d2e5a84c9e1ecf37320c4fd4c9a191d28c3a4..c306bfa49fcf0acd1c7725e902fa1106d4528fcf 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -128,10 +128,10 @@
                       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.24/pax-web-features-8.0.24-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.27/pax-web-features-8.0.27-features.xml"
                          token="/2.15.3" value="/2.16.2" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.24/pax-web-features-8.0.24-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/8.0.24/pax-web-features-8.0.24-features.xml"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.27/pax-web-features-8.0.27-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/8.0.27/pax-web-features-8.0.27-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 64dd82f50770607d642fe160e6e9572d8075132d..6c6fb91484d63cd9b8b517062c092f44654b1df2 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.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
+--- /home/nite/odl/odlparent/karaf/opendaylight-karaf-resources/target/assembly/system/org/apache/karaf/features/standard/4.4.6/standard-4.4.6-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.6/standard-4.4.6-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.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.5</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-osgi/2.12.1</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-scp/2.12.1</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-sftp/2.12.1</bundle>
+-      <bundle start-level="30">mvn:org.bouncycastle/bcutil-jdk18on/1.77</bundle>
+-        <bundle start-level="30">mvn:org.bouncycastle/bcprov-jdk18on/1.77</bundle>
+-        <bundle start-level="30">mvn:org.bouncycastle/bcpkix-jdk18on/1.77</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.4.6</bundle>
      </feature>
 
 @@ -1461,7 +1458,6 @@
 
-     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="4.4.5">
+     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="4.4.6">
          <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.bouncycastle/bcprov-jdk18on/1.77</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.5</bundle>
      </feature>
diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 2827d57c02bbfaf3f1bba2e2f06899be4393ab67..d024e3daddc52ae0e5265155d57bd47dea9ed8b7 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.53.v20231009</version>
+            <version>9.4.54.v20240208</version>
         </dependency>
         <dependency>
             <groupId>org.gaul</groupId>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 195bd399a958116d41cea8e65fb0f01becfee3b8..c29b8cc77eb3b40b93a385591cd34cc61a46b6ae 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.5</karaf.version>
+    <karaf.version>4.4.6</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -674,7 +674,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.53.v20231009</version>
+        <version>9.4.54.v20240208</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
odlparent