Merge pull request quarkusio#30822 from gsmet/jakarta-improvements

Some minor Jakarta refinements
gsmet · Feb 2, 2023 · 33e786f · 33e786f
2 parents a9070e8 + 6964567
commit 33e786f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
 }
 
@@ -311,7 +312,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