Bump karaf to 4.3.6

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

Change-Id: I3cdc93c8c96d586cb1e148ff2ac12dbbcb3e30a0
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 55db6c200e252002fab91bf91711e75a91d86505..e5d2483a5e6c9e217904e3a23db7ba76f127e300 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -93,15 +93,11 @@
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-instance.patch"
                        originalfile="${project.build.directory}/assembly/bin/instance"
                        failonerror="true"/>
-                <replace file="${project.build.directory}/assembly/bin/instance"
-                         token="2.0.13" value="2.0.14" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/bin/instance"
                       tofile="${project.build.directory}/classes/bin/instance"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-instance.bat.patch"
                        originalfile="${project.build.directory}/assembly/bin/instance.bat"
                        failonerror="true" ignorewhitespace="true"/>
-                <replace file="${project.build.directory}/assembly/bin/instance.bat"
-                         token="2.0.13" value="2.0.14" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/bin/instance.bat"
                       tofile="${project.build.directory}/classes/bin/instance.bat"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-inc.patch"
@@ -129,14 +125,6 @@
                        failonerror="true"/>
                 <copy file="${project.build.directory}/assembly/bin/setenv.bat"
                       tofile="${project.build.directory}/classes/bin/setenv.bat"/>
-                <replace file="${project.build.directory}/assembly/bin/shell"
-                         token="2.0.13" value="2.0.14" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/bin/shell"
-                      tofile="${project.build.directory}/classes/bin/shell"/>
-                <replace file="${project.build.directory}/assembly/bin/shell.bat"
-                         token="2.0.13" value="2.0.14" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/bin/shell.bat"
-                      tofile="${project.build.directory}/classes/bin/shell.bat"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce.patch"
                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                        failonerror="true"/>
@@ -145,12 +133,8 @@
                        failonerror="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"/>
-                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
-                         token="2.0.13" value="2.0.14" failOnNoReplacements="true"/>
                 <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/etc/startup.properties"
-                         token="2.0.13" value="2.0.14" failOnNoReplacements="true"/>
                 <!-- 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 159253fa1c8905834fd670c05c379ef2f8eea30c..53d7df090018c58ef79f3511196837d6dc56ff6c 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,5 +1,5 @@
---- system/org/apache/karaf/features/standard/4.3.5/standard-4.3.5-features.xml.orig   2021-08-23 13:17:26.231520995 +0200
-+++ system/org/apache/karaf/features/standard/4.3.5/standard-4.3.5-features.xml        2021-08-23 13:20:50.730969216 +0200
+--- system/org/apache/karaf/features/standard/4.3.6/standard-4.3.6-features.xml.orig   2021-08-23 13:17:26.231520995 +0200
++++ system/org/apache/karaf/features/standard/4.3.6/standard-4.3.6-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.8.0</bundle>
          <bundle start-level="30">mvn:org.apache.sshd/sshd-scp/2.8.0</bundle>
@@ -7,14 +7,14 @@
 -      <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.5</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.3.6</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.5">
+     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="4.3.6">
          <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.5</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/4.3.6</bundle>
      </feature>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index a08ca228c1f6836848331f599da1683793e9480a..e51cc4fb417ca2874006171d77bae67ee3c3f282 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.5</karaf.version>
+    <karaf.version>4.3.6</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -113,22 +113,6 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <!-- Override pax-logging version, remove when we have karaf-4.3.6+ -->
-      <dependency>
-        <groupId>org.ops4j.pax.logging</groupId>
-        <artifactId>pax-logging-api</artifactId>
-        <version>2.0.14</version>
-      </dependency>
-      <dependency>
-        <groupId>org.ops4j.pax.logging</groupId>
-        <artifactId>pax-logging-log4j1</artifactId>
-        <version>2.0.14</version>
-      </dependency>
-      <dependency>
-        <groupId>org.ops4j.pax.logging</groupId>
-        <artifactId>pax-logging-log4j2</artifactId>
-        <version>2.0.14</version>
-      </dependency>
 
       <!-- Build tool dependencies (normally not here in <dependencies>,
            but in a <dependency> in <pluginManagement> but for Checkstyle this