From 376827ba9e1422fe0e63cccb04ca067c7e8b214e Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 2 Feb 2023 13:25:01 +0100 Subject: [PATCH 1/2] Jakarta - Remove remaining javax instances in doc --- docs/src/main/asciidoc/resteasy-reactive.adoc | 3 ++- jakarta/transform.sh | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/resteasy-reactive.adoc b/docs/src/main/asciidoc/resteasy-reactive.adoc index d27aa03e9356b..45ecdb31be79e 100644 --- a/docs/src/main/asciidoc/resteasy-reactive.adoc +++ b/docs/src/main/asciidoc/resteasy-reactive.adoc @@ -13,6 +13,7 @@ include::_attributes.adoc[] :mutinyapi: https://javadoc.io/doc/io.smallrye.reactive/mutiny/1.6.0 :httpspec: https://tools.ietf.org/html/rfc7231 :jsonpapi: https://javadoc.io/doc/javax.json/javax.json-api/1.1.4 +:injectapi: https://javadoc.io/static/jakarta.inject/jakarta.inject/1 :vertxapi: https://javadoc.io/doc/io.vertx/vertx-core/latest/index.html :resteasy-reactive-api: https://javadoc.io/doc/io.quarkus.resteasy.reactive/resteasy-reactive/{quarkus-version} :resteasy-reactive-common-api: https://javadoc.io/doc/io.quarkus.resteasy.reactive/resteasy-reactive-common/{quarkus-version} @@ -1068,7 +1069,7 @@ public class Endpoint { ---- You can also inject those context objects using -https://javadoc.io/static/javax.inject/javax.inject/1/javax/inject/Inject.html[`@Inject`] on fields of the same +{injectapi}/javax/inject/Inject.html[`@Inject`] on fields of the same type: [source,java] diff --git a/jakarta/transform.sh b/jakarta/transform.sh index 46dc48bc7f47d..f966ae1fd0d7d 100755 --- a/jakarta/transform.sh +++ b/jakarta/transform.sh @@ -311,7 +311,12 @@ find integration-tests/gradle -name build.gradle | xargs sed -i 's/javax.ws.rs.P transform_documentation sed -i 's@javax/ws/rs@jakarta/ws/rs@g' docs/src/main/asciidoc/resteasy-reactive.adoc +sed -i 's@javax/json@jakarta/json@g' docs/src/main/asciidoc/resteasy-reactive.adoc +sed -i 's@javax/inject@jakarta/inject@g' docs/src/main/asciidoc/resteasy-reactive.adoc sed -i 's@https://javadoc.io/doc/jakarta.ws.rs/jakarta.ws.rs-api/2.1.1@https://javadoc.io/doc/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0@g' docs/src/main/asciidoc/resteasy-reactive.adoc +sed -i 's@https://javadoc.io/doc/io.smallrye.reactive/mutiny/1.6.0@https://javadoc.io/doc/io.smallrye.reactive/mutiny/2.1.0@g' docs/src/main/asciidoc/resteasy-reactive.adoc +sed -i 's@https://javadoc.io/doc/javax.json/javax.json-api/1.1.4@https://javadoc.io/doc/jakarta.json/jakarta.json-api/2.1.1@g' docs/src/main/asciidoc/resteasy-reactive.adoc +sed -i 's@https://javadoc.io/static/jakarta.inject/jakarta.inject/1@https://javadoc.io/static/jakarta.inject/jakarta.inject-api/2.0.1@g' docs/src/main/asciidoc/resteasy-reactive.adoc sed -i 's@/specs/jaxrs/2.1/index.html@https://jakarta.ee/specifications/restful-ws/3.1/jakarta-restful-ws-spec-3.1.html@g' docs/src/main/asciidoc/resteasy-reactive.adoc # Clean some Transformer issues From 696456724b6cb0071116b16e135f14b778e0f68a Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Thu, 2 Feb 2023 15:06:55 +0100 Subject: [PATCH 2/2] Jakarta - Kotlin - Also transform all-open annotations in pom files --- jakarta/transform.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/jakarta/transform.sh b/jakarta/transform.sh index f966ae1fd0d7d..4f4ac5243a309 100755 --- a/jakarta/transform.sh +++ b/jakarta/transform.sh @@ -79,6 +79,7 @@ transform_kotlin_module () { find $1 -name '*.kt' | xargs --no-run-if-empty sed -i "s@import ${package}@import ${newPackage}@g" find $1 -name '*.kts' | xargs --no-run-if-empty sed -i "s@annotation(\"${package}@annotation(\"${newPackage}@g" find $1 -name 'build*.gradle' | xargs --no-run-if-empty sed -i "s@annotation(\"${package}@annotation(\"${newPackage}@g" + find $1 -name 'pom*.xml' | grep -v 'integration-tests/simple' | xargs --no-run-if-empty sed -i "s@annotation=${package}@annotation=${newPackage}@g" done }