This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch update-karaf/4_4_6 in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 7319bbc6f501844ad2359f5d3578683cd1a6045a Author: Juan Cabrerizo <[email protected]> AuthorDate: Mon Jul 22 15:14:11 2024 +0200 bump karaf and associated dependencies --- karaf/features/src/main/feature/feature.xml | 8 ++++---- pom.xml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index 1a8a25d66e..d2828e5a0c 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -231,7 +231,7 @@ --> <feature name="brooklyn-rest-resources-prereqs" version="${project.version}" description="Brooklyn REST Resources Prerequisites"> - <feature>pax-jetty</feature> + <feature>pax-web-jetty</feature> <feature>cxf-jaxrs-with-optional-dependencies</feature> <bundle dependency="true">mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}</bundle> @@ -256,7 +256,7 @@ <feature name="cxf-jaxrs-with-optional-dependencies" version="${project.version}" description="cxf-jaxrs with optional dependencies"> <feature>cxf-jaxrs</feature> - + <!-- do this here otherwise causes jackson-jaxrs-json-provider to be rewired when this optional dep is installed --> <bundle dependency="true" start-level="35">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${fasterxml.jackson.version}</bundle> </feature> @@ -344,7 +344,7 @@ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-sshj/${jsch.agentproxy.bundle.version}</bundle> - <!-- upstream dependencies, maybe not needed --> + <!-- upstream dependencies, maybe not needed --> <bundle dependency="true">mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.rs-api.version}</bundle> <!-- was javax; mapped to jakarta --> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_1</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_5</bundle> @@ -444,7 +444,7 @@ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.generex/1.0.2_1</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.automaton/1.11-8_1</bundle> - - these need wrapped because they define Bundle-ManifestVersion: 1 + - these need wrapped because they define Bundle-ManifestVersion: 1 <bundle>wrap:mvn:com.squareup.okio/okio/1.15.0$Bundle-SymbolicName=squareup-okio&Bundle-Version=1.15.0&Export-Package=okio;version=1.15.0</bundle> <bundle>wrap:mvn:com.squareup.okhttp3/okhttp/3.12.6$Bundle-SymbolicName=squareup-okhttp3&Bundle-Version=3.12.6&Import-Package=okio;version=1.15,javax.annotation;version=1.3,*;resolution:=optional</bundle> <bundle>wrap:mvn:com.squareup.okhttp3/logging-interceptor/3.12.6$Bundle-SymbolicName=squareup-okhttp3-logging-interceptor&Bundle-Version=3.12.6&Import-Package=*;resolution:=mandatory</bundle> diff --git a/pom.xml b/pom.xml index 6a6310ac65..aa7e3d176f 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ <!-- Next version of swagger requires changes to how path mapping and scanner injection are done. --> <swagger.version>1.6.2</swagger.version> <mx4j.version>3.0.1</mx4j.version> - <bouncycastle.version>1.72</bouncycastle.version> <!-- beyond this gives asn1 errors, needs a new dep probably --> + <bouncycastle.version>1.77</bouncycastle.version> <!-- beyond this gives asn1 errors, needs a new dep probably --> <eddsa.version>0.3.0</eddsa.version> <!-- eddsa 0.3.0 needs sun x509 --> <sshj.version>0.34.0</sshj.version> <!-- jclouds 2.4 uses 0.27; 0.32 needs eddsa 0.3.0 --> <sshj.asn1.version>0.6.0</sshj.asn1.version> @@ -188,13 +188,13 @@ <kubernetes-client.version>6.8.1</kubernetes-client.version> <!-- 6.9 switches to slf4j v2 which has compatibility issues --> <!-- Dependencies shipped with vanilla karaf; update these when we update the karaf version --> - <karaf.version>4.3.8</karaf.version> + <karaf.version>4.4.6</karaf.version> <karaf.plugin.version>${karaf.version}</karaf.plugin.version> - <pax-web.version>7.3.27</pax-web.version> <!-- karaf 4.3 --> - <jetty.version>9.4.49.v20220914</jetty.version> <!-- pax 7.3.27, there is more recent 9.4.50.v20221201 but no pax --> + <pax-web.version>8.0.27</pax-web.version> <!-- karaf 4.4; pax 9.x.y requires Java 11--> + <jetty.version>9.4.54.v20240208</jetty.version> <!-- pax 7.3.27, there is more recent 9.4.50.v20221201 but no pax --> <commons-collections.version>3.2.2</commons-collections.version> <spifly.version>1.3.2</spifly.version> <!-- 1.3.0 from kubernetes; 1.2.4 from pax-jetty; v1.3.2 from erstwhile jetty feature; but 1.3.2 fixes an NPE bug in 1.3.0 so use it --> - <jaxb-api.version>2.3.3</jaxb-api.version> + <jaxb-api.version>2.3.8</jaxb-api.version> <spifly.version>1.3.5</spifly.version> <!-- v1.3.2 from jetty feature; v1.2.4 from pax-jetty --> <felix.framework.version>6.0.5</felix.framework.version> @@ -210,7 +210,7 @@ <minidev.accessors-smart.version>2.4.9</minidev.accessors-smart.version> <ow2.asm.version.jsonpath>5.2</ow2.asm.version.jsonpath> - <!-- json-path needs objectweb.asm version 5.2 (<6.0.0), and won't accept a bundleReplacement for a higher one; + <!-- json-path needs objectweb.asm version 5.2 (<6.0.0), and won't accept a bundleReplacement for a higher one; in addition currently pax-web-core brings in 8.0.1 and aries-proxy 9.0; the addition of 5.2 triggers a refresh of the wiring of proxy because asm is an optional dependency (even though it's a lower version and it shouldn't);
