diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b014b571cb1d8..dd461a0103c3a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,6 +12,8 @@ updates:
allow:
- dependency-name: org.jboss:jboss-parent
- dependency-name: org.jboss.resteasy:*
+ - dependency-name: org.jboss.resteasy.microprofile:*
+ - dependency-name: org.jboss.resteasy.spring:*
- dependency-name: org.apache.activemq:*
- dependency-name: org.flywaydb:*
- dependency-name: org.liquibase:*
@@ -85,9 +87,9 @@ updates:
- dependency-name: net.revelc.code.formatter:formatter-maven-plugin
- dependency-name: net.revelc.code:impsort-maven-plugin
# Narayana
- - dependency-name: org.jboss.narayana.jta:narayana-jta
- - dependency-name: org.jboss.narayana.jts:narayana-jts-integration
- - dependency-name: org.jboss.narayana.stm:stm
+ - dependency-name: org.jboss.narayana.jta:*
+ - dependency-name: org.jboss.narayana.jts:*
+ - dependency-name: org.jboss.narayana.stm:*
# Agroal
- dependency-name: io.agroal:*
# Jandex
@@ -173,6 +175,13 @@ updates:
- dependency-name: org.jboss.jdeparser:jdeparser
- dependency-name: com.github.javaparser:javaparser-core
- dependency-name: com.h2database:h2
+ # Jakarta 9/10 preparation
+ - dependency-name: jakarta.activation:jakarta.activation-api
+ - dependency-name: org.eclipse.angus:angus-activation
+ - dependency-name: org.glassfish.expressly:expressly
+ - dependency-name: com.sun.xml.bind:jaxb-impl
+ - dependency-name: jakarta.xml.bind:jakarta.xml.bind-api
+ - dependency-name: org.eclipse.parsson:*
ignore:
# this one cannot be upgraded due to the usage of proxies in new versions
# the proxy implements interfaces in a random order which causes issues
diff --git a/extensions/amazon-lambda-http/http-event-server/pom.xml b/extensions/amazon-lambda-http/http-event-server/pom.xml
index de659dc116afd..ce287ecaae6a7 100644
--- a/extensions/amazon-lambda-http/http-event-server/pom.xml
+++ b/extensions/amazon-lambda-http/http-event-server/pom.xml
@@ -25,31 +25,11 @@
junit-jupiter
test
-
- org.jboss.resteasy
- resteasy-client
- test
-
-
- commons-logging
- commons-logging
-
-
- jakarta.activation
- jakarta.activation-api
-
-
-
-
io.quarkus
- quarkus-apache-httpclient
+ quarkus-rest-client
test
-
-
-
-
diff --git a/extensions/amazon-lambda-rest/rest-event-server/pom.xml b/extensions/amazon-lambda-rest/rest-event-server/pom.xml
index 81b5fd7b97743..08b1bf6937bc3 100644
--- a/extensions/amazon-lambda-rest/rest-event-server/pom.xml
+++ b/extensions/amazon-lambda-rest/rest-event-server/pom.xml
@@ -29,25 +29,9 @@
junit-jupiter
test
-
- org.jboss.resteasy
- resteasy-client
- test
-
-
- commons-logging
- commons-logging
-
-
- jakarta.activation
- jakarta.activation-api
-
-
-
-
io.quarkus
- quarkus-apache-httpclient
+ quarkus-rest-client
test
diff --git a/extensions/amazon-lambda/event-server/pom.xml b/extensions/amazon-lambda/event-server/pom.xml
index 9c2b5daf911e1..fd946feb65352 100644
--- a/extensions/amazon-lambda/event-server/pom.xml
+++ b/extensions/amazon-lambda/event-server/pom.xml
@@ -35,25 +35,9 @@
junit-jupiter
test
-
- org.jboss.resteasy
- resteasy-client
- test
-
-
- commons-logging
- commons-logging
-
-
- jakarta.activation
- jakarta.activation-api
-
-
-
-
io.quarkus
- quarkus-apache-httpclient
+ quarkus-rest-client
test
diff --git a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapperJsonbSerializer.java b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapperJsonbSerializer.java
index a1d83f4bb3353..8133180e8c0ac 100644
--- a/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapperJsonbSerializer.java
+++ b/extensions/hal/runtime/src/main/java/io/quarkus/hal/HalEntityWrapperJsonbSerializer.java
@@ -6,7 +6,7 @@
import javax.json.bind.serializer.SerializationContext;
import javax.json.stream.JsonGenerator;
-import org.eclipse.yasson.internal.Marshaller;
+import org.eclipse.yasson.internal.ProcessingContext;
import org.eclipse.yasson.internal.model.ClassModel;
import org.eclipse.yasson.internal.model.PropertyModel;
@@ -14,16 +14,16 @@ public class HalEntityWrapperJsonbSerializer implements JsonbSerializerjakarta.activation
jakarta.activation-api
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_2.1_spec
+
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_2.1_spec
+
org.graalvm.nativeimage
svm
@@ -109,4 +121,29 @@
+
+
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-el-switch
+ io.quarkus.jakarta-jaxrs-switch
+
+
+
+
+
+
+
diff --git a/extensions/jaeger/runtime/pom.xml b/extensions/jaeger/runtime/pom.xml
index bdbe0f316b73e..e89669de47d9c 100644
--- a/extensions/jaeger/runtime/pom.xml
+++ b/extensions/jaeger/runtime/pom.xml
@@ -88,4 +88,28 @@
+
+
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
+
diff --git a/extensions/keycloak-admin-client-reactive/runtime/pom.xml b/extensions/keycloak-admin-client-reactive/runtime/pom.xml
index b08464a1c7b8f..99a07da01ba38 100644
--- a/extensions/keycloak-admin-client-reactive/runtime/pom.xml
+++ b/extensions/keycloak-admin-client-reactive/runtime/pom.xml
@@ -21,6 +21,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
org.keycloak
@@ -91,6 +101,7 @@
io.quarkus.keycloak-admin-client
+ io.quarkus.jakarta-angus-activation-switch
diff --git a/extensions/keycloak-admin-client/deployment/pom.xml b/extensions/keycloak-admin-client/deployment/pom.xml
index b5e52aa8d8fac..6275efda60168 100644
--- a/extensions/keycloak-admin-client/deployment/pom.xml
+++ b/extensions/keycloak-admin-client/deployment/pom.xml
@@ -21,6 +21,10 @@
io.quarkus
quarkus-rest-client-deployment
+
+ io.quarkus
+ quarkus-rest-client-jaxb-deployment
+
io.quarkus
quarkus-rest-client-jackson-deployment
diff --git a/extensions/keycloak-admin-client/runtime/pom.xml b/extensions/keycloak-admin-client/runtime/pom.xml
index 56b6603f0e405..404193f91b82d 100644
--- a/extensions/keycloak-admin-client/runtime/pom.xml
+++ b/extensions/keycloak-admin-client/runtime/pom.xml
@@ -22,6 +22,10 @@
io.quarkus
quarkus-rest-client-jackson
+
+ io.quarkus
+ quarkus-rest-client-jaxb
+
org.keycloak
keycloak-adapter-core
@@ -29,6 +33,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
org.keycloak
@@ -38,6 +52,18 @@
org.jboss.resteasy
resteasy-jackson2-provider
+
+ org.jboss.resteasy
+ resteasy-client
+
+
+ org.jboss.resteasy
+ resteasy-jaxb-provider
+
+
+ org.jboss.resteasy
+ resteasy-core-spi
+
commons-logging
commons-logging
@@ -107,6 +133,7 @@
io.quarkus.keycloak-admin-client
+ io.quarkus.jakarta-angus-activation-switch
diff --git a/extensions/keycloak-authorization/runtime/pom.xml b/extensions/keycloak-authorization/runtime/pom.xml
index 79e36e1bcc5c5..20382323f7e58 100644
--- a/extensions/keycloak-authorization/runtime/pom.xml
+++ b/extensions/keycloak-authorization/runtime/pom.xml
@@ -25,6 +25,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
org.keycloak
@@ -70,4 +80,28 @@
+
+
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
+
diff --git a/extensions/mailer/runtime/pom.xml b/extensions/mailer/runtime/pom.xml
index 5d52ce69fba90..1410d16c94311 100644
--- a/extensions/mailer/runtime/pom.xml
+++ b/extensions/mailer/runtime/pom.xml
@@ -44,6 +44,10 @@
com.google.code.findbugs
jsr305
+
+ com.sun.activation
+ jakarta.activation
+
@@ -83,4 +87,28 @@
+
+
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
+
diff --git a/extensions/mongodb-client/runtime/pom.xml b/extensions/mongodb-client/runtime/pom.xml
index a56b768a222b8..d9e0efbdeb740 100644
--- a/extensions/mongodb-client/runtime/pom.xml
+++ b/extensions/mongodb-client/runtime/pom.xml
@@ -128,15 +128,9 @@
RESTEasy context provider. This results in a NoClassDefFoundError running the tests
-->
- org.jboss.resteasy
- resteasy-core
+ io.quarkus
+ quarkus-resteasy
test
-
-
- jakarta.activation
- jakarta.activation-api
-
-
@@ -165,4 +159,4 @@
-
\ No newline at end of file
+
diff --git a/extensions/narayana-lra/runtime/pom.xml b/extensions/narayana-lra/runtime/pom.xml
index ab8cb73232c46..80d5e12e7b252 100644
--- a/extensions/narayana-lra/runtime/pom.xml
+++ b/extensions/narayana-lra/runtime/pom.xml
@@ -99,6 +99,7 @@
io.quarkus.narayana-lra-switch
io.quarkus.jakarta-jaxrs-switch
+ io.quarkus.jakarta-angus-activation-switch
diff --git a/extensions/oidc-client/deployment/pom.xml b/extensions/oidc-client/deployment/pom.xml
index 27153717354b2..a457daeb34f4b 100644
--- a/extensions/oidc-client/deployment/pom.xml
+++ b/extensions/oidc-client/deployment/pom.xml
@@ -58,6 +58,17 @@
org.keycloak
keycloak-core
test
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
+ test
org.awaitility
@@ -224,6 +235,26 @@
-
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/extensions/oidc/deployment/pom.xml b/extensions/oidc/deployment/pom.xml
index 076a2f8be5153..75c1d9329c65b 100644
--- a/extensions/oidc/deployment/pom.xml
+++ b/extensions/oidc/deployment/pom.xml
@@ -48,6 +48,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
org.testcontainers
@@ -143,5 +153,26 @@
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/extensions/panache/hibernate-orm-panache/runtime/pom.xml b/extensions/panache/hibernate-orm-panache/runtime/pom.xml
index 0a61cbfd5ef8f..5eae026f64935 100644
--- a/extensions/panache/hibernate-orm-panache/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-panache/runtime/pom.xml
@@ -127,6 +127,7 @@
io.quarkus.jakarta-jaxb-switch
io.quarkus.hibernate-orm-narayana-switch
+ io.quarkus.jakarta-angus-activation-switch
diff --git a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
index ed4d592c3e087..8f177204ea95c 100644
--- a/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
+++ b/extensions/panache/hibernate-reactive-panache/runtime/pom.xml
@@ -135,6 +135,7 @@
io.quarkus.jakarta-jaxb-switch
io.quarkus.hibernate-orm-narayana-switch
+ io.quarkus.jakarta-angus-activation-switch
diff --git a/extensions/resteasy-classic/rest-client-jaxb/runtime/pom.xml b/extensions/resteasy-classic/rest-client-jaxb/runtime/pom.xml
index 3bc45ffedb4db..73fb21cdfd546 100644
--- a/extensions/resteasy-classic/rest-client-jaxb/runtime/pom.xml
+++ b/extensions/resteasy-classic/rest-client-jaxb/runtime/pom.xml
@@ -24,6 +24,16 @@
org.jboss.resteasy
resteasy-jaxb-provider
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
org.jboss.spec.javax.xml.bind
@@ -68,6 +78,7 @@
io.quarkus.jakarta-jaxb-switch
+ io.quarkus.jakarta-angus-activation-switch
diff --git a/extensions/resteasy-classic/rest-client/runtime/pom.xml b/extensions/resteasy-classic/rest-client/runtime/pom.xml
index 01639e85bc310..5ce4a733fe953 100644
--- a/extensions/resteasy-classic/rest-client/runtime/pom.xml
+++ b/extensions/resteasy-classic/rest-client/runtime/pom.xml
@@ -52,6 +52,10 @@
commons-logging
commons-logging
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
diff --git a/extensions/resteasy-classic/resteasy-common/runtime/pom.xml b/extensions/resteasy-classic/resteasy-common/runtime/pom.xml
index c7df91ed7c572..804ca11a9af0a 100644
--- a/extensions/resteasy-classic/resteasy-common/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-common/runtime/pom.xml
@@ -30,6 +30,10 @@
jakarta.activation
jakarta.activation-api
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
@@ -133,6 +137,7 @@
io.quarkus.resteasy-common
+ io.quarkus.jakarta-angus-activation-switch
diff --git a/extensions/resteasy-classic/resteasy-jaxb/runtime/pom.xml b/extensions/resteasy-classic/resteasy-jaxb/runtime/pom.xml
index 783d38ade51f1..93c1b60353d00 100644
--- a/extensions/resteasy-classic/resteasy-jaxb/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-jaxb/runtime/pom.xml
@@ -24,6 +24,29 @@
org.jboss.resteasy
resteasy-jaxb-provider
+
+
+
+ com.sun.istack
+ istack-commons-runtime
+
+
+ org.glassfish.jaxb
+ jaxb-core
+
+
+ org.glassfish.jaxb
+ txw2
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
org.jboss.spec.javax.xml.bind
@@ -68,6 +91,7 @@
io.quarkus.jakarta-jaxb-switch
+ io.quarkus.jakarta-angus-activation-switch
diff --git a/extensions/resteasy-classic/resteasy-links/deployment/pom.xml b/extensions/resteasy-classic/resteasy-links/deployment/pom.xml
index 6287cd5765d9f..ae01f7e53c9d3 100644
--- a/extensions/resteasy-classic/resteasy-links/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy-links/deployment/pom.xml
@@ -60,4 +60,28 @@
+
+
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-el-switch
+
+
+
+
+
+
+
diff --git a/extensions/resteasy-classic/resteasy-links/runtime/pom.xml b/extensions/resteasy-classic/resteasy-links/runtime/pom.xml
index 0174bba700346..a373ceed2a1cc 100644
--- a/extensions/resteasy-classic/resteasy-links/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-links/runtime/pom.xml
@@ -31,8 +31,20 @@
org.jboss.spec.javax.el
jboss-el-api_3.0_spec
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+ com.sun.activation
+ jakarta.activation
+
io.quarkus
quarkus-hal
@@ -73,4 +85,28 @@
+
+
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
+
diff --git a/extensions/resteasy-classic/resteasy-multipart/runtime/pom.xml b/extensions/resteasy-classic/resteasy-multipart/runtime/pom.xml
index d66bad48ce2b0..2a4a3bb24ef26 100644
--- a/extensions/resteasy-classic/resteasy-multipart/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-multipart/runtime/pom.xml
@@ -34,8 +34,20 @@
jakarta.activation
jakarta.activation-api
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+ com.sun.activation
+ jakarta.activation
+
org.jboss.logging
commons-logging-jboss-logging
@@ -62,4 +74,28 @@
+
+
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
+
diff --git a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml
index 5b1690e20db3f..f9bc83e92c9e7 100644
--- a/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml
+++ b/extensions/resteasy-classic/resteasy-mutiny-common/runtime/pom.xml
@@ -34,6 +34,10 @@
jakarta.activation
jakarta.activation-api
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
diff --git a/extensions/resteasy-classic/resteasy/deployment/pom.xml b/extensions/resteasy-classic/resteasy/deployment/pom.xml
index ab503764f1bdd..f6feb3b1645fd 100644
--- a/extensions/resteasy-classic/resteasy/deployment/pom.xml
+++ b/extensions/resteasy-classic/resteasy/deployment/pom.xml
@@ -68,8 +68,12 @@
test
- jakarta.activation
- jakarta.activation-api
+ org.jboss.resteasy
+ resteasy-core
+
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
diff --git a/extensions/scheduler/runtime/pom.xml b/extensions/scheduler/runtime/pom.xml
index 239a972622c66..28fb25d899677 100644
--- a/extensions/scheduler/runtime/pom.xml
+++ b/extensions/scheduler/runtime/pom.xml
@@ -62,4 +62,27 @@
+
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-el-switch
+
+
+
+
+
+
+
diff --git a/extensions/spring-web/resteasy-classic/runtime/pom.xml b/extensions/spring-web/resteasy-classic/runtime/pom.xml
index 4efa9155568a2..121d9554dea66 100644
--- a/extensions/spring-web/resteasy-classic/runtime/pom.xml
+++ b/extensions/spring-web/resteasy-classic/runtime/pom.xml
@@ -30,6 +30,10 @@
jakarta.activation
jakarta.activation-api
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
diff --git a/integration-tests/keycloak-authorization/pom.xml b/integration-tests/keycloak-authorization/pom.xml
index a1dc465de7da1..89aa96d57ce33 100644
--- a/integration-tests/keycloak-authorization/pom.xml
+++ b/integration-tests/keycloak-authorization/pom.xml
@@ -59,6 +59,14 @@
jakarta.activation
jakarta.activation-api
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
+
+ com.sun.activation
+ jakarta.activation
+
diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml
index 966356cb77d49..a36d00a99985a 100644
--- a/integration-tests/main/pom.xml
+++ b/integration-tests/main/pom.xml
@@ -112,6 +112,10 @@
jakarta.activation
jakarta.activation-api
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
diff --git a/integration-tests/oidc-client-reactive/pom.xml b/integration-tests/oidc-client-reactive/pom.xml
index c1782fdba8822..df325a3ba3045 100644
--- a/integration-tests/oidc-client-reactive/pom.xml
+++ b/integration-tests/oidc-client-reactive/pom.xml
@@ -26,6 +26,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
@@ -289,7 +299,27 @@
-
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/integration-tests/oidc-client/pom.xml b/integration-tests/oidc-client/pom.xml
index 6626a90f50a41..1bd735aa1c17f 100644
--- a/integration-tests/oidc-client/pom.xml
+++ b/integration-tests/oidc-client/pom.xml
@@ -27,6 +27,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
@@ -259,7 +269,27 @@
-
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/integration-tests/oidc-code-flow/pom.xml b/integration-tests/oidc-code-flow/pom.xml
index 6bc8bab4abfad..4600259665044 100644
--- a/integration-tests/oidc-code-flow/pom.xml
+++ b/integration-tests/oidc-code-flow/pom.xml
@@ -58,6 +58,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
io.rest-assured
@@ -302,6 +312,27 @@
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/integration-tests/oidc-tenancy/pom.xml b/integration-tests/oidc-tenancy/pom.xml
index 54ffe9d514353..dbf58957e44cc 100644
--- a/integration-tests/oidc-tenancy/pom.xml
+++ b/integration-tests/oidc-tenancy/pom.xml
@@ -37,6 +37,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
@@ -266,7 +276,27 @@
-
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/integration-tests/oidc-token-propagation/pom.xml b/integration-tests/oidc-token-propagation/pom.xml
index 36e49370363d9..7e73b6dd3fba9 100644
--- a/integration-tests/oidc-token-propagation/pom.xml
+++ b/integration-tests/oidc-token-propagation/pom.xml
@@ -22,6 +22,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
@@ -175,7 +185,27 @@
-
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/integration-tests/oidc/pom.xml b/integration-tests/oidc/pom.xml
index cfcee425cb1de..d625e07cd8300 100644
--- a/integration-tests/oidc/pom.xml
+++ b/integration-tests/oidc/pom.xml
@@ -35,6 +35,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
io.quarkus
@@ -181,7 +191,27 @@
-
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/integration-tests/rest-client/pom.xml b/integration-tests/rest-client/pom.xml
index 3b1aa6a0bd4c9..2521d5ab11f91 100644
--- a/integration-tests/rest-client/pom.xml
+++ b/integration-tests/rest-client/pom.xml
@@ -46,6 +46,14 @@
jakarta.activation
jakarta.activation-api
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
+
+ com.sun.activation
+ jakarta.activation
+
diff --git a/integration-tests/smallrye-context-propagation/pom.xml b/integration-tests/smallrye-context-propagation/pom.xml
index ffa1780547fa7..65c7d9cc7930d 100644
--- a/integration-tests/smallrye-context-propagation/pom.xml
+++ b/integration-tests/smallrye-context-propagation/pom.xml
@@ -55,6 +55,10 @@
jakarta.activation
jakarta.activation-api
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_3.0_spec
+
diff --git a/integration-tests/smallrye-jwt-oidc-webapp/pom.xml b/integration-tests/smallrye-jwt-oidc-webapp/pom.xml
index 13dc8a1bd4c38..d61917f1ecae1 100644
--- a/integration-tests/smallrye-jwt-oidc-webapp/pom.xml
+++ b/integration-tests/smallrye-jwt-oidc-webapp/pom.xml
@@ -26,6 +26,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
@@ -256,7 +266,27 @@
-
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/integration-tests/smallrye-jwt-token-propagation/pom.xml b/integration-tests/smallrye-jwt-token-propagation/pom.xml
index ca85c5bde0620..eead619e88381 100644
--- a/integration-tests/smallrye-jwt-token-propagation/pom.xml
+++ b/integration-tests/smallrye-jwt-token-propagation/pom.xml
@@ -26,6 +26,16 @@
org.keycloak
keycloak-core
+
+
+ com.sun.activation
+ jakarta.activation
+
+
+
+
+ com.sun.activation
+ jakarta.activation
@@ -273,7 +283,27 @@
-
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-switch
+
+
+
+
+
+
diff --git a/jakarta/rewrite.yml b/jakarta/rewrite.yml
index f8c0faf950844..c499fc4b91ce9 100644
--- a/jakarta/rewrite.yml
+++ b/jakarta/rewrite.yml
@@ -12,9 +12,19 @@ name: io.quarkus.jakarta-versions
displayName: Adjust Jakarta versions
recipeList:
# Activation
+ - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
+ oldGroupId: com.sun.activation
+ oldArtifactId: jakarta.activation
+ newGroupId: org.eclipse.angus
+ newArtifactId: angus-activation
+ newVersion: "${angus-activation.version}"
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.activation.version
- newValue: 2.0.1
+ newValue: 2.1.0
+ - org.openrewrite.maven.ChangePropertyValue:
+ key: angus-activation.version
+ newValue: 1.0.0
+ addIfMissing: true
# Annotation
- org.openrewrite.maven.ChangePropertyValue:
key: version.jakarta-annotation
@@ -23,9 +33,27 @@ recipeList:
key: jakarta.annotation-api.version
newValue: 2.0.0
# EL
+ - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
+ oldGroupId: org.glassfish
+ oldArtifactId: jakarta.el
+ newGroupId: org.glassfish.expressly
+ newArtifactId: expressly
+ newVersion: "${expressly.version}"
+ - org.openrewrite.maven.RemoveProperty:
+ propertyName: jakarta.el-impl.version
- org.openrewrite.maven.ChangePropertyValue:
- key: jakarta.el-impl.version
- newValue: 4.0.2
+ key: expressly.version
+ newValue: 5.0.0
+ addIfMissing: true
+ # TODO once ArC is aligned, we can remove this one
+ - org.openrewrite.maven.AddManagedDependency:
+ groupId: jakarta.el
+ artifactId: jakarta.el-api
+ version: "${jakarta.el-api.version}"
+ - org.openrewrite.maven.ChangePropertyValue:
+ key: jakarta.el-api.version
+ newValue: 5.0.0
+ addIfMissing: true
# CDI
- org.openrewrite.maven.ChangePropertyValue:
key: version.cdi
@@ -44,16 +72,16 @@ recipeList:
# JAX-RS - See below for the specs
- org.openrewrite.maven.ChangePropertyValue:
key: resteasy.version
- newValue: 6.0.0.Final
+ newValue: 6.0.3.Final
# JAXB - See below
# JSON - See below
# JSON Bind
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.json.bind-api.version
- newValue: 2.0.0
+ newValue: 3.0.0
- org.openrewrite.maven.ChangePropertyValue:
key: yasson.version
- newValue: 2.0.4
+ newValue: 3.0.1
# JPA
- org.openrewrite.maven.ChangePropertyValue:
key: version.jpa
@@ -97,7 +125,9 @@ recipeList:
newGroupId: org.hibernate
newArtifactId: quarkus-local-cache-jakarta
# Mail
- # TODO: move to Angus artifacts
+ # TODO At some point we should move to the Angus artifacts BUT
+ # the only thing using Jakarta Mail is subethasmtp
+ # so let's wait for it to switch to Angus Mail.
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.mail.version
newValue: 2.0.1
@@ -138,7 +168,7 @@ recipeList:
newValue: 3.0.1
- org.openrewrite.maven.ChangePropertyValue:
key: hibernate-validator.version
- newValue: 7.0.4.Final
+ newValue: 8.0.0.CR3
# Websockets
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.websocket-api.version
@@ -146,10 +176,10 @@ recipeList:
# XML Bind
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.xml.bind-api.version
- newValue: 3.0.1
+ newValue: 4.0.0
- org.openrewrite.maven.ChangePropertyValue:
key: jaxb-runtime.version
- newValue: 3.0.2
+ newValue: 4.0.0
# WildFly Security
- org.openrewrite.maven.ChangePropertyValue:
key: wildfly-elytron.version
@@ -164,16 +194,16 @@ recipeList:
artifactId: jakarta.xml.bind-api
version: "${jakarta.xml.bind-api.version}"
- org.openrewrite.maven.AddManagedDependency:
- groupId: org.jboss.spec.javax.ws.rs
- artifactId: jboss-jaxrs-api_3.0_spec
- version: "${jboss-jaxrs-api_3.0_spec.version}"
+ groupId: jakarta.ws.rs
+ artifactId: jakarta.ws.rs-api
+ version: "${jakarta.ws.rs-api.version}"
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.xml.bind-api.version
- newValue: 3.0.1
+ newValue: 4.0.0
addIfMissing: true
- org.openrewrite.maven.ChangePropertyValue:
- key: jboss-jaxrs-api_3.0_spec.version
- newValue: 1.0.1.Final
+ key: jakarta.ws.rs-api.version
+ newValue: 3.0.0
addIfMissing: true
---
type: specs.openrewrite.org/v1beta/recipe
@@ -198,8 +228,8 @@ recipeList:
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
oldGroupId: org.jboss.spec.javax.ws.rs
oldArtifactId: jboss-jaxrs-api_2.1_spec
- newGroupId: org.jboss.spec.javax.ws.rs
- newArtifactId: jboss-jaxrs-api_3.0_spec
+ newGroupId: jakarta.ws.rs
+ newArtifactId: jakarta.ws.rs-api
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.exclude-javax-jaxrs
@@ -208,6 +238,9 @@ recipeList:
- org.openrewrite.maven.ExcludeDependency:
groupId: org.jboss.spec.javax.ws.rs
artifactId: jboss-jaxrs-api_2.1_spec
+ - org.openrewrite.maven.ExcludeDependency:
+ groupId: org.jboss.spec.javax.ws.rs
+ artifactId: jboss-jaxrs-api_3.0_spec
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.jakarta-jaxb-switch
@@ -223,6 +256,38 @@ recipeList:
artifactId: jakarta.xml.bind-api
---
type: specs.openrewrite.org/v1beta/recipe
+name: io.quarkus.jakarta-el-switch
+displayName: Switch JAX-RS version
+recipeList:
+ - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
+ oldGroupId: org.glassfish
+ oldArtifactId: jakarta.el
+ newGroupId: org.glassfish.expressly
+ newArtifactId: expressly
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: io.quarkus.jakarta-angus-activation-switch
+displayName: Switch JAX-RS version
+recipeList:
+ - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
+ oldGroupId: com.sun.activation
+ oldArtifactId: jakarta.activation
+ newGroupId: org.eclipse.angus
+ newArtifactId: angus-activation
+
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: io.quarkus.jakarta-angus-activation-exclude-add
+displayName: Switch JAX-RS version
+recipeList:
+ - org.openrewrite.maven.ExcludeDependency:
+ groupId: com.sun.activation
+ artifactId: jakarta.activation
+ - org.openrewrite.maven.AddDependencyNoQuestionsAsked:
+ groupId: org.eclipse.angus
+ artifactId: angus-activation
+---
+type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.jakarta-json-cleanup
displayName: Clean up Jakarta JSON dependencies
recipeList:
@@ -242,7 +307,7 @@ recipeList:
version: "${parsson.version}"
- org.openrewrite.maven.ChangePropertyValue:
key: parsson.version
- newValue: 1.0.0
+ newValue: 1.1.1
addIfMissing: true
- org.openrewrite.maven.ChangePropertyValue:
key: jboss-logmanager.version
@@ -540,6 +605,9 @@ recipeList:
- org.openrewrite.maven.ChangePropertyValue:
key: microprofile-jwt-auth-tck.version
newValue: 2.1-RC2
+ - org.openrewrite.maven.ChangePropertyValue:
+ key: microprofile-lra-tck.version
+ newValue: 2.0-RC1
- org.openrewrite.maven.ChangePropertyValue:
key: microprofile-metrics-tck.version
newValue: 4.0.1
@@ -663,6 +731,12 @@ recipeList:
- org.openrewrite.maven.AddDependencyNoQuestionsAsked:
groupId: org.jboss.resteasy.microprofile
artifactId: microprofile-config
+ - org.openrewrite.maven.ExcludeDependency:
+ groupId: org.jboss.spec.javax.ws.rs
+ artifactId: jboss-jaxrs-api_3.0_spec
+ - org.openrewrite.maven.AddDependencyNoQuestionsAsked:
+ groupId: jakarta.ws.rs
+ artifactId: jakarta.ws.rs-api
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.bom.resteasy-spring-web
@@ -698,6 +772,12 @@ recipeList:
oldArtifactId: resteasy-client-microprofile
newGroupId: org.jboss.resteasy.microprofile
newArtifactId: microprofile-rest-client
+ - org.openrewrite.maven.ExcludeDependency:
+ groupId: org.jboss.spec.javax.ws.rs
+ artifactId: jboss-jaxrs-api_3.0_spec
+ - org.openrewrite.maven.AddDependencyNoQuestionsAsked:
+ groupId: jakarta.ws.rs
+ artifactId: jakarta.ws.rs-api
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.keycloak-admin-client
diff --git a/jakarta/transform.sh b/jakarta/transform.sh
index bb99036f79e05..06358fabd50f7 100755
--- a/jakarta/transform.sh
+++ b/jakarta/transform.sh
@@ -34,7 +34,7 @@ if [ "${REWRITE_OFFLINE-false}" != "true" ]; then
# Build Kotlin Maven Plugin to allow skipping main compilation
# (skipping test compilation is supported but not main)
rm -rf target/kotlin
- git clone -b v1.6.21-jakarta --depth 1 https://github.com/gsmet/kotlin.git target/kotlin
+ git clone -b v1.7.10-jakarta --depth 1 https://github.com/gsmet/kotlin.git target/kotlin
pushd target/kotlin/libraries/tools/kotlin-maven-plugin
mvn -B clean install -DskipTests -DskipITs
popd
@@ -210,13 +210,16 @@ remove_banned_dependency "independent-projects/extension-maven-plugin" 'javax.an
remove_banned_dependency "independent-projects/tools" 'javax.inject:javax.inject' 'we allow javax.inject for Maven'
remove_banned_dependency "independent-projects/tools" 'javax.annotation:javax.annotation-api' 'we allow javax.annotation-api for Maven'
update_banned_dependency "independent-projects/resteasy-reactive" 'jakarta.xml.bind:jakarta.xml.bind-api' 'org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec'
+update_banned_dependency "independent-projects/resteasy-reactive" 'jakarta.ws.rs:jakarta.ws.rs-api' 'org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec'
remove_banned_dependency "build-parent" 'javax.inject:javax.inject' 'we allow javax.inject for Maven'
remove_banned_dependency "build-parent" 'javax.annotation:javax.annotation-api' 'we allow javax.annotation-api for Maven'
update_banned_dependency "build-parent" 'jakarta.xml.bind:jakarta.xml.bind-api' 'org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec'
# TODO: due to an issue in the MicroProfile REST Client, we cannot exclude jakarta.ws.rs:jakarta.ws.rs-api yet
#update_banned_dependency_advanced "build-parent" 'jakarta.ws.rs:jakarta.ws.rs-api' "jakarta.ws.rs:jakarta.ws.rs-api\n org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec"
-update_banned_dependency_advanced "build-parent" 'jakarta.ws.rs:jakarta.ws.rs-api' "\n org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec"
+update_banned_dependency_advanced "build-parent" 'jakarta.ws.rs:jakarta.ws.rs-api' "org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec\n org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec"
update_banned_dependency_advanced "build-parent" 'jakarta.json:jakarta.json-api' "jakarta.json:jakarta.json-api\n org.glassfish:jakarta.json"
+sed -i 's@@@g' 'build-parent/pom.xml'
+update_banned_dependency "build-parent" 'jakarta.activation:jakarta.activation-api' 'com.sun.activation:jakarta.activation'
## some additional wild changes to clean up at some point
sed -i 's@FilterConfigSourceImpl@FilterConfigSource@g' extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java
@@ -295,6 +298,7 @@ sed -i 's/@javax.annotation.Generated/@jakarta.annotation.Generated/g' extension
sed -i 's/javax.ws.rs.core.Application/jakarta.ws.rs.core.Application/g' integration-tests/elytron-undertow/src/main/resources/META-INF/web.xml
sed -i 's/javax.inject.Singleton/jakarta.inject.Singleton/g' integration-tests/main/src/main/resources/application.properties
sed -i 's@jakarta.xml.bind:jakarta.xml.bind-api@org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec@g' extensions/jaxb/runtime/pom.xml
+sed -i 's@jakarta.ws.rs:jakarta.ws.rs-api@org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec\n org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec@g' extensions/resteasy-classic/resteasy-common/runtime/pom.xml
rm extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/graal/{Target_org_jboss_resteasy_microprofile_config_FilterConfigSource.java,Target_org_jboss_resteasy_microprofile_config_ServletConfigSource.java,Target_org_jboss_resteasy_microprofile_config_ServletContextConfigSource.java,ServletMissing.java}
sed -i 's@javax.enterprise.context.Dependent@jakarta.enterprise.context.Dependent@g' tcks/microprofile-rest-client-reactive/pom.xml
@@ -332,6 +336,7 @@ sed -i 's@kafka-avro@@g' in
sed -i 's@infinispan-client@@g' integration-tests/pom.xml
./mvnw -B clean install -f integration-tests -DskipTests -DskipITs
+./mvnw -B clean install -f tcks -DskipTests -DskipITs
exit 0
diff --git a/test-framework/keycloak-server/pom.xml b/test-framework/keycloak-server/pom.xml
index 7ad759bd581c8..237e1ca9c2203 100644
--- a/test-framework/keycloak-server/pom.xml
+++ b/test-framework/keycloak-server/pom.xml
@@ -45,4 +45,28 @@
+
+
+ jakarta-rewrite
+
+
+ jakarta-rewrite
+
+
+
+
+
+ org.openrewrite.maven
+ rewrite-maven-plugin
+
+
+ io.quarkus.jakarta-angus-activation-exclude-add
+
+
+
+
+
+
+
+