Skip to content
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

Jakarta rewrite infrastructure #24584

Merged
merged 7 commits into from
Mar 28, 2022
Merged

Jakarta rewrite infrastructure #24584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8b2992
Remove quarkus-jsonp-deployment dependency from test-framework/common
gsmet Mar 27, 2022
562dbcc
Move unpack-dependencies to prepare-package in core/launcher
gsmet Mar 27, 2022
dc713e3
Add OpenRewrite infrastructure and rewrite the bootstrap module
gsmet Mar 24, 2022
340ac5f
Use a new approach by running OpenRewrite globally
gsmet Mar 27, 2022
dc586be
Add documentation for Jakarta rewrite
gsmet Mar 28, 2022
eb7171c
Set export REWRITE_OFFLINE=true to disable fetching external projects
gsmet Mar 28, 2022
4c31674
Switch to SmallRye Config 3.0.0-RC2
gsmet Mar 28, 2022
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
34 changes: 34 additions & 0 deletions bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5743,6 +5743,40 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.maven.javax.managed</recipe>
<recipe>io.quarkus.maven.javax.versions</recipe>
<recipe>io.quarkus.jakarta-versions</recipe>
<recipe>io.quarkus.jakarta-jaxrs-jaxb</recipe>
<recipe>io.quarkus.jakarta-security</recipe>
<recipe>io.quarkus.smallrye</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>rewrite-cleanup</id>
<build>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.jakarta-jaxrs-jaxb-cleanup</recipe>
<recipe>io.quarkus.jakarta-security-cleanup</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion core/launcher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<executions>
<execution>
<id>unpack-dependencies</id>
<phase>process-classes</phase>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
Expand Down
9 changes: 9 additions & 0 deletions extensions/arc/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.extensions.arc</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</project>
5 changes: 5 additions & 0 deletions extensions/reactive-routes/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
<artifactId>quarkus-hibernate-validator-spi</artifactId>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jsonp-deployment</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-security-deployment</artifactId>
Expand Down
20 changes: 20 additions & 0 deletions independent-projects/arc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,28 @@
<skip>${format.skip}</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>4.21.0-SNAPSHOT</version>
<configuration>
<configLocation>${maven.multiModuleProjectDirectory}/jakarta/rewrite.yml</configLocation>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<inherited>false</inherited>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.jakarta-versions</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>

<distributionManagement>
Expand Down
14 changes: 14 additions & 0 deletions independent-projects/bootstrap/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,4 +353,18 @@
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.maven.javax.allow</recipe>
<recipe>io.quarkus.maven.javax.managed</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</project>
24 changes: 24 additions & 0 deletions independent-projects/bootstrap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,32 @@
<skip>${format.skip}</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>4.21.0-SNAPSHOT</version>
<configuration>
<configLocation>${maven.multiModuleProjectDirectory}/jakarta/rewrite.yml</configLocation>
<activeStyles>
<style>io.quarkus.style.maven</style>
</activeStyles>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<inherited>false</inherited>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.jakarta-versions</recipe>
<recipe>io.quarkus.maven.javax.versions</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>

<distributionManagement>
Expand Down
15 changes: 15 additions & 0 deletions independent-projects/enforcer-rules/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,21 @@
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>4.21.0-SNAPSHOT</version>
<configuration>
<configLocation>${maven.multiModuleProjectDirectory}/jakarta/rewrite.yml</configLocation>
<activeStyles>
<style>io.quarkus.style.maven</style>
</activeStyles>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
Expand Down
11 changes: 11 additions & 0 deletions independent-projects/ide-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@
<argLine>${jacoco.agent.argLine}</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>4.21.0-SNAPSHOT</version>
<configuration>
<configLocation>${maven.multiModuleProjectDirectory}/jakarta/rewrite.yml</configLocation>
<activeStyles>
<style>io.quarkus.style.maven</style>
</activeStyles>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
11 changes: 11 additions & 0 deletions independent-projects/qute/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,17 @@
<skip>${format.skip}</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>4.21.0-SNAPSHOT</version>
<configuration>
<configLocation>${maven.multiModuleProjectDirectory}/jakarta/rewrite.yml</configLocation>
<activeStyles>
<style>io.quarkus.style.maven</style>
</activeStyles>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
24 changes: 24 additions & 0 deletions independent-projects/resteasy-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,32 @@
<skip>${format.skip}</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>4.21.0-SNAPSHOT</version>
<configuration>
<configLocation>${maven.multiModuleProjectDirectory}/jakarta/rewrite.yml</configLocation>
<activeStyles>
<style>io.quarkus.style.maven</style>
</activeStyles>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<inherited>false</inherited>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.jakarta-versions</recipe>
<recipe>io.quarkus.jakarta-jaxrs-jaxb</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>

<distributionManagement>
Expand Down
15 changes: 15 additions & 0 deletions independent-projects/revapi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>4.21.0-SNAPSHOT</version>
<configuration>
<configLocation>${maven.multiModuleProjectDirectory}/jakarta/rewrite.yml</configLocation>
<activeStyles>
<style>io.quarkus.style.maven</style>
</activeStyles>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!--
This is not deployed into a Maven repository. It is merely installed into the local Maven repository
Expand Down
11 changes: 11 additions & 0 deletions independent-projects/tools/devtools-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.maven.javax.allow</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
Expand Down
27 changes: 27 additions & 0 deletions independent-projects/tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,21 @@
</distributionManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>4.21.0-SNAPSHOT</version>
<configuration>
<configLocation>${maven.multiModuleProjectDirectory}/jakarta/rewrite.yml</configLocation>
<activeStyles>
<style>io.quarkus.style.maven</style>
</activeStyles>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -368,6 +383,18 @@
<skip>${format.skip}</skip>
</configuration>
</plugin>
<plugin>
<inherited>false</inherited>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.maven.javax.managed</recipe>
<recipe>io.quarkus.maven.javax.versions</recipe>
<recipe>io.quarkus.jakarta-versions</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
18 changes: 18 additions & 0 deletions integration-tests/hibernate-orm-rest-data-panache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
<artifactId>quarkus-test-h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jsonp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand All @@ -64,6 +69,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jsonp-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jdbc-h2-deployment</artifactId>
Expand Down
18 changes: 18 additions & 0 deletions integration-tests/spring-data-rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
<artifactId>quarkus-test-h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jsonp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down Expand Up @@ -77,6 +82,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jsonp-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jackson-deployment</artifactId>
Expand Down
Loading