From 422f83cbda1ce729977d912335a00e72ded36ff4 Mon Sep 17 00:00:00 2001 From: Melloware Date: Fri, 14 Jun 2024 15:51:11 -0400 Subject: [PATCH] PrimeFaces 14 and proper EE10 namespaces (#496) --- .../resources/META-INF/rewrite/jakarta-faces-4.yml | 12 ++++++++++-- .../java/migrate/jakarta/JakartaFacesXhtmlTest.java | 8 ++++---- .../jakarta/UpgradeFacesOpenSourceLibrariesTest.java | 2 +- 3 files changed, 15 insertions(+), 7 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 be0caa0c..13235970 100644 --- a/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml +++ b/src/main/resources/META-INF/rewrite/jakarta-faces-4.yml @@ -110,6 +110,14 @@ recipeList: find: "http://xmlns.jcp.org/jsf" replace: "jakarta.faces" filePattern: '**/*.xhtml' + - org.openrewrite.text.FindAndReplace: + find: "http://primefaces.org/ui/extensions" + replace: "primefaces.extensions" + filePattern: '**/*.xhtml' + - org.openrewrite.text.FindAndReplace: + find: "http://primefaces.org/ui" + replace: "primefaces" + filePattern: '**/*.xhtml' - org.openrewrite.text.FindAndReplace: find: javax. replace: jakarta. @@ -477,7 +485,7 @@ recipeList: - org.openrewrite.java.dependencies.UpgradeDependencyVersion: groupId: org.primefaces artifactId: primefaces - newVersion: 13.0.x + newVersion: 14.0.x - org.openrewrite.maven.ChangeDependencyClassifier: groupId: org.primefaces.extensions artifactId: primefaces-extensions @@ -485,7 +493,7 @@ recipeList: - org.openrewrite.java.dependencies.UpgradeDependencyVersion: groupId: org.primefaces.extensions artifactId: primefaces-extensions - newVersion: 13.0.x + newVersion: 14.0.x - org.openrewrite.java.dependencies.UpgradeDependencyVersion: groupId: org.omnifaces artifactId: omnifaces diff --git a/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaFacesXhtmlTest.java b/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaFacesXhtmlTest.java index 6c38e7b6..7d23283d 100644 --- a/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaFacesXhtmlTest.java +++ b/src/test/java/org/openrewrite/java/migrate/jakarta/JakartaFacesXhtmlTest.java @@ -72,8 +72,8 @@ void migrateSun() { xmlns:h="jakarta.faces.html" xmlns:ui="jakarta.faces.facelets" xmlns:c="jakarta.tags.core" - xmlns:p="http://primefaces.org/ui" - xmlns:pe="http://primefaces.org/ui/extensions"> + xmlns:p="primefaces" + xmlns:pe="primefaces.extensions"> @@ -144,8 +144,8 @@ void migrateJCP() { xmlns:pt="jakarta.faces.passthrough" xmlns:fn="jakarta.tags.functions" xmlns:cc="jakarta.faces.composite" - xmlns:p="http://primefaces.org/ui" - xmlns:pe="http://primefaces.org/ui/extensions"> + xmlns:p="primefaces" + xmlns:pe="primefaces.extensions">
diff --git a/src/test/java/org/openrewrite/java/migrate/jakarta/UpgradeFacesOpenSourceLibrariesTest.java b/src/test/java/org/openrewrite/java/migrate/jakarta/UpgradeFacesOpenSourceLibrariesTest.java index 487ab239..2d904580 100644 --- a/src/test/java/org/openrewrite/java/migrate/jakarta/UpgradeFacesOpenSourceLibrariesTest.java +++ b/src/test/java/org/openrewrite/java/migrate/jakarta/UpgradeFacesOpenSourceLibrariesTest.java @@ -51,7 +51,7 @@ void changeVersionAndAddClassfier() { """, spec -> spec.after(actual -> { - String version = Pattern.compile("(13\\.0\\.\\d+)") + String version = Pattern.compile("(14\\.0\\.\\d+)") .matcher(actual).results().reduce((a, b) -> b).orElseThrow().group(1); return """