You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2022/11/25 21:09:49 UTC
[camel] 07/08: Migration (wip)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch jakarta-jetty
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f71e0daa4b212da5e5b6a4a1e351c28896f1aeb6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 25 17:12:37 2022 +0100
Migration (wip)
---
camel-dependencies/pom.xml | 30 ++++----
components/camel-activemq/pom.xml | 4 +-
components/camel-amqp/pom.xml | 4 +-
components/camel-asn1/pom.xml | 4 +-
components/camel-atmosphere-websocket/pom.xml | 6 +-
components/camel-cdi-jta/pom.xml | 6 +-
components/camel-cdi-main/pom.xml | 6 +-
components/camel-cdi/pom.xml | 12 ++--
.../java/org/apache/camel/cdi/BeanDelegate.java | 5 --
.../org/apache/camel/cdi/CdiCamelExtension.java | 2 +-
.../org/apache/camel/cdi/CdiEventEndpoint.java | 3 +-
.../org/apache/camel/cdi/CdiEventNotifier.java | 4 +-
.../java/org/apache/camel/cdi/SyntheticBean.java | 5 --
components/camel-cometd/pom.xml | 4 +-
components/camel-cxf/camel-cxf-common/pom.xml | 6 +-
components/camel-cxf/camel-cxf-rest/pom.xml | 6 +-
components/camel-cxf/camel-cxf-soap/pom.xml | 6 +-
.../camel-cxf/camel-cxf-spring-common/pom.xml | 6 +-
components/camel-cxf/camel-cxf-transport/pom.xml | 4 +-
components/camel-dozer/pom.xml | 4 +-
components/camel-grpc/pom.xml | 4 +-
components/camel-http-common/pom.xml | 6 +-
components/camel-http/pom.xml | 6 +-
.../jaxb/mapper/DefaultNamespacePrefixMapper.java | 2 +-
components/camel-jbpm/pom.xml | 4 +-
components/camel-jetty-common/pom.xml | 6 +-
components/camel-jetty/pom.xml | 18 ++---
components/camel-jms/pom.xml | 4 +-
components/camel-johnzon/pom.xml | 4 +-
components/camel-jooq/pom.xml | 6 +-
components/camel-jpa/pom.xml | 4 +-
components/camel-jsonb/pom.xml | 8 +--
components/camel-jta/pom.xml | 4 +-
.../camel-microprofile-health/pom.xml | 4 +-
.../camel-microprofile-metrics/pom.xml | 10 +--
components/camel-netty-http/pom.xml | 4 +-
components/camel-openapi-java/pom.xml | 4 +-
components/camel-resteasy/pom.xml | 6 +-
.../camel-salesforce-component/pom.xml | 18 ++---
.../camel-salesforce-maven-plugin/pom.xml | 6 +-
components/camel-servlet/pom.xml | 6 +-
components/camel-sjms/pom.xml | 4 +-
components/camel-sjms2/pom.xml | 4 +-
components/camel-spring-redis/pom.xml | 4 +-
components/camel-spring-ws/pom.xml | 14 ++--
components/camel-spring-xml/pom.xml | 4 +-
.../MagicAnnotationPostProcessor.java | 4 +-
.../camel-test/camel-test-spring-junit5/pom.xml | 2 +-
components/camel-test/camel-test-spring/pom.xml | 2 +-
components/camel-undertow/pom.xml | 8 +--
components/camel-websocket/pom.xml | 4 +-
core/camel-core/pom.xml | 4 +-
dsl/camel-jbang/camel-jbang-core/pom.xml | 6 +-
dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml | 6 +-
.../camel-yaml-dsl-maven-plugin/pom.xml | 4 +-
parent/pom.xml | 81 +++++++++++-----------
pom.xml | 11 +--
tests/camel-itest-cdi/pom.xml | 6 +-
tests/camel-itest/pom.xml | 4 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 4 +-
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 4 +-
.../src/it/simple-dto-v3/pom.xml | 4 +-
.../src/it/simple-dto/pom.xml | 4 +-
.../src/it/simple-xml-dto-v3/pom.xml | 4 +-
.../src/it/simple-xml-dto/pom.xml | 4 +-
.../src/it/simple-yaml-dto-v3/pom.xml | 4 +-
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 4 +-
.../src/it/simple-dto/pom.xml | 4 +-
.../src/it/simple-xml-dto/pom.xml | 4 +-
tooling/openapi-rest-dsl-generator/pom.xml | 4 +-
tooling/swagger-rest-dsl-generator/pom.xml | 4 +-
71 files changed, 237 insertions(+), 244 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 5fa32c2bfb2..158f9ae174a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -95,7 +95,7 @@
<camel.surefire.reuseForks>true</camel.surefire.reuseForks>
<cassandra-driver-version>4.15.0</cassandra-driver-version>
<cassandra-version>4.0.6</cassandra-version>
- <cdi-api-2.0-version>2.0</cdi-api-2.0-version>
+ <jakarta-enterprise-cdi-api-version>4.0.1</jakarta-enterprise-cdi-api-version>
<cglib-version>3.2.12</cglib-version>
<checkstyle.failOnViolation>false</checkstyle.failOnViolation>
<chunk-templates-version>3.6.2</chunk-templates-version>
@@ -185,15 +185,15 @@
<geronimo-j2ee-management-spec-version>1.1</geronimo-j2ee-management-spec-version>
<geronimo-jcdi-1.0-spec-version>1.0</geronimo-jcdi-1.0-spec-version>
<geronimo-jcdi-1.1-spec-version>1.0</geronimo-jcdi-1.1-spec-version>
- <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
- <geronimo-jms2-spec-version>1.0-alpha-2</geronimo-jms2-spec-version>
- <geronimo-jpa-spec-version>1.0-alpha-1</geronimo-jpa-spec-version>
+ <jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
+ <geronimo-jms2-spec-version>${jakarta-jms-api-version}</geronimo-jms2-spec-version>
+ <jakarta-persistence-api-version>3.1.0</jakarta-persistence-api-version>
<geronimo-json-spec-version>1.5</geronimo-json-spec-version>
<geronimo-jsonb-spec-version>1.4</geronimo-jsonb-spec-version>
- <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
+ <jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<glassfish-javax-json>1.0.4</glassfish-javax-json>
- <glassfish-jaxb-runtime-version>2.3.6</glassfish-jaxb-runtime-version>
+ <glassfish-jaxb-runtime-version>4.0.1</glassfish-jaxb-runtime-version>
<gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
<google-api-client-version>1.32.1</google-api-client-version>
<google-api-services-calendar-version>v3-rev20211229-1.32.1</google-api-services-calendar-version>
@@ -260,8 +260,8 @@
<jackson2-version>2.14.1</jackson2-version>
<jakarta-api-version>2.1.5</jakarta-api-version>
<jakarta-cdi-api-version>2.0.2</jakarta-cdi-api-version>
- <jakarta-jaxb-version>2.3.3</jakarta-jaxb-version>
- <jakarta-mail-version>1.6.7</jakarta-mail-version>
+ <jakarta-jaxb-version>4.0.0</jakarta-jaxb-version>
+ <jakarta-mail-version>2.0.1</jakarta-mail-version>
<jakarta.el-version>3.0.3</jakarta.el-version>
<jandex-version>3.0.3</jandex-version>
<jansi-version>2.4.0</jansi-version>
@@ -275,13 +275,13 @@
<javapoet-version>1.11.1</javapoet-version>
<javassist-version>3.28.0-GA</javassist-version>
<javax-activation-version>1.2.0</javax-activation-version>
- <javax-annotation-api-version>1.3.2</javax-annotation-api-version>
+ <jakarta-annotation-api-version>2.1.1</jakarta-annotation-api-version>
<javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
<javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
<javax-el3-version>3.0.0</javax-el3-version>
- <javax-servlet-api-version>3.1.0</javax-servlet-api-version>
- <javax-soap-api-version>1.4.0</javax-soap-api-version>
- <jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version>
+ <jakarta-servlet-api-version>6.0.0</jakarta-servlet-api-version>
+ <javax-soap-api-version>3.0.0</javax-soap-api-version>
+ <jaxb2-maven-plugin-version>3.1.0</jaxb2-maven-plugin-version>
<jaxws-api-version>2.3.0</jaxws-api-version>
<jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
<jboss-logging-version>3.4.3.Final</jboss-logging-version>
@@ -301,8 +301,7 @@
<jettison-version>1.5.2</jettison-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
- <jetty-version>${jetty9-version}</jetty-version>
- <jetty9-version>9.4.49.v20220914</jetty9-version>
+ <jetty-version>11.0.12</jetty-version>
<jgit-version>6.3.0.202209071007-r</jgit-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
@@ -492,9 +491,8 @@
<spring-rabbitmq-version>2.4.7</spring-rabbitmq-version>
<spring-security-version>5.7.5</spring-security-version>
<spring-vault-core-version>2.3.2</spring-vault-core-version>
- <spring-version>${spring5-version}</spring-version>
+ <spring-version>6.0.2</spring-version>
<spring-ws-version>3.1.4</spring-ws-version>
- <spring5-version>5.3.24</spring5-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>3.14.9</squareup-okhttp-version>
<squareup-okio-version>1.17.2</squareup-okio-version>
diff --git a/components/camel-activemq/pom.xml b/components/camel-activemq/pom.xml
index c3612b19b84..f8dd69281b8 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -67,8 +67,8 @@
<artifactId>activemq-pool</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.1.1</version>
<optional>true</optional>
</dependency>
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 289e975cb6a..960ae6f46e2 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -43,8 +43,8 @@
<artifactId>camel-jms</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index e8310c36c57..4cae5dd1d05 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -87,8 +87,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb-api-version}</version>
<optional>true</optional>
</dependency>
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index be86b000280..3861a8c7fb0 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -46,9 +46,9 @@
<artifactId>camel-servlet</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
</dependency>
<!-- atmosphere -->
diff --git a/components/camel-cdi-jta/pom.xml b/components/camel-cdi-jta/pom.xml
index 3159d5caa47..f0d42860b4d 100644
--- a/components/camel-cdi-jta/pom.xml
+++ b/components/camel-cdi-jta/pom.xml
@@ -50,9 +50,9 @@
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta-enterprise-cdi-api-version}</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
diff --git a/components/camel-cdi-main/pom.xml b/components/camel-cdi-main/pom.xml
index 90bb9fae931..c45a787d751 100644
--- a/components/camel-cdi-main/pom.xml
+++ b/components/camel-cdi-main/pom.xml
@@ -50,9 +50,9 @@
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta-enterprise-cdi-api-version}</version>
</dependency>
</dependencies>
</project>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index f249986d64e..899a98cafd1 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -170,9 +170,9 @@
<!-- provided dependencies -->
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta-enterprise-cdi-api-version}</version>
<scope>provided</scope>
</dependency>
@@ -295,9 +295,9 @@
<!-- provided dependencies -->
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta-enterprise-cdi-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
index 68dfff82528..4df66f73f4d 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
@@ -83,11 +83,6 @@ final class BeanDelegate<T> implements Bean<T> {
return delegate.getInjectionPoints();
}
- @Override
- public boolean isNullable() {
- return delegate.isNullable();
- }
-
@Override
public T create(CreationalContext<T> creationalContext) {
return delegate.create(creationalContext);
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index 3714418bd95..917d1e453e8 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -410,7 +410,7 @@ public class CdiCamelExtension implements Extension {
private void afterDeploymentValidation(@Observes AfterDeploymentValidation adv, BeanManager manager) {
// Send event for Camel CDI configuration
- manager.fireEvent(configuration);
+ manager.getEvent().fire(configuration);
configuration.unmodifiable();
Collection<CamelContext> contexts = new ArrayList<>();
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
index c42793df9c8..f44648584b9 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
@@ -156,7 +156,8 @@ public final class CdiEventEndpoint<T> extends DefaultEndpoint {
}
}
- InjectionTarget<AnyEvent> target = manager.createInjectionTarget(manager.createAnnotatedType(AnyEvent.class));
+ InjectionTarget<AnyEvent> target = manager.getInjectionTargetFactory(
+ manager.createAnnotatedType(AnyEvent.class)).createInjectionTarget(null);
CreationalContext<AnyEvent> ctx = manager.createCreationalContext(null);
AnyEvent instance = target.produce(ctx);
target.inject(instance, ctx);
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
index 29ed0d13263..56d90ba760e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
@@ -56,9 +56,9 @@ final class CdiEventNotifier extends EventNotifierSupport {
List<Annotation> annotations = new ArrayList<>();
Collections.addAll(annotations, qualifiers);
annotations.add(NamedLiteral.of(id));
- manager.fireEvent(event, annotations.toArray(new Annotation[0]));
+ manager.getEvent().select(annotations.toArray(new Annotation[0])).fire(event);
} else {
- manager.fireEvent(event, qualifiers);
+ manager.getEvent().select(qualifiers).fire(event);
}
}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
index 825317bb811..7e11cf55205 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
@@ -84,11 +84,6 @@ class SyntheticBean<T> extends SyntheticBeanAttributes<T> implements Bean<T>, Pa
return Collections.emptySet();
}
- @Override
- public boolean isNullable() {
- return false;
- }
-
@Override
public String toString() {
return toString.apply(this);
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index ee7b7a7cd92..69629dbb43d 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -70,8 +70,8 @@
<version>${cometd-java-server}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<!-- Test Dependencies -->
diff --git a/components/camel-cxf/camel-cxf-common/pom.xml b/components/camel-cxf/camel-cxf-common/pom.xml
index 04e2e075464..c0fe544daab 100644
--- a/components/camel-cxf/camel-cxf-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-common/pom.xml
@@ -62,9 +62,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml
index 29babefc081..1aaa7667e7b 100644
--- a/components/camel-cxf/camel-cxf-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-rest/pom.xml
@@ -55,9 +55,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml
index f69dcac0d6e..5cef0ba6240 100644
--- a/components/camel-cxf/camel-cxf-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-soap/pom.xml
@@ -59,9 +59,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-cxf/camel-cxf-spring-common/pom.xml b/components/camel-cxf/camel-cxf-spring-common/pom.xml
index 3b58c7287ac..5d44f40bcca 100644
--- a/components/camel-cxf/camel-cxf-spring-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-common/pom.xml
@@ -62,9 +62,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-cxf/camel-cxf-transport/pom.xml b/components/camel-cxf/camel-cxf-transport/pom.xml
index 2d1a67a23ba..6502eb76945 100644
--- a/components/camel-cxf/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-transport/pom.xml
@@ -60,8 +60,8 @@
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<!-- for testing -->
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index ecb662aa891..bb7c37884fe 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -80,8 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index a5bbd071b83..44d74208baf 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -143,8 +143,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index 83b78299a67..bb0b50b7bec 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -56,9 +56,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index 41f8817b81d..fc4f7e90233 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -50,9 +50,9 @@
<artifactId>camel-file</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
index ba1d5addc6e..01cdf60618f 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
@@ -18,7 +18,7 @@ package org.apache.camel.converter.jaxb.mapper;
import java.util.Map;
-import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
+import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper;
import org.apache.camel.converter.jaxb.JaxbNamespacePrefixMapper;
/**
diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index 5ad5faa8f82..1d4bc389861 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -112,8 +112,8 @@
<version>${jboss-logging-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index d3f3df86518..36d3ae5e531 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -47,9 +47,9 @@
<artifactId>camel-http-common</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 9a6f516e048..f366b010652 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -64,32 +64,32 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<!-- test dependencies -->
@@ -169,8 +169,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 13538c4de2e..c3b38eef683 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -70,8 +70,8 @@
<!-- either use JMS 1.1 or 2.0 provided by JMS client -->
<!-- here we use JMS 2.0 API but using JMS 1.1 should work as well -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml
index 746f2ba87c1..96896d898ee 100644
--- a/components/camel-johnzon/pom.xml
+++ b/components/camel-johnzon/pom.xml
@@ -51,8 +51,8 @@
<version>${johnzon-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
<version>${geronimo-json-spec-version}</version>
<scope>compile</scope>
</dependency>
diff --git a/components/camel-jooq/pom.xml b/components/camel-jooq/pom.xml
index c64ff9ce247..b8a7cb7452b 100644
--- a/components/camel-jooq/pom.xml
+++ b/components/camel-jooq/pom.xml
@@ -49,9 +49,9 @@
</dependency>
<!-- jooq needs this API for its source code generator -->
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${javax-annotation-api-version}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta-annotation-api-version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 9c22cd2b7d8..84e6d966c42 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -53,8 +53,8 @@
<artifactId>spring-orm</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-jsonb/pom.xml b/components/camel-jsonb/pom.xml
index 466192faf9b..e171cda2627 100644
--- a/components/camel-jsonb/pom.xml
+++ b/components/camel-jsonb/pom.xml
@@ -37,13 +37,13 @@
<artifactId>camel-support</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
<version>${geronimo-json-spec-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsonb_1.0_spec</artifactId>
+ <groupId>jakarta.json.bind</groupId>
+ <artifactId>jakarta.json.bind-api</artifactId>
<version>${geronimo-jsonb-spec-version}</version>
</dependency>
diff --git a/components/camel-jta/pom.xml b/components/camel-jta/pom.xml
index 7e444abf7c8..69da967123b 100644
--- a/components/camel-jta/pom.xml
+++ b/components/camel-jta/pom.xml
@@ -49,8 +49,8 @@
<artifactId>camel-core-engine</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/components/camel-microprofile/camel-microprofile-health/pom.xml b/components/camel-microprofile/camel-microprofile-health/pom.xml
index f1800dab34e..f4f4aa57ac6 100644
--- a/components/camel-microprofile/camel-microprofile-health/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-health/pom.xml
@@ -70,8 +70,8 @@
<!-- JSON support for smallrye-health -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
<version>${geronimo-json-spec-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-microprofile/camel-microprofile-metrics/pom.xml b/components/camel-microprofile/camel-microprofile-metrics/pom.xml
index 316682222a2..5379ca89888 100644
--- a/components/camel-microprofile/camel-microprofile-metrics/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-metrics/pom.xml
@@ -52,9 +52,9 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${javax-annotation-api-version}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta-annotation-api-version}</version>
</dependency>
<!-- testing -->
@@ -83,8 +83,8 @@
<!-- JSON support for smallrye-metrics -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
<version>${geronimo-json-spec-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index 5e5e2c68801..d3bf3cc50ae 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -157,8 +157,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-openapi-java/pom.xml b/components/camel-openapi-java/pom.xml
index eae9aac09e6..ae6a764a603 100644
--- a/components/camel-openapi-java/pom.xml
+++ b/components/camel-openapi-java/pom.xml
@@ -85,8 +85,8 @@
<!-- servlet api -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-resteasy/pom.xml b/components/camel-resteasy/pom.xml
index d1705ba367f..2fa7dcae0c7 100644
--- a/components/camel-resteasy/pom.xml
+++ b/components/camel-resteasy/pom.xml
@@ -60,9 +60,9 @@
<version>${resteasy-version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index ae67073f42d..5a345e77e2a 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -47,22 +47,22 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -127,8 +127,8 @@
<version>${commons-lang3-version}</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
@@ -172,19 +172,19 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 794909c1945..c2359b4fa05 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -140,19 +140,19 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 407213ce0ce..b61b6e34ed9 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -46,9 +46,9 @@
<artifactId>camel-http-common</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 886e772212f..c30fe751573 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -42,8 +42,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index 68eade8464d..649e9709164 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -46,8 +46,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
<version>${geronimo-jms2-spec-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 3e44df75e22..f2677f80eab 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -67,8 +67,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 9912b5e7cbd..9426a67de76 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -57,9 +57,9 @@
<artifactId>camel-xslt-saxon</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
<scope>provided</scope>
</dependency>
@@ -80,12 +80,12 @@
<version>${spring-ws-version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/components/camel-spring-xml/pom.xml b/components/camel-spring-xml/pom.xml
index fcb1de909a6..25bb5136ed9 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -135,8 +135,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<!-- logging for testing -->
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
index ad504a6e5d1..3d1bcf6b173 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Field;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
+import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
import org.springframework.stereotype.Component;
import org.springframework.util.ReflectionUtils;
@@ -29,7 +29,7 @@ import org.springframework.util.ReflectionUtils;
* Trivial post processor which sets the value of the annotation to the field it is applied to
*/
@Component
-public class MagicAnnotationPostProcessor extends InstantiationAwareBeanPostProcessorAdapter {
+public class MagicAnnotationPostProcessor implements SmartInstantiationAwareBeanPostProcessor {
protected Logger log = LoggerFactory.getLogger(getClass());
diff --git a/components/camel-test/camel-test-spring-junit5/pom.xml b/components/camel-test/camel-test-spring-junit5/pom.xml
index e383a7796eb..f951ab5279d 100644
--- a/components/camel-test/camel-test-spring-junit5/pom.xml
+++ b/components/camel-test/camel-test-spring-junit5/pom.xml
@@ -36,7 +36,7 @@
<firstVersion>3.0.0</firstVersion>
<label>testing,java,spring</label>
<title>Test Spring JUnit5</title>
- <spring-version>${spring5-version}</spring-version>
+ <spring-version>6.0.2</spring-version>
</properties>
<dependencies>
diff --git a/components/camel-test/camel-test-spring/pom.xml b/components/camel-test/camel-test-spring/pom.xml
index a3eab0547f4..1754bccfbb9 100644
--- a/components/camel-test/camel-test-spring/pom.xml
+++ b/components/camel-test/camel-test-spring/pom.xml
@@ -35,7 +35,7 @@
<properties>
<firstVersion>2.10.0</firstVersion>
<label>testing,java,spring</label>
- <spring-version>${spring5-version}</spring-version>
+ <spring-version>6.0.2</spring-version>
</properties>
<dependencies>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 10044c25c15..d46b1192466 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -150,25 +150,25 @@
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index fdbb936b88c..335888f2c92 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -74,8 +74,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index b3e1c16fb6a..65c9e200310 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -215,8 +215,8 @@
<!-- Used for the exception tests -->
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
<scope>test</scope>
</dependency>
diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml
index fb67cf0c883..c3bae105386 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -85,9 +85,9 @@
</dependency>
<!-- servlet for launching hawtio -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
<optional>true</optional>
</dependency>
diff --git a/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml b/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml
index 344cf8b99c3..6095bb1b8b2 100644
--- a/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml
+++ b/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml
@@ -242,9 +242,9 @@
<dependencies>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta-enterprise-cdi-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index 9eede64186e..9545f20768e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -129,8 +129,8 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
</dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 90740c88f0d..381b943f5e5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -96,7 +96,7 @@
<californium-scandium-version>2.7.4</californium-scandium-version>
<cassandra-driver-version>4.15.0</cassandra-driver-version>
<cassandra-version>4.0.6</cassandra-version>
- <cdi-api-2.0-version>2.0</cdi-api-2.0-version>
+ <jakarta-enterprise-cdi-api-version>4.0.1</jakarta-enterprise-cdi-api-version>
<jta-api-1.2-version>1.2</jta-api-1.2-version>
<cglib-version>3.2.12</cglib-version>
<chunk-templates-version>3.6.2</chunk-templates-version>
@@ -184,12 +184,12 @@
<geronimo-j2ee-management-spec-version>1.1</geronimo-j2ee-management-spec-version>
<geronimo-jcdi-1.0-spec-version>1.0</geronimo-jcdi-1.0-spec-version>
<geronimo-jcdi-1.1-spec-version>1.0</geronimo-jcdi-1.1-spec-version>
- <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
- <geronimo-jms2-spec-version>1.0-alpha-2</geronimo-jms2-spec-version>
- <geronimo-jpa-spec-version>1.0-alpha-1</geronimo-jpa-spec-version>
+ <jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
+ <geronimo-jms2-spec-version>${jakarta-jms-api-version}</geronimo-jms2-spec-version>
+ <jakarta-persistence-api-version>3.1.0</jakarta-persistence-api-version>
<geronimo-json-spec-version>1.5</geronimo-json-spec-version>
<geronimo-jsonb-spec-version>1.4</geronimo-jsonb-spec-version>
- <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
+ <jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
<google-auth-library-oauth2-http-version>1.7.0</google-auth-library-oauth2-http-version>
@@ -271,18 +271,18 @@
<javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
<javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
<javax-activation-version>1.2.0</javax-activation-version>
- <javax-annotation-api-version>1.3.2</javax-annotation-api-version>
- <jakarta-mail-version>1.6.7</jakarta-mail-version>
- <javax-servlet-api-version>3.1.0</javax-servlet-api-version>
+ <jakarta-annotation-api-version>2.1.1</jakarta-annotation-api-version>
+ <jakarta-mail-version>2.0.1</jakarta-mail-version>
+ <jakarta-servlet-api-version>6.0.0</jakarta-servlet-api-version>
<jakarta-cdi-api-version>2.0.2</jakarta-cdi-api-version>
<jakarta-api-version>2.1.5</jakarta-api-version>
<jakarta.el-version>3.0.3</jakarta.el-version>
- <jakarta-jaxb-version>2.3.3</jakarta-jaxb-version>
- <javax-soap-api-version>1.4.0</javax-soap-api-version>
+ <jakarta-jaxb-version>4.0.0</jakarta-jaxb-version>
+ <javax-soap-api-version>3.0.0</javax-soap-api-version>
<jaxws-api-version>2.3.0</jaxws-api-version>
<glassfish-javax-json>1.0.4</glassfish-javax-json>
- <glassfish-jaxb-runtime-version>2.3.6</glassfish-jaxb-runtime-version>
- <jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version>
+ <glassfish-jaxb-runtime-version>4.0.1</glassfish-jaxb-runtime-version>
+ <jaxb2-maven-plugin-version>3.1.0</jaxb2-maven-plugin-version>
<jbpm-version>7.64.0.Final</jbpm-version>
<jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
<jboss-logging-version>3.4.3.Final</jboss-logging-version>
@@ -299,8 +299,7 @@
<jetcd-grpc-version>1.47.0</jetcd-grpc-version>
<jetcd-guava-version>31.1-jre</jetcd-guava-version>
<jetcd-version>0.7.3</jetcd-version>
- <jetty9-version>9.4.49.v20220914</jetty9-version>
- <jetty-version>${jetty9-version}</jetty-version>
+ <jetty-version>11.0.12</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
<jettison-version>1.5.2</jettison-version>
@@ -495,8 +494,7 @@
<spring-integration-version>5.5.15</spring-integration-version>
<spring-ldap-version>2.4.1</spring-ldap-version>
<spring-vault-core-version>2.3.2</spring-vault-core-version>
- <spring-version>${spring5-version}</spring-version>
- <spring5-version>5.3.24</spring5-version>
+ <spring-version>6.0.2</spring-version>
<spring-rabbitmq-version>2.4.7</spring-rabbitmq-version>
<spring-security-version>5.7.5</spring-security-version>
<spring-ws-version>3.1.4</spring-ws-version>
@@ -3380,29 +3378,24 @@
<version>${geronimo-j2ee-management-spec-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-spec-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
- <version>${geronimo-jms2-spec-version}</version>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta-jms-api-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
- <version>${geronimo-jpa-spec-version}</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>${jakarta-persistence-api-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo-jta-spec-version}</version>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${jakarta-transaction-api-version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax-servlet-api-version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta-servlet-api-version}</version>
</dependency>
<!-- Optional Spring Support -->
<dependency>
@@ -4083,9 +4076,9 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${javax-annotation-api-version}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta-annotation-api-version}</version>
</dependency>
<dependency>
@@ -4124,8 +4117,8 @@
</dependency>
<dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
+ <groupId>jakarta.xml.soap</groupId>
+ <artifactId>jakarta.xml.soap-api</artifactId>
<version>${javax-soap-api-version}</version>
</dependency>
</dependencies>
@@ -4160,7 +4153,17 @@
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta-jaxb-version}</version>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb-xjc-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-jxc</artifactId>
+ <version>${jaxb-jxc-version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 62e864231f7..e8230bfcb59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,11 +132,12 @@
<!-- eclipse plugin need the jaxb in this pom.xml file -->
<!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->
- <jaxb-api-version>2.3.1</jaxb-api-version>
- <jaxb-core-version>2.3.0</jaxb-core-version>
- <jaxb-impl-version>2.3.3</jaxb-impl-version>
- <jaxb-osgi-version>2.3.3</jaxb-osgi-version>
- <jaxb-xjc-version>2.3.3</jaxb-xjc-version>
+ <jaxb-api-version>4.0.0</jaxb-api-version>
+ <jaxb-core-version>4.0.1</jaxb-core-version>
+ <jaxb-impl-version>4.0.1</jaxb-impl-version>
+ <jaxb-osgi-version>4.0.1</jaxb-osgi-version>
+ <jaxb-xjc-version>4.0.1</jaxb-xjc-version>
+ <jaxb-jxc-version>4.0.1</jaxb-jxc-version>
<errorprone-version>2.5</errorprone-version>
<mycila-license-version>3.0</mycila-license-version>
<gmavenplus-plugin-version>1.11.1</gmavenplus-plugin-version>
diff --git a/tests/camel-itest-cdi/pom.xml b/tests/camel-itest-cdi/pom.xml
index f58300d000f..aeb30200e08 100644
--- a/tests/camel-itest-cdi/pom.xml
+++ b/tests/camel-itest-cdi/pom.xml
@@ -44,9 +44,9 @@
<!-- CDI API -->
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-2.0-version}</version>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ <version>${jakarta-enterprise-cdi-api-version}</version>
</dependency>
<!-- logging -->
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 68a0dce3a55..9279de1b4df 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -282,8 +282,8 @@
</dependency>
<!-- need to use jta 1.1.1 with Spring 4.x -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<version>1.1.1</version>
<scope>test</scope>
</dependency>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 2fcb1c28047..00c13153cba 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -177,8 +177,8 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
</dependencies>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
index a1651e0218a..47a4e9e9e21 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
@@ -83,8 +83,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version>
<scope>test</scope>
</dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml
index 543d4781b04..4acc83cd12c 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml
@@ -55,8 +55,8 @@
<version>2.8.9</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml
index a8aaf0a1d7c..e15239f438b 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml
@@ -55,8 +55,8 @@
<version>2.8.9</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml
index 38204b8927f..619e865582b 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml
@@ -55,8 +55,8 @@
<version>2.8.9</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml
index a1bb2cce20b..ce4c6e1ce10 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml
@@ -55,8 +55,8 @@
<version>2.8.9</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml
index 2388624adf2..d6a740ef197 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml
@@ -55,8 +55,8 @@
<version>2.8.9</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 69bc6945327..1fb63c383d8 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -77,8 +77,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version>
<scope>test</scope>
</dependency>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
index 1c9a64795e1..40125965bd8 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
@@ -55,8 +55,8 @@
<version>2.8.9</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
index 3f186129bcf..e0f93f47c92 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
@@ -55,8 +55,8 @@
<version>2.8.9</version>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>
diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml
index 819c01fd475..3aae96e3fcf 100644
--- a/tooling/openapi-rest-dsl-generator/pom.xml
+++ b/tooling/openapi-rest-dsl-generator/pom.xml
@@ -71,8 +71,8 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<!-- test -->
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index e49ea06ec7e..a5ac6d50345 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -51,8 +51,8 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<!-- test -->