Jakarta - Upgrade to Narayana 6.0.0.CR1

Fixes quarkusio#30475
gsmet · Jan 31, 2023 · 1201867 · 1201867
1 parent 9609ed2
commit 1201867
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 66 deletions.
diff --git a/extensions/narayana-jta/runtime/pom.xml b/extensions/narayana-jta/runtime/pom.xml
@@ -59,6 +59,13 @@
         <dependency>
             <groupId>org.jboss.narayana.jta</groupId>
             <artifactId>narayana-jta</artifactId>
+            <exclusions>
+                <!-- Brought by CDI with proper version -->
+                <exclusion>
+                    <groupId>jakarta.enterprise</groupId>
+                    <artifactId>jakarta.enterprise.lang-model</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.narayana.jts</groupId>

diff --git a/extensions/narayana-lra/runtime/pom.xml b/extensions/narayana-lra/runtime/pom.xml
@@ -26,6 +26,12 @@
         <dependency>
             <groupId>org.jboss.narayana.rts</groupId>
             <artifactId>lra-service-base</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.spec.javax.ws.rs</groupId>
+                    <artifactId>jboss-jaxrs-api_3.0_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.narayana.rts</groupId>
@@ -97,7 +103,6 @@
                         <artifactId>rewrite-maven-plugin</artifactId>
                         <configuration>
                             <activeRecipes>
-                                <recipe>io.quarkus.narayana-lra-switch</recipe>
                                 <recipe>io.quarkus.jakarta-jaxrs-switch</recipe>
                                 <recipe>io.quarkus.jakarta-angus-activation-switch</recipe>
                             </activeRecipes>

diff --git a/jakarta/rewrite.yml b/jakarta/rewrite.yml
@@ -140,19 +140,12 @@ recipeList:
   - org.openrewrite.maven.ChangePropertyValue:
       key: jakarta.transaction-api.version
       newValue: '2.0.1'
-  - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.jta
-      oldArtifactId: narayana-jta
-      newGroupId: org.jboss.narayana.jta
-      newArtifactId: narayana-jta-jakarta
-  - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.jts
-      oldArtifactId: narayana-jts-integration
-      newGroupId: org.jboss.narayana.jts
-      newArtifactId: narayana-jts-integration-jakarta
   - org.openrewrite.maven.ChangePropertyValue:
       key: agroal.version
       newValue: '2.0'
+  - org.openrewrite.maven.ChangePropertyValue:
+      key: narayana.version
+      newValue: 6.0.0.CR1
   # Validation
   - org.openrewrite.maven.ChangePropertyValue:
       key: jakarta.validation-api.version
@@ -463,16 +456,6 @@ recipeList:
       artifactId: hibernate-core
       exclusionGroupId: javax.activation
       exclusionArtifactId: javax.activation-api
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.jta
-      oldArtifactId: narayana-jta
-      newGroupId: org.jboss.narayana.jta
-      newArtifactId: narayana-jta-jakarta
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.jts
-      oldArtifactId: narayana-jts-integration
-      newGroupId: org.jboss.narayana.jts
-      newArtifactId: narayana-jts-integration-jakarta
   - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
       oldGroupId: org.hibernate
       oldArtifactId: hibernate-core
@@ -525,31 +508,6 @@ recipeList:
       newArtifactId: hibernate-search-mapper-orm-jakarta
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: io.quarkus.narayana-lra-switch
-displayName: Switch Narayana LRA dependencies
-recipeList:
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.rts
-      oldArtifactId: narayana-lra
-      newGroupId: org.jboss.narayana.rts
-      newArtifactId: narayana-lra-jakarta
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.rts
-      oldArtifactId: lra-service-base
-      newGroupId: org.jboss.narayana.rts
-      newArtifactId: lra-service-base-jakarta
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.rts
-      oldArtifactId: lra-proxy-api
-      newGroupId: org.jboss.narayana.rts
-      newArtifactId: lra-proxy-api-jakarta
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.rts
-      oldArtifactId: lra-client
-      newGroupId: org.jboss.narayana.rts
-      newArtifactId: lra-client-jakarta
----
-type: specs.openrewrite.org/v1beta/recipe
 name: io.quarkus.smallrye
 displayName: Adjust SmallRye dependencies
 recipeList:
@@ -586,26 +544,6 @@ recipeList:
   - org.openrewrite.maven.ChangePropertyValue:
       key: microprofile-lra.version
       newValue: '2.0-RC1'
-  - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.rts
-      oldArtifactId: narayana-lra
-      newGroupId: org.jboss.narayana.rts
-      newArtifactId: narayana-lra-jakarta
-  - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.rts
-      oldArtifactId: lra-service-base
-      newGroupId: org.jboss.narayana.rts
-      newArtifactId: lra-service-base-jakarta
-  - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.rts
-      oldArtifactId: lra-proxy-api
-      newGroupId: org.jboss.narayana.rts
-      newArtifactId: lra-proxy-api-jakarta
-  - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
-      oldGroupId: org.jboss.narayana.rts
-      oldArtifactId: lra-client
-      newGroupId: org.jboss.narayana.rts
-      newArtifactId: lra-client-jakarta
   - org.openrewrite.maven.ChangePropertyValue:
       key: microprofile-metrics-api.version
       newValue: '4.0.1'