Code Review / odlparent.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: b0ce5eb)
Bump karaf to 4.4.2 59/102759/4
authorRobert Varga <robert.varga@pantheon.tech>
Wed, 19 Oct 2022 07:39:21 +0000 (09:39 +0200)
committerRobert Varga <nite@hq.sk>
Sun, 23 Oct 2022 13:52:49 +0000 (13:52 +0000)
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12352048
https://github.com/eclipse/jetty.project/releases/tag/jetty-9.4.49.v20220914
https://github.com/ops4j/org.ops4j.pax.jdbc/milestone/30?closed=1
https://github.com/ops4j/org.ops4j.pax.url/milestone/77?closed=1

Change-Id: Ic87fa6d66b9418b9b73b3679577b0becfdd14c35
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
features/odl-karaf-feat-jdbc/pom.xml patch | blob | history
karaf/opendaylight-karaf-resources/src/main/patches/karaf-remove-bc.patch patch | blob | history
odlparent-dependency-check/pom.xml patch | blob | history
odlparent/pom.xml patch | blob | history

diff --git a/features/odl-karaf-feat-jdbc/pom.xml b/features/odl-karaf-feat-jdbc/pom.xml
index caa7936401c530bdf8344d03ae2504365c5a42c5..25bd63f83e01925fc7ab613f87fa4979b145f30c 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.3</pax.jdbc.version>
+        <pax.jdbc.version>1.5.4</pax.jdbc.version>
     </properties>
 
     <dependencies>
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 ebced403ed26912d66e3ed0a3d3f8358c27fa270..ca4a8cd8322e338659abe31820e81046a665aaa1 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.1/standard-4.4.1-features.xml.orig   2021-08-23 13:17:26.231520995 +0200
-+++ system/org/apache/karaf/features/standard/4.4.1/standard-4.4.1-features.xml        2021-08-23 13:20:50.730969216 +0200
+--- 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
 @@ -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>
-         <bundle start-level="30">mvn:org.apache.sshd/sshd-sftp/2.8.0</bundle>
+         <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.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.1</bundle>
+         <bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.4.2</bundle>
      </feature>
 
 @@ -1443,7 +1440,6 @@ org.apache.felix.eventadmin.AddSubject=true
diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 558ce8e24a18d446c0726bff379a8b699ad65c48..6f278902eefb8b1c6afc58dd22e077d4102402e0 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -191,7 +191,7 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-bom</artifactId>
             <type>pom</type>
-            <version>9.4.48.v20220622</version>
+            <version>9.4.49.v20220914</version>
         </dependency>
         <dependency>
             <groupId>org.gaul</groupId>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 40e03622aeab5cd5cfb7f2e5e3b087550ec4a626..3ebc634ff4d2bb203c20f72c3c04f9e48a227d63 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.1</karaf.version>
+    <karaf.version>4.4.2</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -614,19 +614,19 @@
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-link</artifactId>
-        <version>2.6.11</version>
+        <version>2.6.12</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>
-        <version>2.6.11</version>
+        <version>2.6.12</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-wrap</artifactId>
-        <version>2.6.11</version>
+        <version>2.6.12</version>
       </dependency>
 
       <dependency>
@@ -673,7 +673,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.48.v20220622</version>
+        <version>9.4.49.v20220914</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
odlparent