diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 02386efe0abc6..b11af9d381566 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -1226,5 +1226,31 @@ + + jakarta-rewrite + + + jakarta-rewrite + + + + + + org.openrewrite.maven + rewrite-maven-plugin + 4.21.0-SNAPSHOT + + ${maven.multiModuleProjectDirectory}/jakarta/rewrite.yml + + + + + io.quarkus.build-parent + + + + + + diff --git a/extensions/hibernate-envers/runtime/pom.xml b/extensions/hibernate-envers/runtime/pom.xml index 95a20ca765e58..2ea1e7707a18f 100644 --- a/extensions/hibernate-envers/runtime/pom.xml +++ b/extensions/hibernate-envers/runtime/pom.xml @@ -40,6 +40,10 @@ + + jakarta.activation + jakarta.activation-api + javax.activation javax.activation-api @@ -77,4 +81,28 @@ + + + + jakarta-rewrite + + + jakarta-rewrite + + + + + + org.openrewrite.maven + rewrite-maven-plugin + + + io.quarkus.hibernate-orm-narayana-switch + + + + + + + diff --git a/extensions/kubernetes-client/runtime/pom.xml b/extensions/kubernetes-client/runtime/pom.xml index 7b6fb3849551e..56471229b8c50 100644 --- a/extensions/kubernetes-client/runtime/pom.xml +++ b/extensions/kubernetes-client/runtime/pom.xml @@ -79,5 +79,28 @@ + + + jakarta-rewrite + + + jakarta-rewrite + + + + + + org.openrewrite.maven + rewrite-maven-plugin + + + io.quarkus.jakarta-jaxb-switch + + + + + + + diff --git a/extensions/security-webauthn/runtime/pom.xml b/extensions/security-webauthn/runtime/pom.xml index eabb71585aa3e..4122e09891c86 100644 --- a/extensions/security-webauthn/runtime/pom.xml +++ b/extensions/security-webauthn/runtime/pom.xml @@ -66,4 +66,28 @@ + + + + jakarta-rewrite + + + jakarta-rewrite + + + + + + org.openrewrite.maven + rewrite-maven-plugin + + + io.quarkus.jakarta-jaxrs-switch + + + + + + + diff --git a/extensions/smallrye-opentracing/runtime/pom.xml b/extensions/smallrye-opentracing/runtime/pom.xml index 2f0ac129cb1c4..5f95e86462535 100644 --- a/extensions/smallrye-opentracing/runtime/pom.xml +++ b/extensions/smallrye-opentracing/runtime/pom.xml @@ -107,4 +107,28 @@ + + + + jakarta-rewrite + + + jakarta-rewrite + + + + + + org.openrewrite.maven + rewrite-maven-plugin + + + io.quarkus.jakarta-jaxrs-switch + + + + + + + diff --git a/jakarta/rewrite.yml b/jakarta/rewrite.yml index 4e0df66ae895b..10dcfefccd33f 100644 --- a/jakarta/rewrite.yml +++ b/jakarta/rewrite.yml @@ -76,6 +76,7 @@ recipeList: oldGroupId: org.hibernate oldArtifactId: hibernate-envers newGroupId: org.hibernate + newArtifactId: hibernate-envers-jakarta - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: oldGroupId: org.hibernate oldArtifactId: hibernate-jpamodelgen @@ -208,6 +209,14 @@ recipeList: artifactId: jakarta.xml.bind-api --- type: specs.openrewrite.org/v1beta/recipe +name: io.quarkus.build-parent +displayName: Adjust build-parent +recipeList: + - org.openrewrite.maven.ChangePropertyValue: + key: subethasmtp.version + newValue: 6.0.1 +--- +type: specs.openrewrite.org/v1beta/recipe name: io.quarkus.jakarta-security displayName: Adjust Javax security dependencies recipeList: @@ -368,6 +377,12 @@ recipeList: - org.openrewrite.maven.ChangePropertyValue: key: smallrye-health.version newValue: 4.0.0-RC2 + - org.openrewrite.maven.ChangePropertyValue: + key: microprofile-jwt.version + newValue: 2.0 + - org.openrewrite.maven.ChangePropertyValue: + key: smallrye-jwt.version + newValue: 4.0.0-RC1 - org.openrewrite.maven.ChangePropertyValue: key: microprofile-metrics-api.version newValue: 4.0.1 @@ -377,17 +392,19 @@ recipeList: - org.openrewrite.maven.ChangePropertyValue: key: smallrye-open-api.version newValue: 3.0.0-RC1 + - org.openrewrite.maven.ChangePropertyValue: + key: microprofile-opentracing-api.version + newValue: 3.0 + - org.openrewrite.maven.ChangePropertyValue: + key: smallrye-opentracing.version + newValue: 3.0.0-RC1 - org.openrewrite.maven.ChangePropertyValue: key: microprofile-rest-client.version newValue: 3.0 # In progress, these ones need a change: -# 2.0 # 1.0.1 -# 1.2 # 1.0 # 1.4.3 -# 2.1.0 -# 3.3.3 # 1.0.13 # 2.6.0 # 2.19.0 diff --git a/jakarta/transform.sh b/jakarta/transform.sh index 6a9807f9feeb1..35253be6f1b27 100755 --- a/jakarta/transform.sh +++ b/jakarta/transform.sh @@ -192,7 +192,7 @@ clean_project ./mvnw -B -pl :quarkus-platform-descriptor-json-plugin -pl :quarkus-bootstrap-maven-plugin -pl :quarkus-enforcer-rules -am clean install -DskipTests -DskipITs -Dinvoker.skip ## we cannot rewrite some of the modules for various reasons but we rewrite most of them -./mvnw -B -e rewrite:run -Denforcer.skip -Dprotoc.skip -Dmaven.main.skip -Dmaven.test.skip -Dforbiddenapis.skip -Dinvoker.skip -pl '!:quarkus-bom-quarkus-platform-descriptor' -pl '!:io.quarkus.gradle.plugin' -pl '!:io.quarkus.extension.gradle.plugin' -pl '!:quarkus-cli' -pl '!:quarkus-documentation' -Dno-test-modules -Drewrite.pomCacheEnabled=false -Djakarta-rewrite +./mvnw -B -e rewrite:run -Denforcer.skip -Dprotoc.skip -Dmaven.main.skip -Dmaven.test.skip -Dforbiddenapis.skip -Dinvoker.skip -pl '!:quarkus-bom-quarkus-platform-descriptor' -pl '!:io.quarkus.gradle.plugin' -pl '!:io.quarkus.extension.gradle.plugin' -pl '!:quarkus-cli' -pl '!:quarkus-documentation' -pl '!:quarkus-integration-tests-parent' -Dno-test-modules -Drewrite.pomCacheEnabled=false -Djakarta-rewrite ## remove banned dependencies remove_banned_dependency "independent-projects/bootstrap" 'javax.inject:javax.inject' 'we allow javax.inject for Maven' @@ -362,7 +362,6 @@ build_module "extensions/smallrye-openapi-common" build_module "extensions/swagger-ui" build_module "extensions/smallrye-openapi" build_module "extensions/smallrye-health" -# TODO: tests are not passing for now, I pinged Jan build_module "extensions/smallrye-metrics" # Persistence @@ -399,12 +398,62 @@ build_module "extensions/reactive-pg-client" build_module "test-framework/vertx" build_module "extensions/hibernate-reactive" +# And now in alphabetical order (dependency aside)... +# TODO apicurio-registry-avro depends on old JAX-RS spec +build_module "extensions/awt" +build_module "extensions/azure-functions-http" +build_module "extensions/cache" +build_module "extensions/config-yaml" +build_module "extensions/kubernetes-client" +build_module "extensions/container-image" +build_module "extensions/elytron-security-jdbc" +build_module "test-framework/ldap" +build_module "extensions/elytron-security-ldap" +build_module "extensions/elytron-security-oauth2" +build_module "extensions/flyway" +build_module "extensions/funqy" +build_module "extensions/google-cloud-functions" +build_module "extensions/google-cloud-functions-http" +build_module "extensions/grpc-common" +build_module "extensions/grpc" +build_module "extensions/hibernate-envers" +build_module "extensions/infinispan-client" +build_module "extensions/jaeger" +build_module "extensions/kafka-client" +build_module "test-framework/junit5-mockito-config" +build_module "test-framework/junit5-mockito" +build_module "extensions/kafka-streams" +build_module "test-framework/keycloak-server" +# TODO we need a keycloak-admin-client-jakarta +#build_module "extensions/keycloak-admin-client" +#build_module "extensions/keycloak-admin-client-reactive" +build_module "extensions/smallrye-jwt-build" +build_module "extensions/oidc-common" +build_module "extensions/oidc" +# TODO we need the quarkus-keycloak-admin-client extension +#build_module "extensions/keycloak-authorization" +build_module "extensions/kubernetes" +build_module "extensions/kubernetes-config" +build_module "extensions/liquibase" +build_module "extensions/reactive-streams-operators" +build_module "extensions/smallrye-opentracing" +build_module "extensions/mongodb-client" +build_module "extensions/liquibase-mongodb" +build_module "extensions/logging-gelf" +build_module "extensions/logging-json" +build_module "extensions/mailer" +build_module "extensions/micrometer" +build_module "extensions/micrometer-registry-prometheus" +# TODO we need a narayana-lra Jakarta extension (dependency of MP spec and CDI spec) +#build_module "extensions/narayana-lra" + exit 0 # These ones require ArC and Mutiny extensions #build_module "test-framework/junit5-mockito-config" #build_module "test-framework/junit5-mockito" + # Dev Tools - needs to be done after all the extensions have been built and before we run the ITs #transform_module "devtools" #build_module_no_tests "devtools" diff --git a/test-framework/kubernetes-client/pom.xml b/test-framework/kubernetes-client/pom.xml index 83db479ebb290..f20fbab296acf 100644 --- a/test-framework/kubernetes-client/pom.xml +++ b/test-framework/kubernetes-client/pom.xml @@ -53,4 +53,28 @@ + + + jakarta-rewrite + + + jakarta-rewrite + + + + + + org.openrewrite.maven + rewrite-maven-plugin + + + io.quarkus.jakarta-jaxrs-switch + + + + + + + + diff --git a/test-framework/openshift-client/pom.xml b/test-framework/openshift-client/pom.xml index 26bbc7cc358c1..d0b24b3899fb9 100644 --- a/test-framework/openshift-client/pom.xml +++ b/test-framework/openshift-client/pom.xml @@ -57,4 +57,28 @@ + + + jakarta-rewrite + + + jakarta-rewrite + + + + + + org.openrewrite.maven + rewrite-maven-plugin + + + io.quarkus.jakarta-jaxrs-switch + + + + + + + +