WINDUPRULE-945 quarkus3 alias and other feedback implemented (#980)

* WINDUPRULE-945 Set Quarkus version 3.1.0.Final * WINDUPRULE-945 Created 'quarkus3' target alias * WINDUPRULE-945 Suggested 'quarkus-resteasy-reactive' (instead of 'quarkus-resteasy')
windup · Jun 1, 2023 · 983cf9f · 983cf9f
1 parent e37e134
commit 983cf9f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 13 deletions.
diff --git a/rules/rules-reviewed/quarkus/java-ee/javaee-api-to-quarkus.windup.groovy b/rules/rules-reviewed/quarkus/java-ee/javaee-api-to-quarkus.windup.groovy
@@ -25,7 +25,7 @@ import java.util.stream.Collectors
 import java.util.stream.StreamSupport
 
 final IssueCategory mandatoryIssueCategory = new IssueCategoryRegistry().getByID(IssueCategoryRegistry.MANDATORY)
-final Link guideLink = Link.to("Quarkus - Guides", "https://quarkus.io/guides/resteasy")
+final Link guideLink = Link.to("Quarkus - Guides", "https://quarkus.io/guides/resteasy-reactive")
 
 static boolean matchesProject(GraphRewrite event, FileLocationModel payload) {
     final Iterable<? extends WindupVertexFrame> previouslyFound = Optional.ofNullable(Variables.instance(event).findVariable("discard")).orElse(Collections.emptySet())
@@ -57,7 +57,7 @@ ruleSet("javaee-api-to-quarkus-groovy")
                     if (matchesProject(event, payload)) {
                         ((Hint) Hint.titled("Replace JAX-RS dependency")
                             .withText("""
-                            At least one Java class importing from the `javax.ws.rs` package has been found so the dependency `javax:javaee-api` has to be replaced with `io.quarkus:quarkus-resteasy` artifact.  
+                            At least one Java class importing from the `javax.ws.rs` package has been found so the dependency `javax:javaee-api` has to be replaced with `io.quarkus:quarkus-resteasy-reactive` artifact.
                             """)
                             .withIssueCategory(mandatoryIssueCategory)
                             .with(guideLink)

diff --git a/rules/rules-reviewed/quarkus/java-ee/javaee-pom-to-quarkus.windup.xml b/rules/rules-reviewed/quarkus/java-ee/javaee-pom-to-quarkus.windup.xml
@@ -56,7 +56,7 @@
                         <properties>  
                             <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>  
                             <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>  
-                            <quarkus.platform.version>2.16.6.Final</quarkus.platform.version>  
+                            <quarkus.platform.version>3.1.0.Final</quarkus.platform.version>
                         </properties>  
                         <dependencyManagement>  
                             <dependencies>  
@@ -93,7 +93,7 @@
                         ```xml
                         <properties>  
                             <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>  
-                            <quarkus.platform.version>2.16.6.Final</quarkus.platform.version>  
+                            <quarkus.platform.version>3.1.0.Final</quarkus.platform.version>
                         </properties>  
                         <build>
                             <plugins>

diff --git a/rules/rules-reviewed/quarkus/java-ee/jaxrs-to-quarkus.windup.xml b/rules/rules-reviewed/quarkus/java-ee/jaxrs-to-quarkus.windup.xml
@@ -21,9 +21,9 @@
             <perform>
                 <hint title="Replace JAX-RS dependency" effort="1" category-id="mandatory">
                     <message>
-                        Dependency `org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec` has to be replaced with `io.quarkus:quarkus-resteasy` artifact.
+                        Dependency `org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec` has to be replaced with `io.quarkus:quarkus-resteasy-reactive` artifact.
                     </message>
-                    <link title="Quarkus - Guide" href="https://quarkus.io/guides/resteasy" />
+                    <link title="Quarkus - Guide" href="https://quarkus.io/guides/resteasy-reactive" />
                 </hint>
             </perform>
         </rule>
@@ -34,9 +34,9 @@
             <perform>
                 <hint title="Replace JAX-RS dependency" effort="1" category-id="mandatory">
                     <message>
-                        Dependency `javax.ws.rs:javax.ws.rs-api` has to be replaced with `io.quarkus:quarkus-resteasy` artifact.
+                        Dependency `javax.ws.rs:javax.ws.rs-api` has to be replaced with `io.quarkus:quarkus-resteasy-reactive` artifact.
                     </message>
-                    <link title="Quarkus - Guide" href="https://quarkus.io/guides/resteasy" />
+                    <link title="Quarkus - Guide" href="https://quarkus.io/guides/resteasy-reactive" />
                 </hint>
             </perform>
         </rule>

diff --git a/rules/rules-reviewed/quarkus/java-ee/tests/data/helloworld-rs-migrated/pom.xml b/rules/rules-reviewed/quarkus/java-ee/tests/data/helloworld-rs-migrated/pom.xml
@@ -44,7 +44,7 @@
     <properties>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
+        <quarkus.platform.version>3.1.0.Final</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.0.0</surefire-plugin.version>
         <compiler-plugin.version>3.10.1</compiler-plugin.version>
@@ -80,7 +80,7 @@
 
         <dependency>
           <groupId>io.quarkus</groupId>
-          <artifactId>quarkus-resteasy</artifactId>
+          <artifactId>quarkus-resteasy-reactive</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/rules/rules-reviewed/quarkus/java-ee/tests/javaee-api-to-quarkus.windup.test.xml b/rules/rules-reviewed/quarkus/java-ee/tests/javaee-api-to-quarkus.windup.test.xml
@@ -11,7 +11,7 @@
                 <when>
                     <not>
                         <iterable-filter size="1">
-                             <hint-exists message="At least one Java class importing from the `javax.ws.rs` package has been found so the dependency `javax:javaee-api` has to be replaced with `io.quarkus:quarkus-resteasy` artifact."/>
+                             <hint-exists message="At least one Java class importing from the `javax.ws.rs` package has been found so the dependency `javax:javaee-api` has to be replaced with `io.quarkus:quarkus-resteasy-reactive` artifact."/>
                         </iterable-filter>
                     </not>
                 </when>

diff --git a/rules/rules-reviewed/quarkus/java-ee/tests/jaxrs-to-quarkus.windup.test.xml b/rules/rules-reviewed/quarkus/java-ee/tests/jaxrs-to-quarkus.windup.test.xml
@@ -11,7 +11,7 @@
                 <when>
                     <not>
                         <iterable-filter size="1">
-                             <hint-exists message="Dependency `org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec` has to be replaced with `io.quarkus:quarkus-resteasy` artifact."/>
+                             <hint-exists message="Dependency `org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec` has to be replaced with `io.quarkus:quarkus-resteasy-reactive` artifact."/>
                         </iterable-filter>
                     </not>
                 </when>
@@ -23,7 +23,7 @@
                 <when>
                     <not>
                         <iterable-filter size="1">
-                             <hint-exists message="Dependency `javax.ws.rs:javax.ws.rs-api` has to be replaced with `io.quarkus:quarkus-resteasy` artifact."/>
+                             <hint-exists message="Dependency `javax.ws.rs:javax.ws.rs-api` has to be replaced with `io.quarkus:quarkus-resteasy-reactive` artifact."/>
                         </iterable-filter>
                     </not>
                 </when>

diff --git a/rules/rules-reviewed/quarkus/quarkus3.windup.technologytransformer.xml b/rules/rules-reviewed/quarkus/quarkus3.windup.technologytransformer.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<technology-reference-transfomers xmlns="http://windup.jboss.org/schema/jboss-ruleset">
+    <transform>
+        <sourceTechnology id="quarkus3"/>
+        <targetTechnology id="quarkus"/>
+    </transform>
+    <transform>
+        <sourceTechnology id="quarkus3"/>
+        <targetTechnology id="jakarta-ee"/>
+    </transform>
+</technology-reference-transfomers>