From 7d89ff57b9c53c0e73fd3d144e5609d21d6b61d1 Mon Sep 17 00:00:00 2001 From: m-brophy Date: Thu, 20 Oct 2022 10:56:02 +0100 Subject: [PATCH 1/6] WINDUPRULE-909: eap8 ejb deleted methods rules --- .../eap8/eap6/eap8.ejb.windup.xml | 82 +++++++++++++++++++ .../tests/data/ejb/EJBContextMethodsTest.java | 31 +++++++ .../eap8/eap6/tests/eap8.ejb.windup.test.xml | 48 +++++++++++ 3 files changed, 161 insertions(+) create mode 100644 rules/rules-reviewed/eap8/eap6/eap8.ejb.windup.xml create mode 100644 rules/rules-reviewed/eap8/eap6/tests/data/ejb/EJBContextMethodsTest.java create mode 100644 rules/rules-reviewed/eap8/eap6/tests/eap8.ejb.windup.test.xml diff --git a/rules/rules-reviewed/eap8/eap6/eap8.ejb.windup.xml b/rules/rules-reviewed/eap8/eap6/eap8.ejb.windup.xml new file mode 100644 index 000000000..7890de4d4 --- /dev/null +++ b/rules/rules-reviewed/eap8/eap6/eap8.ejb.windup.xml @@ -0,0 +1,82 @@ + + + + + This ruleset provides analysis of removed EJB methods in JBoss EAP 8. + + + + + + + + eap8 + + + + + + METHOD_CALL + + + + + Methods relying on `java.security.Identity` have been removed from the Jakarta Enterprise Beans 4.0 specification and api. + Use `Principal.getCallerPrincipal()` instead. + + eap8 + + + + + + + METHOD_CALL + + + + + Methods relying on `java.security.Identity` have been removed from the Jakarta Enterprise Beans 4.0 specification and api. + Use `boolean isCallerInRole(String roleName)` instead. + + eap8 + + + + + + + METHOD_CALL + + + + + Method `javax.ejb.EJBContext.getEnvironment()` was deprecated and has now been removed from the Jakarta Enterprise Beans 4.0 specification and api. + Use the JNDI naming context `java:comp/env` to access enterprise bean's environment. + + eap8 + + + + + + + METHOD_CALL + + + + + Methods relying on Jakarta XML RPC have been removed from the Jakarta Enterprise Beans 4.0 specification and api. + + eap8 + + + + + diff --git a/rules/rules-reviewed/eap8/eap6/tests/data/ejb/EJBContextMethodsTest.java b/rules/rules-reviewed/eap8/eap6/tests/data/ejb/EJBContextMethodsTest.java new file mode 100644 index 000000000..5c3362f88 --- /dev/null +++ b/rules/rules-reviewed/eap8/eap6/tests/data/ejb/EJBContextMethodsTest.java @@ -0,0 +1,31 @@ +package data.ejb; + + +import javax.ejb.EJBContext; +import javax.annotation.Resource; +import java.security.Identity; +import java.util.Properties; +import javax.xml.rpc.handler.MessageContext; + + +public class EJBContextMethodsTest { + + @Resource + private EJBContext context; + + // Inject the Session Context + @Resource + private SessionContext sessionCtx; + + public String securityCalls(Identity role) { + + try { + Identity caller = context.getCallerIdentity(); + boolean inRole = context.isCallerInRole(role); + Properties env = context.getEnvironment(); + MessageContext mCx = sessionCtx.getMessageContext(); + }catch(Exception e){ + System.out.println(e.getMessage()); + } + } +} \ No newline at end of file diff --git a/rules/rules-reviewed/eap8/eap6/tests/eap8.ejb.windup.test.xml b/rules/rules-reviewed/eap8/eap6/tests/eap8.ejb.windup.test.xml new file mode 100644 index 000000000..b09fc4c71 --- /dev/null +++ b/rules/rules-reviewed/eap8/eap6/tests/eap8.ejb.windup.test.xml @@ -0,0 +1,48 @@ + + + data/ejb + ../../eap8.ejb.windup.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7ce4cbf841b04c991876ae3c1b69b5ae11bb1b0f Mon Sep 17 00:00:00 2001 From: m-brophy Date: Wed, 2 Nov 2022 09:40:37 +0000 Subject: [PATCH 2/6] eap8 dependencies recipe --- .../openrewrite/eap8/dependencies/rewrite.yml | 395 ++++++++++++++++++ 1 file changed, 395 insertions(+) create mode 100644 rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml diff --git a/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml b/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml new file mode 100644 index 000000000..89b9f8297 --- /dev/null +++ b/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml @@ -0,0 +1,395 @@ +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.EAP8Dependencies +displayName: migrate dependencies required for eap8 +recipeList: + - org.jboss.windup.eap8.BomArtifacts + - org.jboss.windup.eap8.ActivationArtifacts + - org.jboss.windup.eap8.AnnotationArtifacts + - org.jboss.windup.eap8.AuthenticationArtifacts + - org.jboss.windup.eap8.AuthorizationArtifacts + - org.jboss.windup.eap8.BatchArtifacts + - org.jboss.windup.eap8.EjbArtifacts + - org.jboss.windup.eap8.ElArtifacts + - org.jboss.windup.eap8.EnterpriseArtifacts + - org.jboss.windup.eap8.FacesArtifacts + - org.jboss.windup.eap8.InterceptorArtifacts + - org.jboss.windup.eap8.JmsArtifacts + - org.jboss.windup.eap8.JakartaMailArtifacts + - org.jboss.windup.eap8.ResourceArtifacts + - org.jboss.windup.eap8.ServletArtifacts + - org.jboss.windup.eap8.JspArtifacts + - org.jboss.windup.eap8.TaglibsArtifacts + - org.jboss.windup.eap8.TransactionArtifacts + - org.jboss.windup.eap8.XmlBindArtifacts + - org.jboss.windup.eap8.XmlWsArtifacts + - org.jboss.windup.eap8.WebsocketArtifacts + - org.jboss.windup.eap8.WsRsArtifacts + - org.jboss.windup.eap8.SoapArtifacts + - org.jboss.windup.eap8.HibernateArtifacts + - org.jboss.windup.eap8.JBossXtsArtifacts + - org.jboss.windup.eap8.Jsr181Artifacts + +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.BomArtifacts +displayName: Bom Artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.bom + oldArtifactId: jboss-eap-jakartaee8 + newArtifactId: jboss-eap-ee + + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.bom + oldArtifactId: jboss-eap-jakartaee8-with-tools + newArtifactId: jboss-eap-ee-with-tools + + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.bom + oldArtifactId: eap-runtime-artifacts + newArtifactId: jboss-eap-ee + + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec + oldArtifactId: jboss-jakartaee-8.0 + newGroupId: org.jboss.bom + newArtifactId: jboss-eap-ee + + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec + oldArtifactId: jboss-jakartaee-web-8.0 + newGroupId: org.jboss.bom + newArtifactId: jboss-eap-ee + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.ActivationArtifacts +displayName: activation artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: com.sun.activation + oldArtifactId: jakarta.activation + newGroupId: jakarta.activation + newArtifactId: jakarta.activation-api + #newVersion: 2.1.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.AnnotationArtifacts +displayName: annotation artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.annotation + oldArtifactId: jboss-annotations-api_1.3_spec + newGroupId: jakarta.annotation + newArtifactId: jakarta.annotation-api + #newVersion: 2.1.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.AuthenticationArtifacts +displayName: authentication artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.security.auth.message + oldArtifactId: jboss-jaspi-api_1.0_spec + newGroupId: jakarta.authentication + newArtifactId: jakarta.authentication-api + #newVersion: 3.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.AuthorizationArtifacts +displayName: authorization artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.security.jacc + oldArtifactId: jboss-jacc-api_1.5_spec + newGroupId: jakarta.authorization + newArtifactId: jakarta.authorization-api + # newVersion: 2.1.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.BatchArtifacts +displayName: batch artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.batch + oldArtifactId: jboss-batch-api_1.0_spec + newGroupId: jakarta.batch + newArtifactId: jakarta.batch-api + #newVersion: 2.1.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.EjbArtifacts +displayName: Ejb artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.ejb + oldArtifactId: jboss-ejb-api_3.2_spec + newGroupId: jakarta.ejb + newArtifactId: jakarta.ejb-api + #newVersion:4.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.ElArtifacts +displayName: El artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.el + oldArtifactId: jboss-el-api_3.0_spec + newGroupId: org.jboss.spec.jakarta.el + newArtifactId: jboss-el-api_5.0_spec + #newVersion:5.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.EnterpriseArtifacts +displayName: Enterprise concurrency artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.enterprise.concurrent + oldArtifactId: jboss-concurrency-api_1.0_spec + newGroupId: jakarta.enterprise.concurrent + newArtifactId: jakarta.enterprise.concurrent-api + #newVersion: 3.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.FacesArtifacts +displayName: Faces artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.faces + oldArtifactId: jboss-jsf-api_2.3_spec + newGroupId: jakarta.faces + newArtifactId: jakarta.faces-api + #newVersion: 4.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.InterceptorArtifacts +displayName: Interceptor artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.interceptor + oldArtifactId: jboss-interceptors-api_1.2_spec + newGroupId: jakarta.interceptor + newArtifactId: jakarta.interceptor-api + #newVersion: 2.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.JmsArtifacts +displayName: Jms artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.jms + oldArtifactId: jboss-jms-api_2.0_spec + newGroupId: jakarta.jms + newArtifactId: jakarta.jms-api + #newVersion: 3.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.JakartaMailArtifacts +displayName: JakartaMail artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: com.sun.mail + oldArtifactId: jakarta.mail + newGroupId: jakarta.mail + newArtifactId: jakarta.mail-api + #newVersion: 2.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.ResourceArtifacts +displayName: Resource artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.resource + oldArtifactId: jboss-connector-api_1.7_spec + newGroupId: jakarta.resource + newArtifactId: jakarta.resource-api + #newVersion: 2.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.ServletArtifacts +displayName: Servlet artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.servlet + oldArtifactId: jboss-servlet-api_4.0_spec + newGroupId: jakarta.servlet + newArtifactId: jakarta.servlet-api + #newVersion: 6.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.JspArtifacts +displayName: Jsp artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.servlet.jsp + oldArtifactId: jboss-jsp-api_2.3_spec + newGroupId: jakarta.servlet.jsp + newArtifactId: jakarta.servlet.jsp-api + #newVersion: 3.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.TaglibsArtifacts +displayName: Taglibs artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.apache.taglibs + oldArtifactId: taglibs-standard-spec + newGroupId: jakarta.servlet.jsp.jstl + newArtifactId: jakarta.servlet.jsp.jstl-api + #newVersion: 3.X + +--- + +type: specs.openrewrite.org + /v1beta/recipe +name: org.jboss.windup.eap8.TransactionArtifacts +displayName: Transaction artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.transaction + oldArtifactId: jboss-transaction-api_1.3_spec + newGroupId: jakarta.transaction + newArtifactId: jakarta.transaction-api + #newVersion: 2.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.XmlBindArtifacts +displayName: XmlBind artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.xml.bind + oldArtifactId: jboss-jaxb-api_2.3_spec + newGroupId: jakarta.xml.bind + newArtifactId: jakarta.xml.bind-api + #newVersion: 4.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.XmlWsArtifacts +displayName: XmlWs artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.xml.ws + oldArtifactId: jboss-jaxws-api_2.3_spec + newGroupId: org.jboss.spec.jakarta.xml.ws + newArtifactId: jboss-jakarta-xml-ws-api_4.0_spec + #newVersion: 1.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.WebsocketArtifacts +displayName: Websocket artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.websocket + oldArtifactId: jboss-websocket-api_1.1_spec + newGroupId: jakarta.websocket + newArtifactId: jakarta.websocket-api + #newVersion: 2.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.WsRsArtifacts +displayName: WsRs artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.ws.rs + oldArtifactId: jboss-jaxrs-api_2.1_spec + newGroupId: jakarta.ws.rs + newArtifactId: jakarta.ws.rs-api + #newVersion: 3.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.SoapArtifacts +displayName: Soap artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.spec.javax.xml.soap + oldArtifactId: jboss-saaj-api_1.4_spec + newGroupId: org.jboss.spec.jakarta.xml.soap + newArtifactId: jboss-saaj-api_3.0_spec + #newVersion: 1.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.HibernateArtifacts +displayName: Hibernate artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.hibernate + oldArtifactId: hibernate-core + newGroupId: org.hibernate.orm + newArtifactId: hibernate-core + #newVersion: 6.X + + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.hibernate + oldArtifactId: hibernate-jpamodelgen + newGroupId: org.hibernate.orm + newArtifactId: hibernate-jpamodelgen + #newVersion: 6.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.JBossXtsArtifacts +displayName: JBossXts artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: org.jboss.narayana.xts + oldArtifactId: jbossxts + newArtifactId: jbossxts-jakarta + #newVersion: 5.X + +--- + +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.Jsr181Artifacts +displayName: Jsr181 artifact migration +recipeList: + - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: + oldGroupId: javax.jws + oldArtifactId: jsr181-api + newGroupId: org.jboss.spec.jakarta.xml.ws + newArtifactId: jboss-jakarta-xml-ws-api_4.0_spec + From de274e0cf7123c58bfce780ba4764bd5b34176a1 Mon Sep 17 00:00:00 2001 From: m-brophy Date: Tue, 4 Apr 2023 14:58:29 +0100 Subject: [PATCH 3/6] invalid pom and broken recipe file --- .../eap8/eap7/tests/data/dependencies/pom.xml | 6 +++++- .../openrewrite/eap8/dependencies/rewrite.yml | 9 ++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml b/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml index 1512cd489..b34848e6d 100644 --- a/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml +++ b/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml @@ -2,6 +2,10 @@ 4.0.0 + org.jboss.windup.test + windup-rulesets-test-pom + 1.0.0-SNAPSHOT + org.glassfish @@ -154,5 +158,5 @@ provided - + diff --git a/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml b/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml index 89b9f8297..3ad05cc1e 100644 --- a/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml +++ b/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml @@ -86,7 +86,7 @@ recipeList: oldArtifactId: jboss-annotations-api_1.3_spec newGroupId: jakarta.annotation newArtifactId: jakarta.annotation-api - #newVersion: 2.1.X + newVersion: 2.1.X --- @@ -138,7 +138,7 @@ recipeList: oldArtifactId: jboss-ejb-api_3.2_spec newGroupId: jakarta.ejb newArtifactId: jakarta.ejb-api - #newVersion:4.X + newVersion:4.X --- @@ -272,15 +272,14 @@ recipeList: --- -type: specs.openrewrite.org - /v1beta/recipe +type: specs.openrewrite.org/v1beta/recipe name: org.jboss.windup.eap8.TransactionArtifacts displayName: Transaction artifact migration recipeList: - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: oldGroupId: org.jboss.spec.javax.transaction oldArtifactId: jboss-transaction-api_1.3_spec - newGroupId: jakarta.transaction + newGroupId: jakarta.transaction newArtifactId: jakarta.transaction-api #newVersion: 2.X From b50bc235e1c2af3ce13a8a88b089b57da1317852 Mon Sep 17 00:00:00 2001 From: m-brophy Date: Thu, 13 Apr 2023 13:54:40 +0100 Subject: [PATCH 4/6] fix to recipe --- .../openrewrite/eap8/dependencies/rewrite.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml b/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml index 3ad05cc1e..76b26f01e 100644 --- a/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml +++ b/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml @@ -138,7 +138,7 @@ recipeList: oldArtifactId: jboss-ejb-api_3.2_spec newGroupId: jakarta.ejb newArtifactId: jakarta.ejb-api - newVersion:4.X + newVersion: 4.X --- @@ -151,7 +151,7 @@ recipeList: oldArtifactId: jboss-el-api_3.0_spec newGroupId: org.jboss.spec.jakarta.el newArtifactId: jboss-el-api_5.0_spec - #newVersion:5.X + #newVersion: 5.X --- @@ -177,7 +177,7 @@ recipeList: oldArtifactId: jboss-jsf-api_2.3_spec newGroupId: jakarta.faces newArtifactId: jakarta.faces-api - #newVersion: 4.X + newVersion: 4.X --- @@ -278,10 +278,10 @@ displayName: Transaction artifact migration recipeList: - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: oldGroupId: org.jboss.spec.javax.transaction - oldArtifactId: jboss-transaction-api_1.3_spec + oldArtifactId: jboss-transaction-api*spec newGroupId: jakarta.transaction newArtifactId: jakarta.transaction-api - #newVersion: 2.X + newVersion: 2.X --- From 9b53c4bb637c31e5716889afd5e1ea0f50de8b6b Mon Sep 17 00:00:00 2001 From: m-brophy Date: Wed, 19 Apr 2023 16:06:08 +0100 Subject: [PATCH 5/6] openrewrite recipes for migrating to eap8 --- .../openrewrite/eap8/dependencies/rewrite.yml | 91 ++++++++++++++----- .../openrewrite/eap8/xml/rewrite.yml | 28 ++++++ 2 files changed, 98 insertions(+), 21 deletions(-) create mode 100644 rules/rules-reviewed/openrewrite/eap8/xml/rewrite.yml diff --git a/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml b/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml index 76b26f01e..92d264b23 100644 --- a/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml +++ b/rules/rules-reviewed/openrewrite/eap8/dependencies/rewrite.yml @@ -29,6 +29,7 @@ recipeList: - org.jboss.windup.eap8.HibernateArtifacts - org.jboss.windup.eap8.JBossXtsArtifacts - org.jboss.windup.eap8.Jsr181Artifacts + - org.openrewrite.maven.RemoveDuplicateDependencies --- type: specs.openrewrite.org/v1beta/recipe @@ -73,7 +74,7 @@ recipeList: oldArtifactId: jakarta.activation newGroupId: jakarta.activation newArtifactId: jakarta.activation-api - #newVersion: 2.1.X + newVersion: 2.1.X --- @@ -87,6 +88,9 @@ recipeList: newGroupId: jakarta.annotation newArtifactId: jakarta.annotation-api newVersion: 2.1.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.annotation + artifactId: jakarta.annotation-api --- @@ -99,7 +103,10 @@ recipeList: oldArtifactId: jboss-jaspi-api_1.0_spec newGroupId: jakarta.authentication newArtifactId: jakarta.authentication-api - #newVersion: 3.X + newVersion: 3.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.authentication + artifactId: jakarta.authentication-api --- @@ -112,7 +119,10 @@ recipeList: oldArtifactId: jboss-jacc-api_1.5_spec newGroupId: jakarta.authorization newArtifactId: jakarta.authorization-api - # newVersion: 2.1.X + newVersion: 2.1.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.authorization + artifactId: jakarta.authorization-api --- @@ -125,7 +135,10 @@ recipeList: oldArtifactId: jboss-batch-api_1.0_spec newGroupId: jakarta.batch newArtifactId: jakarta.batch-api - #newVersion: 2.1.X + newVersion: 2.1.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.batch + artifactId: jakarta.batch-api --- @@ -139,6 +152,9 @@ recipeList: newGroupId: jakarta.ejb newArtifactId: jakarta.ejb-api newVersion: 4.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.ejb + artifactId: jakarta.ejb-api --- @@ -151,7 +167,7 @@ recipeList: oldArtifactId: jboss-el-api_3.0_spec newGroupId: org.jboss.spec.jakarta.el newArtifactId: jboss-el-api_5.0_spec - #newVersion: 5.X + newVersion: 5.X --- @@ -164,7 +180,10 @@ recipeList: oldArtifactId: jboss-concurrency-api_1.0_spec newGroupId: jakarta.enterprise.concurrent newArtifactId: jakarta.enterprise.concurrent-api - #newVersion: 3.X + newVersion: 3.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.enterprise.concurrent + artifactId: jakarta.enterprise.concurrent-api --- @@ -178,6 +197,9 @@ recipeList: newGroupId: jakarta.faces newArtifactId: jakarta.faces-api newVersion: 4.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.faces + artifactId: jakarta.faces-api --- @@ -190,7 +212,10 @@ recipeList: oldArtifactId: jboss-interceptors-api_1.2_spec newGroupId: jakarta.interceptor newArtifactId: jakarta.interceptor-api - #newVersion: 2.X + newVersion: 2.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.interceptor + artifactId: jakarta.interceptor-api --- @@ -203,7 +228,10 @@ recipeList: oldArtifactId: jboss-jms-api_2.0_spec newGroupId: jakarta.jms newArtifactId: jakarta.jms-api - #newVersion: 3.X + newVersion: 3.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.jms + artifactId: jakarta.jms-api --- @@ -216,7 +244,7 @@ recipeList: oldArtifactId: jakarta.mail newGroupId: jakarta.mail newArtifactId: jakarta.mail-api - #newVersion: 2.X + newVersion: 2.X --- @@ -229,7 +257,10 @@ recipeList: oldArtifactId: jboss-connector-api_1.7_spec newGroupId: jakarta.resource newArtifactId: jakarta.resource-api - #newVersion: 2.X + newVersion: 2.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.resource + artifactId: jakarta.resource-api --- @@ -242,7 +273,10 @@ recipeList: oldArtifactId: jboss-servlet-api_4.0_spec newGroupId: jakarta.servlet newArtifactId: jakarta.servlet-api - #newVersion: 6.X + newVersion: 6.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.servlet + artifactId: jakarta.servlet-api --- @@ -255,7 +289,10 @@ recipeList: oldArtifactId: jboss-jsp-api_2.3_spec newGroupId: jakarta.servlet.jsp newArtifactId: jakarta.servlet.jsp-api - #newVersion: 3.X + newVersion: 3.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.servlet.jsp + artifactId: jakarta.servlet.jsp-api --- @@ -268,7 +305,7 @@ recipeList: oldArtifactId: taglibs-standard-spec newGroupId: jakarta.servlet.jsp.jstl newArtifactId: jakarta.servlet.jsp.jstl-api - #newVersion: 3.X + newVersion: 3.X --- @@ -282,6 +319,9 @@ recipeList: newGroupId: jakarta.transaction newArtifactId: jakarta.transaction-api newVersion: 2.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.transaction + artifactId: jakarta.transaction-api --- @@ -294,7 +334,10 @@ recipeList: oldArtifactId: jboss-jaxb-api_2.3_spec newGroupId: jakarta.xml.bind newArtifactId: jakarta.xml.bind-api - #newVersion: 4.X + newVersion: 4.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.xml.bind + artifactId: jakarta.xml.bind-api --- @@ -307,7 +350,7 @@ recipeList: oldArtifactId: jboss-jaxws-api_2.3_spec newGroupId: org.jboss.spec.jakarta.xml.ws newArtifactId: jboss-jakarta-xml-ws-api_4.0_spec - #newVersion: 1.X + newVersion: 1.X --- @@ -320,7 +363,10 @@ recipeList: oldArtifactId: jboss-websocket-api_1.1_spec newGroupId: jakarta.websocket newArtifactId: jakarta.websocket-api - #newVersion: 2.X + newVersion: 2.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.websocket + artifactId: jakarta.websocket-api --- @@ -333,7 +379,10 @@ recipeList: oldArtifactId: jboss-jaxrs-api_2.1_spec newGroupId: jakarta.ws.rs newArtifactId: jakarta.ws.rs-api - #newVersion: 3.X + newVersion: 3.X + - org.openrewrite.maven.ChangeDependencyScope: + groupId: jakarta.ws.rs + artifactId: jakarta.ws.rs-api --- @@ -346,7 +395,7 @@ recipeList: oldArtifactId: jboss-saaj-api_1.4_spec newGroupId: org.jboss.spec.jakarta.xml.soap newArtifactId: jboss-saaj-api_3.0_spec - #newVersion: 1.X + newVersion: 1.X --- @@ -359,14 +408,14 @@ recipeList: oldArtifactId: hibernate-core newGroupId: org.hibernate.orm newArtifactId: hibernate-core - #newVersion: 6.X + newVersion: 6.X - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId: oldGroupId: org.hibernate oldArtifactId: hibernate-jpamodelgen newGroupId: org.hibernate.orm newArtifactId: hibernate-jpamodelgen - #newVersion: 6.X + newVersion: 6.X --- @@ -378,7 +427,7 @@ recipeList: oldGroupId: org.jboss.narayana.xts oldArtifactId: jbossxts newArtifactId: jbossxts-jakarta - #newVersion: 5.X + newVersion: 5.X --- diff --git a/rules/rules-reviewed/openrewrite/eap8/xml/rewrite.yml b/rules/rules-reviewed/openrewrite/eap8/xml/rewrite.yml new file mode 100644 index 000000000..31be70250 --- /dev/null +++ b/rules/rules-reviewed/openrewrite/eap8/xml/rewrite.yml @@ -0,0 +1,28 @@ +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.jboss.windup.eap8.FacesWebXml +displayName: alter Faces web xml for eap8 migration +recipeList: + - org.openrewrite.xml.ChangeTagValue: + elementName: //servlet-class + oldValue: javax.faces.webapp.FacesServlet + newValue: jakarta.faces.webapp.FacesServlet + fileMatcher: "**/web.xml" + + - org.openrewrite.xml.ChangeTagAttribute: + attributeName: version + elementName: web-app + newValue: 6.0 + fileMatcher: "**/web.xml" + + - org.openrewrite.xml.ChangeTagAttribute: + attributeName: xmlns + elementName: web-app + newValue: https://jakarta.ee/xml/ns/jakartaee + fileMatcher: "**/web.xml" + + - org.openrewrite.xml.ChangeTagAttribute: + attributeName: xsi:schemaLocation + elementName: web-app + newValue: https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd + fileMatcher: "**/web.xml" \ No newline at end of file From a852320e7fd43a1b24e4d6d8b5feffc3d58c7c7d Mon Sep 17 00:00:00 2001 From: Mark Brophy <36955467+m-brophy@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:58:32 +0100 Subject: [PATCH 6/6] Delete rewrite.yml --- .../openrewrite/eap8/xml/rewrite.yml | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 rules/rules-reviewed/openrewrite/eap8/xml/rewrite.yml diff --git a/rules/rules-reviewed/openrewrite/eap8/xml/rewrite.yml b/rules/rules-reviewed/openrewrite/eap8/xml/rewrite.yml deleted file mode 100644 index 31be70250..000000000 --- a/rules/rules-reviewed/openrewrite/eap8/xml/rewrite.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -type: specs.openrewrite.org/v1beta/recipe -name: org.jboss.windup.eap8.FacesWebXml -displayName: alter Faces web xml for eap8 migration -recipeList: - - org.openrewrite.xml.ChangeTagValue: - elementName: //servlet-class - oldValue: javax.faces.webapp.FacesServlet - newValue: jakarta.faces.webapp.FacesServlet - fileMatcher: "**/web.xml" - - - org.openrewrite.xml.ChangeTagAttribute: - attributeName: version - elementName: web-app - newValue: 6.0 - fileMatcher: "**/web.xml" - - - org.openrewrite.xml.ChangeTagAttribute: - attributeName: xmlns - elementName: web-app - newValue: https://jakarta.ee/xml/ns/jakartaee - fileMatcher: "**/web.xml" - - - org.openrewrite.xml.ChangeTagAttribute: - attributeName: xsi:schemaLocation - elementName: web-app - newValue: https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd - fileMatcher: "**/web.xml" \ No newline at end of file