Bump karaf to 4.3.1

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

Also upgrade jetty to 9.4.38.v20210224, so as to align with packaged
version.

Change-Id: I0d8dc786f8a6ac277e29ad90a6c79eca94256d9f
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 d23d63701472d218d547f9a60ab2f12586984159..f110570f0bc5257e0a055a11b7ea06b5ff0f0c94 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -125,16 +125,10 @@
                        failonerror="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/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                         token="commons-codec/commons-codec/1.14" value="commons-codec/commons-codec/1.15" 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"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.9/pax-web-features-7.3.9-features.xml"
-                         token="commons-codec/commons-codec/1.14" value="commons-codec/commons-codec/1.15" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.9/pax-web-features-7.3.9-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.13/pax-web-features-7.3.13-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.9/pax-web-features-7.3.9-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.3.9/pax-web-features-7.3.9-features.xml"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.13/pax-web-features-7.3.13-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.3.13/pax-web-features-7.3.13-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-quiesce.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce.patch
index 591a6ffc756121a5ee2314e92e4a9458995fd164..1b39ef3574517c84345420bdfeaaccca022dace4 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce.patch
@@ -2,9 +2,9 @@
 +++ system/org/apache/karaf/features/standard/4.2.0/standard-4.2.0-features.xml        2018-04-03 17:25:24.387151126 +0200
 @@ -48,6 +48,7 @@
          <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/1.0.1</bundle>
-         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.3.1</bundle>
-         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.10.2</bundle>
+         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.3.2</bundle>
+         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.10.3</bundle>
 +        <bundle start-level="20">mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.api/1.0.0</bundle>
          <conditional>
              <condition>bundle</condition>
-             <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/4.2.2</bundle>
+             <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/4.3.1</bundle>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 0da51751d07d4f37d01ec293bad88cd23902b8f8..06a3c7300fc7d9b02e0ba80f2e4a44bdedffd762 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -239,7 +239,7 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-bom</artifactId>
             <type>pom</type>
-            <version>9.4.31.v20200723</version>
+            <version>9.4.38.v20210224</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xtend</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index c488413cb7268f569fb19bf01eab394ab80fa34f..7826b478354e65e0b463562201903455db4f9734 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -44,7 +44,7 @@
     <maven.compiler.release>11</maven.compiler.release>
 
     <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
-    <karaf.version>4.3.0</karaf.version>
+    <karaf.version>4.3.1</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -711,7 +711,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.31.v20200723</version>
+        <version>9.4.38.v20210224</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>