From 17867a8e4dc71d1dc327155c6cfa1e1df2e32cc2 Mon Sep 17 00:00:00 2001 From: Jente Sondervorst Date: Tue, 23 Sep 2025 13:47:53 +0200 Subject: [PATCH 1/5] Fixed the whiteline removal for the schemaLocations when already properly migrated --- .../META-INF/rewrite/jakarta-faces-3.yml | 4 ++++ .../META-INF/rewrite/jakarta-faces-4.yml | 6 +++++- .../JavaxWebXmlToJakartaWebXmlTest.java | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) 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 f3ab78709d..9da9fa0064 100644 --- a/src/main/resources/META-INF/rewrite/jakarta-faces-3.yml +++ b/src/main/resources/META-INF/rewrite/jakarta-faces-3.yml @@ -170,7 +170,9 @@ recipeList: - org.openrewrite.xml.ChangeTagAttribute: attributeName: version elementName: web-app + oldValue: ^[1234]\.\d+$ newValue: 5.0 + regex: true - org.openrewrite.xml.ChangeTagAttribute: attributeName: xmlns elementName: web-app @@ -178,7 +180,9 @@ recipeList: - org.openrewrite.xml.ChangeTagAttribute: attributeName: xsi:schemaLocation elementName: web-app + oldValue: .*xml/ns/javaee.* newValue: https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd + regex: true - org.openrewrite.text.FindAndReplace: find: "javax." replace: "jakarta." diff --git a/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml b/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml index 17ab396614..c9b07f00ea 100644 --- a/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml +++ b/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml @@ -193,11 +193,15 @@ recipeList: - org.openrewrite.xml.ChangeTagAttribute: attributeName: version elementName: web-app + oldValue: ^[12345]\.\d+$ newValue: 6.0 + regex: true - 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 + oldValue: (?https://jakarta\.ee/xml/ns/jakartaee\s+https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?\.xsd) + newValue: ${prefix}6_0${extension} + regex: true --- type: specs.openrewrite.org/v1beta/recipe name: org.openrewrite.java.migrate.jakarta.FacesManagedBeansRemoved 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 6e6dd83eed..762d6f8938 100644 --- a/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java +++ b/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java @@ -161,5 +161,24 @@ void fileNotWebXml() { ) ); } + + @Test + void alreadyMigrated() { + rewriteRun( + //language=xml + xml( + """ + + + Unit testing + + """, + sourceSpecs -> sourceSpecs.path("web.xml") + ) + ); + } } } From 83f3d370421fc1e9577235ba16d3324dbf6ddc42 Mon Sep 17 00:00:00 2001 From: Jente Sondervorst Date: Tue, 23 Sep 2025 13:51:03 +0200 Subject: [PATCH 2/5] Fixed the whiteline removal for the schemaLocations when already properly migrated --- .../java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 762d6f8938..cedab3b7d3 100644 --- a/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java +++ b/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java @@ -171,7 +171,8 @@ void alreadyMigrated() { Unit testing From 6e9bae9e27784f7aa2dd8d630810f85d80c19156 Mon Sep 17 00:00:00 2001 From: Jente Sondervorst Date: Tue, 23 Sep 2025 13:51:58 +0200 Subject: [PATCH 3/5] Fixed the whiteline removal for the schemaLocations when already properly migrated --- .../java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cedab3b7d3..edf5cc42ed 100644 --- a/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java +++ b/src/test/java/org/openrewrite/java/migrate/jakarta/JavaxWebXmlToJakartaWebXmlTest.java @@ -172,7 +172,7 @@ void alreadyMigrated() { Unit testing From c290ea44584d9845c028a26bb292476833c08f70 Mon Sep 17 00:00:00 2001 From: Jente Sondervorst Date: Wed, 24 Sep 2025 16:29:38 +0200 Subject: [PATCH 4/5] Better matching --- src/main/resources/META-INF/rewrite/jakarta-faces-4.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml b/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml index c9b07f00ea..0245d9cfb7 100644 --- a/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml +++ b/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml @@ -199,8 +199,8 @@ recipeList: - org.openrewrite.xml.ChangeTagAttribute: attributeName: xsi:schemaLocation elementName: web-app - oldValue: (?https://jakarta\.ee/xml/ns/jakartaee\s+https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?\.xsd) - newValue: ${prefix}6_0${extension} + oldValue: (?[\S\s]*https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?\.xsd[\S\s]*) + newValue: ${prefix}6_0${suffix} regex: true --- type: specs.openrewrite.org/v1beta/recipe From 2caf18db136bf39ff9e461d045840028479c3fa6 Mon Sep 17 00:00:00 2001 From: Jente Sondervorst Date: Thu, 25 Sep 2025 01:33:28 +0200 Subject: [PATCH 5/5] Better matching --- src/main/resources/META-INF/rewrite/jakarta-faces-4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml b/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml index 0245d9cfb7..1e21d66417 100644 --- a/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml +++ b/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml @@ -199,7 +199,7 @@ recipeList: - org.openrewrite.xml.ChangeTagAttribute: attributeName: xsi:schemaLocation elementName: web-app - oldValue: (?[\S\s]*https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?\.xsd[\S\s]*) + oldValue: (?s)(?.*https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?\.xsd.*) newValue: ${prefix}6_0${suffix} regex: true ---