Bump Karaf to 4.3.7

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

Also bumps Jetty to 9.4.46:
https://github.com/eclipse/jetty.project/releases/tag/jetty-9.4.44.v20210927
https://github.com/eclipse/jetty.project/releases/tag/jetty-9.4.45.v20220203
https://github.com/eclipse/jetty.project/releases/tag/jetty-9.4.46.v20220331

Also bumps Jackson to 2.13.2:
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.13
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.13.1
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.13.2

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

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index e94148fc8fe33530216fb7bb22645140ea3c0429..b99b9984552fe8c6c9e69472debc037868c206a9 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -80,7 +80,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-jackson-2.12</artifactId>
+            <artifactId>odl-jackson-2.13</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features/odl-jackson-2.12/pom.xml b/features/odl-jackson-2.13/pom.xml
similarity index 95%
rename from features/odl-jackson-2.12/pom.xml
rename to features/odl-jackson-2.13/pom.xml
index e5d81c13057c8653ce3b0bbbc6108bada5eaa6ff..4495f2da26cccc91342fd5ff323f46bb955ba1ab 100644 (file)
--- a/features/odl-jackson-2.12/pom.xml
+++ b/features/odl-jackson-2.13/pom.xml
@@ -19,11 +19,11 @@
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-jackson-2.12</artifactId>
+    <artifactId>odl-jackson-2.13</artifactId>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Jackson 2.12.x</name>
-    <description>Jackson 2.12</description>
+    <name>OpenDaylight :: Jackson 2.13.x</name>
+    <description>Jackson 2.13</description>
 
     <properties>
         <checkDependencyChange>true</checkDependencyChange>

diff --git a/features/odl-jackson-2.12/src/main/history/dependencies.xml b/features/odl-jackson-2.13/src/main/history/dependencies.xml
similarity index 67%
rename from features/odl-jackson-2.12/src/main/history/dependencies.xml
rename to features/odl-jackson-2.13/src/main/history/dependencies.xml
index 537d6d69044863b4048ad85cffbd9da36845a017..e6544bb79dce98c4d94788a3f92b99ac7d8a9f57 100644 (file)
--- a/features/odl-jackson-2.12/src/main/history/dependencies.xml
+++ b/features/odl-jackson-2.13/src/main/history/dependencies.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jackson-2.9">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-jackson-2.13">
     <feature version="0.0.0">
         <feature>odl-jakarta-activation-api</feature>
         <feature>odl-woodstox</feature>
         <feature>odl-ws-rs-api</feature>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.12.6</bundle>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.12.6</bundle>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.12.6</bundle>
-        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.12.6</bundle>
-        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.12.6</bundle>
-        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.12.6</bundle>
-        <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.12.6</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.13.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.13.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.13.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.13.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.13.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.13.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.13.2</bundle>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 0b1905ceb65996a219b73ffa718d73ccababd8c6..e9ac1367cf3c0ee279727c19807a1f487894a28d 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -44,7 +44,7 @@
         <module>odl-dropwizard-metrics</module>
         <module>odl-gson</module>
         <module>odl-guava</module>
-        <module>odl-jackson-2.12</module>
+        <module>odl-jackson-2.13</module>
         <module>odl-jakarta-activation-api</module>
         <module>odl-javassist-3</module>
         <module>odl-jersey-2</module>

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 53d7df090018c58ef79f3511196837d6dc56ff6c..f3192cf41d4bf4da7cfd982c33b377f543970790 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.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
+--- system/org/apache/karaf/features/standard/4.3.7/standard-4.3.7-features.xml.orig   2021-08-23 13:17:26.231520995 +0200
++++ system/org/apache/karaf/features/standard/4.3.7/standard-4.3.7-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.6</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.3.7</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.6">
+     <feature name="spring-security-crypto-encryption" description="Advanced encryption support for Karaf security" version="4.3.7">
          <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.6</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/4.3.7</bundle>
      </feature>

diff --git a/karaf/test-static/pom.xml b/karaf/test-static/pom.xml
index 5b823ee6e5ab7f31722144d6bdbc818f16645096..98641b6ea2b1d32d80557b5ca58c62fa4cb2d6b7 100644 (file)
--- a/karaf/test-static/pom.xml
+++ b/karaf/test-static/pom.xml
@@ -35,7 +35,7 @@
                         <startupFeature>odl-dropwizard-metrics</startupFeature>
                         <startupFeature>odl-gson</startupFeature>
                         <startupFeature>odl-guava</startupFeature>
-                        <startupFeature>odl-jackson-2.12</startupFeature>
+                        <startupFeature>odl-jackson-2.13</startupFeature>
                         <startupFeature>odl-jakarta-activation-api</startupFeature>
                         <startupFeature>odl-jetty-2</startupFeature>
                         <!-- FIXME: needs https://issues.apache.org/jira/browse/KARAF-6573

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 8fa7900bdf22153da959d78dd15a140fc79de9a3..b8e4736ebad8f135abd3fec7f155f25bc3c1af07 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -129,7 +129,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-jackson-2.12</artifactId>
+                <artifactId>odl-jackson-2.13</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 50121dd47f7f36db7444654ef00140b1b926dac7..5dc564886de6c752b72f518de767c9b171f5b232 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -45,7 +45,7 @@
             <groupId>com.fasterxml.jackson</groupId>
             <artifactId>jackson-bom</artifactId>
             <type>pom</type>
-            <version>2.12.6</version>
+            <version>2.13.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
@@ -235,7 +235,7 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-bom</artifactId>
             <type>pom</type>
-            <version>9.4.43.v20210629</version>
+            <version>9.4.46.v20220331</version>
         </dependency>
         <dependency>
             <groupId>org.gaul</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index c4da019dec07499f8aedec9256c45c3766115125..530deb5eb76ac6dd3c3606829e00ca286cf7803c 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.6</karaf.version>
+    <karaf.version>4.3.7</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -373,7 +373,7 @@
       </dependency>
 
       <!-- These three need to be consistent:
-        jackson-2.12.6 needs woodstox-6.2.4+
+        jackson-2.13.2 needs woodstox-6.2.4+
         woodstox-5.3+ needs stax2-api-4.2.x
         -->
       <dependency>
@@ -389,7 +389,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.12.6</version>
+        <version>2.13.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -1028,7 +1028,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.43.v20210629</version>
+        <version>9.4.46.v20220331</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>