From dd6f024b6f8118b44c4378473c49b98440ef0cc3 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Sun, 6 Oct 2024 12:44:53 +0200 Subject: [PATCH] [WIP] Upgrade Karaf from 4.4.6 to 4.4.7 * Sync runtime dependencies with Karaf 4.4.7, most notably: * BouncyCastle 1.78.1 * CXF 3.6.4 * JNA 5.15.0 * JAXB 2.3.9 * commons-io 2.17.0 * commons-lang3 3.17.0 * Upgrade missed ASM dependencies to 9.7.0 Signed-off-by: Holger Friedrich --- launch/app/app.bndrun | 28 ++++++++++++++-------------- pom.xml | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/launch/app/app.bndrun b/launch/app/app.bndrun index a63860629..f8dd4cd0b 100644 --- a/launch/app/app.bndrun +++ b/launch/app/app.bndrun @@ -136,8 +136,8 @@ feature.openhab-model-runtime-all: \ com.google.guava;version='[33.3.0,33.3.1)',\ com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ com.google.inject;version='[7.0.0,7.0.1)',\ - com.sun.jna;version='[5.14.0,5.14.1)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + com.sun.jna;version='[5.15.0,5.15.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ de.focus_shift.jollyday-core;version='[0.32.0,0.32.1)',\ de.focus_shift.jollyday-jackson;version='[0.32.0,0.32.1)',\ io.github.classgraph.classgraph;version='[4.8.174,4.8.175)',\ @@ -157,14 +157,14 @@ feature.openhab-model-runtime-all: \ org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\ - org.apache.commons.commons-io;version='[2.15.1,2.15.2)',\ - org.apache.commons.lang3;version='[3.14.0,3.14.1)',\ - org.apache.cxf.cxf-core;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-rs-client;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-rs-sse;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-security;version='[3.6.2,3.6.3)',\ - org.apache.cxf.cxf-rt-transports-http;version='[3.6.2,3.6.3)',\ + org.apache.commons.commons-io;version='[2.17.0,2.17.1)',\ + org.apache.commons.lang3;version='[3.17.0,3.17.1)',\ + org.apache.cxf.cxf-core;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-rs-client;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-rs-sse;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-security;version='[3.6.4,3.6.5)',\ + org.apache.cxf.cxf-rt-transports-http;version='[3.6.4,3.6.5)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\ org.apache.felix.gogo.runtime;version='[1.1.6,1.1.7)',\ @@ -216,10 +216,10 @@ feature.openhab-model-runtime-all: \ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ org.objectweb.asm;version='[9.7.0,9.7.1)',\ - org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\ - org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\ - org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\ - org.objectweb.asm.util;version='[9.6.0,9.6.1)',\ + org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\ + org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\ + org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\ + org.objectweb.asm.util;version='[9.7.0,9.7.1)',\ org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\ org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.27,8.0.28)',\ org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\ diff --git a/pom.xml b/pom.xml index c43335996..022c612b1 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 4.3.0-SNAPSHOT 4.3.0-SNAPSHOT - 4.4.6 + 4.4.7-SNAPSHOT 17 ${oh.java.version}