Code Review / odlparent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 265aa95)
Bump karaf to 4.4.3 62/103962/3
authorRobert Varga <robert.varga@pantheon.tech>
Sat, 7 Jan 2023 20:57:12 +0000 (21:57 +0100)
committerRobert Varga <nite@hq.sk>
Wed, 11 Jan 2023 01:42:03 +0000 (01:42 +0000)
Karaf 4.4.3:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12352267

Jackson 2.14.1, renaming the feature to odl-jackson-2:
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.14

Jetty 9.4.50.v20221201:
https://github.com/eclipse/jetty.project/releases/tag/jetty-9.4.50.v20221201

Pax-JDBC 1.5.5:
https://github.com/ops4j/org.ops4j.pax.jdbc/milestone/31?closed=1

Change-Id: I04de4cce9c84e2a14790fb71e8ebf65bd6b9773a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
features/features-odlparent/pom.xml patch | blob | history
features/odl-jackson-2/pom.xml [moved from features/odl-jackson-2.13/pom.xml with 95% similarity] patch | blob | history
features/odl-jackson-2/src/main/history/dependencies.xml [moved from features/odl-jackson-2.13/src/main/history/dependencies.xml with 73% similarity] patch | blob | history
features/odl-karaf-feat-jdbc/pom.xml patch | blob | history
features/pom.xml patch | blob | history
karaf/opendaylight-karaf-resources/src/main/patches/karaf-instance.bat.patch patch | blob | history
karaf/opendaylight-karaf-resources/src/main/patches/karaf-remove-bc.patch patch | blob | history
odlparent-artifacts/pom.xml patch | blob | history
odlparent-dependency-check/pom.xml patch | blob | history
odlparent/pom.xml patch | blob | history

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index ff4d4aaace193584c9e49de72303aa234727cc4b..46a7d61d7f68b1b6507d9232c17a726c13939207 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -68,7 +68,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-jackson-2.13</artifactId>
+            <artifactId>odl-jackson-2</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
diff --git a/features/odl-jackson-2.13/pom.xml b/features/odl-jackson-2/pom.xml
similarity index 95%
rename from features/odl-jackson-2.13/pom.xml
rename to features/odl-jackson-2/pom.xml
index d96115a8791a50d6318cf4ca10a63dc2bca296a3..d48c0d0ea702436a2959ad3968c470e664b932f7 100644 (file)
--- a/features/odl-jackson-2.13/pom.xml
+++ b/features/odl-jackson-2/pom.xml
@@ -19,11 +19,11 @@
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-jackson-2.13</artifactId>
+    <artifactId>odl-jackson-2</artifactId>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Jackson 2.13.x</name>
-    <description>Jackson 2.13</description>
+    <name>OpenDaylight :: Jackson 2.14.x</name>
+    <description>Jackson 2.14</description>
 
     <properties>
         <checkDependencyChange>true</checkDependencyChange>
diff --git a/features/odl-jackson-2.13/src/main/history/dependencies.xml b/features/odl-jackson-2/src/main/history/dependencies.xml
similarity index 73%
rename from features/odl-jackson-2.13/src/main/history/dependencies.xml
rename to features/odl-jackson-2/src/main/history/dependencies.xml
index 3a85b4da051cfecf710793b649d8ce8709ce2de9..49553782b1dc36eccba43cde93484fd1a28276fe 100644 (file)
--- a/features/odl-jackson-2.13/src/main/history/dependencies.xml
+++ b/features/odl-jackson-2/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.6.0" name="odl-jackson-2.13">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-jackson-2">
     <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.13.4</bundle>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.13.4</bundle>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.13.4.2</bundle>
-        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.13.4</bundle>
-        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.13.4</bundle>
-        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.13.4</bundle>
-        <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.13.4</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.14.1</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.14.1</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.14.1</bundle>
+        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.1</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.14.1</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.14.1</bundle>
+        <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.14.1</bundle>
     </feature>
 </features>
diff --git a/features/odl-karaf-feat-jdbc/pom.xml b/features/odl-karaf-feat-jdbc/pom.xml
index a214bf2ff46dbd61993f53f3b0199c6dd3531e8b..93401b7d93bb81c87554cccaff0b0ea9b524a520 100644 (file)
--- a/features/odl-karaf-feat-jdbc/pom.xml
+++ b/features/odl-karaf-feat-jdbc/pom.xml
@@ -23,7 +23,7 @@
     <packaging>kar</packaging>
 
     <properties>
-        <pax.jdbc.version>1.5.4</pax.jdbc.version>
+        <pax.jdbc.version>1.5.5</pax.jdbc.version>
     </properties>
 
     <dependencies>
