diff --git a/src/main/resources/META-INF/rewrite/jakarta-faces-3.yml b/src/main/resources/META-INF/rewrite/jakarta-faces-3.yml index e3c2be46ef..a7ced11fc5 100644 --- a/src/main/resources/META-INF/rewrite/jakarta-faces-3.yml +++ b/src/main/resources/META-INF/rewrite/jakarta-faces-3.yml @@ -214,7 +214,7 @@ recipeList: - org.openrewrite.xml.ChangeTagAttribute: attributeName: xsi:schemaLocation elementName: web-app - oldValue: (?s).*xml/ns/javaee.* + oldValue: (?s).*xml/ns/(j2ee|javaee).* newValue: https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd regex: true - org.openrewrite.xml.ChangeTagValue: diff --git a/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java b/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java index c898beba61..c9f619c5d6 100644 --- a/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java +++ b/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java @@ -66,6 +66,33 @@ void migrateSun() { ); } + @Test + void migrateJ2ee() { + rewriteRun( + //language=xml + xml( + """ + + + + """, + """ + + + + """, + sourceSpecs -> sourceSpecs.path("web.xml") + ) + ); + } + @Test void migrateWithSQLDataSource() { rewriteRun(