diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml index e1fe0b8fcb0..5d496b2e822 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -173,7 +173,7 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos mvn:jakarta.transaction/jakarta.transaction-api/2.0.1 mvn:io.smallrye/jandex/3.2.0 mvn:com.fasterxml/classmate/1.5.1 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version} + mvn:tools.jackson.dataformat/jackson-dataformat-xml/${jackson.version} mvn:org.codehaus.woodstox/stax2-api/4.2.2 mvn:com.fasterxml.woodstox/woodstox-core/7.1.0 mvn:jakarta.json/jakarta.json-api/2.1.3 @@ -181,7 +181,7 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos mvn:jakarta.json.bind/jakarta.json.bind-api/3.0.1 mvn:org.eclipse/yasson/3.0.4 wrap:mvn:org.hibernate.models/hibernate-models/1.1.0 - wrap:mvn:org.hibernate.orm/hibernate-core/${hibernate.version}$overwrite=merge&Import-Package=oracle.jdbc.*;resolution:=optional,oracle.sql.*;resolution:=optional,org.postgresql.*;resolution:=optional,tools.jackson.*;resolution:=optional,* + wrap:mvn:org.hibernate.orm/hibernate-core/${hibernate.version}$overwrite=merge&Import-Package=oracle.jdbc.*;resolution:=optional,oracle.sql.*;resolution:=optional,org.postgresql.*;resolution:=optional,com.fasterxml.jackson.*;resolution:=optional,javax.transaction.*;resolution:=optional,* mvn:jakarta.interceptor/jakarta.interceptor-api/2.2.0 mvn:jakarta.validation/jakarta.validation-api/3.1.0 mvn:jakarta.xml.bind/jakarta.xml.bind-api/${spec.jaxb-api.version} @@ -193,8 +193,8 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos hibernate - mvn:org.hibernate.orm/hibernate-envers/${hibernate.version} - + wrap:mvn:org.hibernate.orm/hibernate-envers/${hibernate.version}$overwrite=merge&Import-Package=javax.transaction.*;resolution:=optional,* + mvn:org.hibernate.validator/hibernate-validator/${hibernate.validator.version} diff --git a/assemblies/features/specs/src/main/feature/feature.xml b/assemblies/features/specs/src/main/feature/feature.xml index 95c071d9679..7ce2842b425 100644 --- a/assemblies/features/specs/src/main/feature/feature.xml +++ b/assemblies/features/specs/src/main/feature/feature.xml @@ -74,38 +74,22 @@ mvn:jakarta.mail/jakarta.mail-api/${spec.mail.version} - - - mvn:com.fasterxml.jackson.core/jackson-core/2.18.3 - mvn:com.fasterxml.jackson.core/jackson-annotations/2.18.3 - mvn:com.fasterxml.jackson.core/jackson-databind/2.18.3 - - - - jackson - jaxrs - jakarta.annotation - mvn:org.yaml/snakeyaml/2.5 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.18.3 - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.18.3 - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.18.3 - - - + - mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} + mvn:tools.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version} - mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} + mvn:tools.jackson.core/jackson-databind/${jackson.version} jackson jaxrs jakarta.annotation - mvn:org.yaml/snakeyaml/2.5 - mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.version} - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version} - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version} + mvn:jakarta.ws.rs/jakarta.ws.rs-api/3.1.0 + mvn:org.snakeyaml/snakeyaml-engine/3.0.1 + mvn:tools.jackson.dataformat/jackson-dataformat-yaml/${jackson.version} + mvn:tools.jackson.jakarta.rs/jackson-jakarta-rs-base/${jackson.version} + mvn:tools.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/${jackson.version} diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml index 62a9da91317..7c9816473d5 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -108,9 +108,9 @@ spring-tx spring-web mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation.version} - mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} + mvn:tools.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version} - mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} + mvn:tools.jackson.core/jackson-databind/${jackson.version} mvn:io.micrometer/micrometer-commons/1.12.4 mvn:io.micrometer/micrometer-observation/1.12.4 mvn:jakarta.annotation/jakarta.annotation-api/2.1.1 @@ -123,6 +123,11 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security62.version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security62.version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security62.version} + + mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version} + mvn:com.fasterxml.jackson.core/jackson-core/${jackson.deprecated.version} + mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.deprecated.version} + diff --git a/docker/pom.xml b/docker/pom.xml index f4b16c45833..79346c4c06c 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -55,7 +55,7 @@ org.osgi.framework - com.fasterxml.jackson.core + tools.jackson.core jackson-databind ${jackson.version} @@ -104,7 +104,8 @@ org.apache.karaf.docker;-noimport:=true - com.fasterxml.jackson*;version="[2,3)", + tools.jackson*;version="[3,4)", + com.fasterxml.jackson.annotation;version="[2,3)", org.osgi.framework;version="[1,3)", * diff --git a/docker/src/main/java/org/apache/karaf/docker/DockerClient.java b/docker/src/main/java/org/apache/karaf/docker/DockerClient.java index 0856e1aaf8b..ca40eef805d 100644 --- a/docker/src/main/java/org/apache/karaf/docker/DockerClient.java +++ b/docker/src/main/java/org/apache/karaf/docker/DockerClient.java @@ -16,8 +16,8 @@ */ package org.apache.karaf.docker; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml b/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml index 46b81abb470..61c655a2d6d 100644 --- a/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml +++ b/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml @@ -30,10 +30,13 @@ mvn:org.reactivestreams/reactive-streams/1.0.4 mvn:com.graphql-java/graphql-java/22.3 - mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version} - mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} - mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson.version} + + mvn:tools.jackson.core/jackson-core/${jackson.version} + mvn:tools.jackson.core/jackson-databind/${jackson.version} + + mvn:com.fasterxml.jackson.core/jackson-core/${jackson.deprecated.version} + mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.deprecated.version} mvn:jakarta.servlet/jakarta.servlet-api/6.1.0 mvn:jakarta.websocket/jakarta.websocket-api/2.2.0 mvn:jakarta.websocket/jakarta.websocket-client-api/2.2.0 diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/src/main/resources/OSGI-INF/blueprint/rest.xml b/examples/karaf-rest-example/karaf-rest-example-blueprint/src/main/resources/OSGI-INF/blueprint/rest.xml index d768082fe01..b9edae3f02e 100644 --- a/examples/karaf-rest-example/karaf-rest-example-blueprint/src/main/resources/OSGI-INF/blueprint/rest.xml +++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/src/main/resources/OSGI-INF/blueprint/rest.xml @@ -37,7 +37,7 @@ - + diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml index aefd5c27053..c106d3f8ceb 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml @@ -54,7 +54,7 @@ 4.1.2 - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider ${jackson.version} diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java index a9db15a0eb9..ec7792993d2 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java @@ -16,7 +16,7 @@ */ package org.apache.karaf.examples.rest.client.cxf; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.karaf.examples.rest.api.Booking; import org.apache.karaf.shell.api.action.Action; diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListAllBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListAllBookingCommand.java index e6e2698b180..aeeb989db33 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListAllBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListAllBookingCommand.java @@ -23,7 +23,7 @@ import java.util.LinkedList; import java.util.List; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.karaf.examples.rest.api.Booking; diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListBookingCommand.java index 919f6225be0..bbf3eae399a 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListBookingCommand.java @@ -16,7 +16,7 @@ */ package org.apache.karaf.examples.rest.client.cxf; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.karaf.examples.rest.api.Booking; import org.apache.karaf.shell.api.action.Action; diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml index 3a9edc5f8f0..2470787712c 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml @@ -51,8 +51,8 @@ 4.0.0 - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + tools.jackson.jakarta.rs + jackson-jakarta-rs-json-provider ${jackson.version} diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/AddBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/AddBookingCommand.java index 6655cd9bbeb..ffe0a6ab1bf 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/AddBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/AddBookingCommand.java @@ -16,7 +16,7 @@ */ package org.apache.karaf.examples.rest.client.jersey; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.karaf.examples.rest.api.Booking; import org.apache.karaf.shell.api.action.Action; import org.apache.karaf.shell.api.action.Argument; diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/ListBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/ListBookingCommand.java index 9f01880033b..80680ccea02 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/ListBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/ListBookingCommand.java @@ -16,7 +16,7 @@ */ package org.apache.karaf.examples.rest.client.jersey; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.karaf.examples.rest.api.Booking; import org.apache.karaf.shell.api.action.Action; import org.apache.karaf.shell.api.action.Command; diff --git a/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml b/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml index 829378285e4..c45eb35bdb5 100644 --- a/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml +++ b/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml @@ -30,11 +30,11 @@ osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService) aries-blueprint cxf-jaxrs - mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} + mvn:tools.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version} - mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version} - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version} + mvn:tools.jackson.core/jackson-databind/${jackson.version} + mvn:tools.jackson.jakarta.rs/jackson-jakarta-rs-base/${jackson.version} + mvn:tools.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/${jackson.version} mvn:org.apache.karaf.examples/karaf-rest-example-blueprint/${project.version} @@ -66,12 +66,12 @@ osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService) scr cxf-jaxrs - mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} + mvn:tools.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version} - mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} - mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version} - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version} - mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version} + mvn:tools.jackson.core/jackson-databind/${jackson.version} + mvn:tools.jackson.module/jackson-module-jakarta-xmlbind-annotations/${jackson.version} + mvn:tools.jackson.jakarta.rs/jackson-jakarta-rs-base/${jackson.version} + mvn:tools.jackson.jakarta.rs/jackson-jakarta-rs-json-provider/${jackson.version} mvn:org.apache.karaf.examples/karaf-rest-example-scr/${project.version} diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml index 14537a7b8bb..8a29ce0bc21 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml @@ -71,7 +71,7 @@ ${project.version} - com.fasterxml.jackson.jakarta.rs + tools.jackson.jakarta.rs jackson-jakarta-rs-json-provider ${jackson.version} diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/RestService.java b/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/RestService.java index ec28c88fcb3..ea16a1a0fed 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/RestService.java +++ b/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/RestService.java @@ -16,7 +16,7 @@ */ package org.apache.karaf.examples.rest.scr; -import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; +import tools.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/features/core/pom.xml b/features/core/pom.xml index 23a089cbade..a88f727d792 100644 --- a/features/core/pom.xml +++ b/features/core/pom.xml @@ -180,7 +180,7 @@ jaxb-runtime - com.fasterxml.jackson.core + tools.jackson.core jackson-databind ${jackson.version} @@ -251,7 +251,8 @@ org.ops4j.pax.swissbox.*, org.ops4j.util.*, org.ops4j.lang.*, - com.fasterxml.jackson* + com.fasterxml.jackson*, + tools.jackson* org.apache.karaf.util;inline="org/apache/karaf/util/XmlUtils*.class" diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/JacksonUtil.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/JacksonUtil.java index 950cd307db8..97a62f03058 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/model/JacksonUtil.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/JacksonUtil.java @@ -16,7 +16,7 @@ */ package org.apache.karaf.features.internal.model; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/itests/test/src/test/java/org/apache/karaf/itests/examples/GraphQLExampleTest.java b/itests/test/src/test/java/org/apache/karaf/itests/examples/GraphQLExampleTest.java index e6c66c59964..f635df833a9 100644 --- a/itests/test/src/test/java/org/apache/karaf/itests/examples/GraphQLExampleTest.java +++ b/itests/test/src/test/java/org/apache/karaf/itests/examples/GraphQLExampleTest.java @@ -13,8 +13,8 @@ */ package org.apache.karaf.itests.examples; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import tools.jackson.databind.node.JsonNodeFactory; +import tools.jackson.databind.node.ObjectNode; import org.apache.karaf.itests.BaseTest; import org.apache.karaf.itests.util.SimpleSocket; import org.eclipse.jetty.websocket.client.WebSocketClient; diff --git a/pom.xml b/pom.xml index 48422c5d2d9..3992455ff5e 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,8 @@ 3.2.9_1 3.6.10 2.21 - 2.21.3 + 3.1.2 + 2.21.3 5.18.1 4.0.7 1.9.4