diff --git a/features/pom.xml b/features/pom.xml
index 95d2a4674e234d23c6b3a3f510514708f731ca79..57ccab3831c90529373066651ccee8885aae504c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -42,7 +42,7 @@
         <module>odl-dropwizard-metrics</module>
         <module>odl-gson</module>
         <module>odl-guava</module>
-        <module>odl-jackson-2.13</module>
+        <module>odl-jackson-2</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-instance.bat.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-instance.bat.patch
index d7b39cd73ee8b9f5dde8fd6770fa17403c2b58c0..249c8e9b3295f0dd36e8ba610a85f9b69c71bbc3 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-instance.bat.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-instance.bat.patch
@@ -1,14 +1,16 @@
---- bin/instance.bat.orig      2016-10-27 16:53:50.648351808 +0200
-+++ bin/instance.bat   2016-10-27 16:55:48.295970858 +0200
-@@ -95,6 +95,11 @@
+--- bin/instance.bat.orig      2023-01-07 22:03:53.743876491 +0100
++++ bin/instance.bat   2023-01-07 22:05:18.789871963 +0100
+@@ -108,7 +108,12 @@
  )
 
  set DEFAULT_JAVA_OPTS=
+-set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
 +if not "%ODL_JAVA_SECURITY_PROPERTIES%" == "" (
 +    set DEFAULT_JAVA_OPTS=-Djava.security.properties=%ODL_JAVA_SECURITY_PROPERTIES% %DEFAULT_JAVA_OPTS%
 +) else (
 +    set DEFAULT_JAVA_OPTS=-Djava.security.properties=%KARAF_ETC%\odl.java.security %DEFAULT_JAVA_OPTS%
 +)
- set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
++set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
 
  rem Support for loading native libraries
+ set PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib
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 ca4a8cd8322e338659abe31820e81046a665aaa1..775b190cef3aaf74578499222fd81361d7f09090 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,13 +1,13 @@
---- system/org/apache/karaf/features/standard/4.4.2/standard-4.4.2-features.xml.orig   2021-08-23 13:17:26.231520995 +0200
-+++ system/org/apache/karaf/features/standard/4.4.2/standard-4.4.2-features.xml        2021-08-23 13:20:50.730969216 +0200
+--- system/org/apache/karaf/features/standard/4.4.3/standard-4.4.3-features.xml.orig   2021-08-23 13:17:26.231520995 +0200
++++ system/org/apache/karaf/features/standard/4.4.3/standard-4.4.3-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.9.1</bundle>
-         <bundle start-level="30">mvn:org.apache.sshd/sshd-scp/2.9.1</bundle>
-         <bundle start-level="30">mvn:org.apache.sshd/sshd-sftp/2.9.1</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-osgi/2.9.2</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-scp/2.9.2</bundle>
+         <bundle start-level="30">mvn:org.apache.sshd/sshd-sftp/2.9.2</bundle>
 -      <bundle start-level="30">mvn:org.bouncycastle/bcutil-jdk15on/1.70</bundle>
 -        <bundle start-level="30">mvn:org.bouncycastle/bcprov-jdk15on/1.70</bundle>
 -        <bundle start-level="30">mvn:org.bouncycastle/bcpkix-jdk15on/1.70</bundle>
-         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.4.2</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.4.3</bundle>
      </feature>
 
 @@ -1443,7 +1440,6 @@ org.apache.felix.eventadmin.AddSubject=true
diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index b92f80977a77337322fb638ebfc3b272a588d50f..6ec0bf2a4ad4432e68ce8023255c09ca6aa09083 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -115,7 +115,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-jackson-2.13</artifactId>
+                <artifactId>odl-jackson-2</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 8e8437ccd9cdccb3550ceb30ce4697112e4cf17e..f07bb00d387592d92fc35e96fc80e499e5a6d21e 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.13.4.20221013</version>
+            <version>2.14.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
@@ -191,7 +191,7 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-bom</artifactId>
             <type>pom</type>
-            <version>9.4.49.v20220914</version>
+            <version>9.4.50.v20221201</version>
         </dependency>
         <dependency>
             <groupId>org.gaul</groupId>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 9b2ff9b409b4dc9407580d9e32b207e3ab0f5aa8..9e76092380ca6bb89553215c9f8ea5ee60518482 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.2</karaf.version>
+    <karaf.version>4.4.3</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -327,7 +327,7 @@
       </dependency>
 
       <!-- These three need to be consistent:
-        jackson-2.13.4 needs woodstox-6.3.1+
+        jackson-2.14.1 needs woodstox-6.4.0+
         woodstox-5.3+ needs stax2-api-4.2.x
         -->
       <dependency>
@@ -343,7 +343,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.13.4.20221013</version>
+        <version>2.14.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -662,7 +662,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.49.v20220914</version>
+        <version>9.4.50.v20221201</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
odlparent