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.

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

Another round of Jakarta progress #24970

Merged
merged 5 commits into from
Apr 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/jakarta-rewrite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: |
export PATH="$HOME/.jbang/bin:$PATH"
git checkout -b temp-jakarta-rewrite
./jakarta/transform.sh
REWRITE_TESTS_CONTAINERS=true ./jakarta/transform.sh
git add .
git commit -m 'Transform sources to Jakarta'
shell: bash
Expand Down
3 changes: 2 additions & 1 deletion bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<mongo-crypt.version>1.2.1</mongo-crypt.version>
<proton-j.version>0.33.10</proton-j.version>
<okhttp.version>3.14.9</okhttp.version>
<hibernate-quarkus-local-cache.version>0.1.0</hibernate-quarkus-local-cache.version>
<hibernate-quarkus-local-cache.version>0.1.1</hibernate-quarkus-local-cache.version>
<kubernetes-client.version>5.12.2</kubernetes-client.version>
<flapdoodle.mongo.version>3.3.0</flapdoodle.mongo.version>
<quarkus-spring-api.version>5.2.SP6</quarkus-spring-api.version>
Expand Down Expand Up @@ -5779,6 +5779,7 @@
<recipe>io.quarkus.jakarta-security</recipe>
<recipe>io.quarkus.smallrye</recipe>
<recipe>io.quarkus.bom.resteasy-microprofile</recipe>
<recipe>io.quarkus.bom.resteasy-spring-web</recipe>
</activeRecipes>
</configuration>
</plugin>
Expand Down
24 changes: 24 additions & 0 deletions extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,28 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jakarta-rewrite</id>
<activation>
<property>
<name>jakarta-rewrite</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.hibernate-orm-narayana-switch</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
25 changes: 25 additions & 0 deletions extensions/panache/hibernate-orm-panache/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,29 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jakarta-rewrite</id>
<activation>
<property>
<name>jakarta-rewrite</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.jakarta-jaxb-switch</recipe>
<recipe>io.quarkus.hibernate-orm-narayana-switch</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
25 changes: 25 additions & 0 deletions extensions/panache/hibernate-reactive-panache/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,29 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jakarta-rewrite</id>
<activation>
<property>
<name>jakarta-rewrite</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.jakarta-jaxb-switch</recipe>
<recipe>io.quarkus.hibernate-orm-narayana-switch</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
24 changes: 24 additions & 0 deletions extensions/panache/rest-data-panache/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,28 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jakarta-rewrite</id>
<activation>
<property>
<name>jakarta-rewrite</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.jakarta-jaxrs-switch</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
25 changes: 24 additions & 1 deletion extensions/spring-cloud-config-client/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,28 @@
</plugins>
</build>

<profiles>
<profile>
<id>jakarta-rewrite</id>
<activation>
<property>
<name>jakarta-rewrite</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.jakarta-jaxrs-switch</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
</project>
2 changes: 1 addition & 1 deletion extensions/spring-data-jpa/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-spring-data-jpa-deployment</artifactId>
<name>Quarkus - Spring - Data JPA - Deployment</name>
<name>Quarkus - Spring Data JPA - Deployment</name>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extensions/spring-data-jpa/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-spring-data-jpa</artifactId>
<name>Quarkus - Spring - Data JPA - Runtime</name>
<name>Quarkus - Spring Data JPA - Runtime</name>
<description>Use Spring Data JPA annotations to create your data access layer</description>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extensions/spring-data-rest/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-spring-data-rest-deployment</artifactId>
<name>Quarkus - Spring - Data REST - Deployment</name>
<name>Quarkus - Spring Data - REST - Deployment</name>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extensions/spring-data-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-spring-data-rest-parent</artifactId>
<name>Quarkus - Spring Data REST</name>
<name>Quarkus - Spring Data - REST</name>
<packaging>pom</packaging>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion extensions/spring-data-rest/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>quarkus-spring-data-rest</artifactId>
<name>Quarkus - Spring - Data REST - Runtime</name>
<name>Quarkus - Spring Data - REST - Runtime</name>
<description>Generate JAX-RS resources for a Spring Data application</description>

<dependencies>
Expand Down
24 changes: 24 additions & 0 deletions extensions/spring-web/core/common-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,28 @@
<artifactId>quarkus-spring-context-api</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>jakarta-rewrite</id>
<activation>
<property>
<name>jakarta-rewrite</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.jakarta-jaxrs-switch</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ String generate() {
try (ClassCreator cc = ClassCreator.builder()
.classOutput(classOutput).className(generatedClassName)
.interfaces(ExceptionMapper.class)
.signature(String.format("Ljava/lang/Object;Ljavax/ws/rs/ext/ExceptionMapper<L%s;>;",
.signature(String.format("Ljava/lang/Object;L" + ExceptionMapper.class.getName().replace(".", "/") + "<L%s;>;",
exceptionClassName.replace('.', '/')))
.build()) {

Expand Down
24 changes: 24 additions & 0 deletions extensions/spring-web/resteasy-classic/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,28 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>jakarta-rewrite</id>
<activation>
<property>
<name>jakarta-rewrite</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<configuration>
<activeRecipes>
<recipe>io.quarkus.resteasy-spring-web</recipe>
</activeRecipes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
38 changes: 38 additions & 0 deletions jakarta/rewrite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,15 @@ recipeList:
oldArtifactId: hibernate-reactive-core
newGroupId: org.hibernate.reactive
newArtifactId: hibernate-reactive-core-jakarta
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
oldGroupId: org.hibernate
oldArtifactId: quarkus-local-cache
newGroupId: org.hibernate
newArtifactId: quarkus-local-cache-jakarta
# Security - See below
- org.openrewrite.maven.ChangePropertyValue:
key: quarkus-security.version
newValue: 2.0.0-SNAPSHOT
# Servlet
- org.openrewrite.maven.ChangePropertyValue:
key: jakarta.servlet-api.version
Expand Down Expand Up @@ -326,6 +334,11 @@ recipeList:
oldArtifactId: hibernate-reactive-core
newGroupId: org.hibernate.reactive
newArtifactId: hibernate-reactive-core-jakarta
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
oldGroupId: org.hibernate
oldArtifactId: quarkus-local-cache
newGroupId: org.hibernate
newArtifactId: quarkus-local-cache-jakarta
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.hibernate-search-switch
Expand Down Expand Up @@ -515,6 +528,31 @@ recipeList:
artifactId: microprofile-config
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.bom.resteasy-spring-web
displayName: Add RESTEasy Spring Web to BOM
recipeList:
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
oldGroupId: org.jboss.resteasy
oldArtifactId: resteasy-spring-web
newGroupId: org.jboss.resteasy.spring
newArtifactId: resteasy-spring-web
newVersion: "${resteasy-spring-web.version}"
- org.openrewrite.maven.ChangePropertyValue:
key: resteasy-spring-web.version
newValue: 3.0.0.Alpha2
addIfMissing: true
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.resteasy-spring-web
displayName: Adjust RESTEasy Spring Web
recipeList:
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
oldGroupId: org.jboss.resteasy
oldArtifactId: resteasy-spring-web
newGroupId: org.jboss.resteasy.spring
newArtifactId: resteasy-spring-web
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.rest-client
displayName: Add RESTEasy MicroProfile Config to RESTEasy Common
recipeList:
Expand Down
Loading