Skip to content

WINDUPRULE-945 quarkus3 alias and other feedback implemented #980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhilipCattanach merged 3 commits into from
Jun 1, 2023
Merged

WINDUPRULE-945 quarkus3 alias and other feedback implemented #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
861e78b
WINDUPRULE-945 Set Quarkus version 3.1.0.Final
mrizzi Jun 1, 2023
56a9eba
WINDUPRULE-945 Created 'quarkus3' target alias
mrizzi Jun 1, 2023
e7ec19c
WINDUPRULE-945 Suggested 'quarkus-resteasy-reactive' (instead of 'qua…
mrizzi Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rules/rules-reviewed/quarkus/java-ee/javaee-api-to-quarkus.windup.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions rules/rules-reviewed/quarkus/java-ee/javaee-pom-to-quarkus.windup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions rules/rules-reviewed/quarkus/java-ee/jaxrs-to-quarkus.windup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions rules/rules-reviewed/quarkus/java-ee/tests/data/helloworld-rs-migrated/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -80,7 +80,7 @@

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy</artifactId>
<artifactId>quarkus-resteasy-reactive</artifactId>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion rules/rules-reviewed/quarkus/java-ee/tests/javaee-api-to-quarkus.windup.test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions rules/rules-reviewed/quarkus/java-ee/tests/jaxrs-to-quarkus.windup.test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions rules/rules-reviewed/quarkus/quarkus3.windup.technologytransformer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>