Bump karaf to 4.3.4

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12350547

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

diff --git a/features/odl-jersey-2/src/main/history/dependencies.xml b/features/odl-jersey-2/src/main/history/dependencies.xml
index 2a3477ac57472e5c76cc213ab604a1a042fac4bf..08c0e3f1d3de40ba9eb64b476445200b5e61adf1 100644 (file)
--- a/features/odl-jersey-2/src/main/history/dependencies.xml
+++ b/features/odl-jersey-2/src/main/history/dependencies.xml
@@ -5,7 +5,7 @@
         <feature>odl-javassist-3</feature>
         <feature>odl-servlet-api</feature>
         <feature>odl-ws-rs-api</feature>
-        <bundle>mvn:javax.annotation/javax.annotation-api/1.3.1</bundle>
+        <bundle>mvn:javax.annotation/javax.annotation-api/1.3.2</bundle>
         <bundle>mvn:javax.validation/validation-api/1.1.0.Final</bundle>
         <bundle>mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.5.0-b42</bundle>
         <bundle>mvn:org.glassfish.hk2.external/javax.inject/2.5.0-b42</bundle>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index ce0b6dd150e06e7d3c9ee06721701fbf0081dca8..533b188075ec3a8de41457bea1b08423caf9eccb 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -138,10 +138,6 @@
                       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/7.3.19/pax-web-features-7.3.19-features.xml"
-                         token="javax.annotation/javax.annotation-api/1.3&lt;" value="javax.annotation/javax.annotation-api/1.3.1&lt;" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.19/pax-web-features-7.3.19-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.3.19/pax-web-features-7.3.19-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 d9a06dfbcc4bc6635263824d4dbed155f32b0cbc..9912cb8ddaa593c8e4dc0342d32d050129a27686 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 @@
---- system/org/apache/karaf/features/standard/4.3.3/standard-4.3.3-features.xml.orig   2021-08-23 13:17:26.231520995 +0200
-+++ system/org/apache/karaf/features/standard/4.3.3/standard-4.3.3-features.xml        2021-08-23 13:20:50.730969216 +0200
+--- system/org/apache/karaf/features/standard/4.3.4/standard-4.3.4-features.xml.orig   2021-08-23 13:17:26.231520995 +0200
++++ system/org/apache/karaf/features/standard/4.3.4/standard-4.3.4-features.xml        2021-08-23 13:20:50.730969216 +0200
 @@ -991,9 +991,6 @@ role=admin
-         <bundle start-level="30">mvn:org.apache.sshd/sshd-osgi/2.5.1</bundle>
-         <bundle start-level="30">mvn:org.apache.sshd/sshd-scp/2.5.1</bundle>
-         <bundle start-level="30">mvn:org.apache.sshd/sshd-sftp/2.5.1</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-osgi/2.8.0</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-scp/2.8.0</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-sftp/2.8.0</bundle>
 -      <bundle start-level="30">mvn:org.bouncycastle/bcutil-jdk15on/1.69</bundle>
 -        <bundle start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/1.69</bundle>
 -        <bundle start-level="30">mvn:org.bouncycastle/bcpkix-jdk15on/1.69</bundle>
-         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.3.3</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.3.4</bundle>
      </feature>
 
 @@ -1443,7 +1440,6 @@ org.apache.felix.eventadmin.AddSubject=true
 
-     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="4.3.3">
+     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="4.3.4">
          <feature>jaas</feature>
 -        <bundle dependency="true" start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/1.69</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.3.3</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/4.3.4</bundle>
      </feature>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index aa39ebe95fb323e687025a685090092460a359dc..7913e8c8d012a07501b3ec8a9370dadc8fa617c2 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.3.3</karaf.version>
+    <karaf.version>4.3.4</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -333,7 +333,7 @@
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
         <optional>true</optional>
       </dependency>
       <dependency>
@@ -836,7 +836,7 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.util.function</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -854,7 +854,7 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.util.promise</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -888,87 +888,87 @@
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-forked</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-karaf</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-native</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-extender-service</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-inject</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-invoker-junit</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-features</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <type>xml</type>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-junit4</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-link-mvn</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-link-assembly</artifactId>
-        <version>4.13.4</version>
+        <version>4.13.5</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-link</artifactId>
-        <version>2.6.7</version>
+        <version>2.6.10</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>
-        <version>2.6.7</version>
+        <version>2.6.10</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-wrap</artifactId>
-        <version>2.6.7</version>
+        <version>2.6.10</version>
       </dependency>
 
       <dependency>