From cd34e1c76690288c9bdfdf81ac5c6b23bc4c5afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Dudit=C5=A1?= Date: Tue, 5 Nov 2024 15:55:01 +0100 Subject: [PATCH 1/3] FISH-10072 Handle empty mapping in normalizeRequestURI Signed-off-by: Patrik Dudits --- .../java/com/sun/faces/application/view/MultiViewHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/impl/src/main/java/com/sun/faces/application/view/MultiViewHandler.java b/impl/src/main/java/com/sun/faces/application/view/MultiViewHandler.java index 89f34122ca..7a7547ed82 100644 --- a/impl/src/main/java/com/sun/faces/application/view/MultiViewHandler.java +++ b/impl/src/main/java/com/sun/faces/application/view/MultiViewHandler.java @@ -458,6 +458,10 @@ protected String derivePhysicalViewId(FacesContext ctx, String requestViewId, bo * @since 1.2 */ protected String normalizeRequestURI(String viewId, String mapping) { + if (mapping.isEmpty()) { + return viewId; + } + boolean logged = false; while (viewId.startsWith(mapping)) { From 9f5b91a49f577c72e04ada95359589aae6516790 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 7 Nov 2024 09:16:59 +0000 Subject: [PATCH 2/3] 4.0.9.payara-p1 release --- action/pom.xml | 2 +- cdi/pom.xml | 2 +- impl/pom.xml | 2 +- pom.xml | 2 +- rest/pom.xml | 2 +- test/base/pom.xml | 2 +- test/example_jar_with_metadata_complete_false/pom.xml | 2 +- test/example_jar_with_metadata_complete_true/pom.xml | 2 +- test/issue5460/pom.xml | 2 +- test/issue5464/pom.xml | 2 +- test/issue5488/pom.xml | 2 +- test/issue5503/pom.xml | 2 +- test/issue5507/pom.xml | 2 +- test/issue5511/pom.xml | 2 +- test/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/action/pom.xml b/action/pom.xml index e0224c08f0..5268bdf754 100644 --- a/action/pom.xml +++ b/action/pom.xml @@ -22,7 +22,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 org.eclipse.mojarra diff --git a/cdi/pom.xml b/cdi/pom.xml index 7a3620e885..0b7e29e36d 100644 --- a/cdi/pom.xml +++ b/cdi/pom.xml @@ -22,7 +22,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 org.eclipse.mojarra diff --git a/impl/pom.xml b/impl/pom.xml index 246540fe56..bf6e001a6a 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -29,7 +29,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 jakarta.faces diff --git a/pom.xml b/pom.xml index 87a6eeec77..661a32421c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 pom Mojarra ${project.version} - Project diff --git a/rest/pom.xml b/rest/pom.xml index 30f04fffd2..314ea3008c 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -22,7 +22,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 org.eclipse.mojarra diff --git a/test/base/pom.xml b/test/base/pom.xml index e886043be9..aab60d5134 100644 --- a/test/base/pom.xml +++ b/test/base/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 base diff --git a/test/example_jar_with_metadata_complete_false/pom.xml b/test/example_jar_with_metadata_complete_false/pom.xml index 8c71438cc3..36df974dbf 100644 --- a/test/example_jar_with_metadata_complete_false/pom.xml +++ b/test/example_jar_with_metadata_complete_false/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 example_jar_with_metadata_complete_false diff --git a/test/example_jar_with_metadata_complete_true/pom.xml b/test/example_jar_with_metadata_complete_true/pom.xml index 67b669c8fd..6395623f64 100644 --- a/test/example_jar_with_metadata_complete_true/pom.xml +++ b/test/example_jar_with_metadata_complete_true/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 example_jar_with_metadata_complete_true diff --git a/test/issue5460/pom.xml b/test/issue5460/pom.xml index 00c3064e87..2378529a27 100644 --- a/test/issue5460/pom.xml +++ b/test/issue5460/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 issue5460 diff --git a/test/issue5464/pom.xml b/test/issue5464/pom.xml index 6e997a8dcf..65245473f7 100644 --- a/test/issue5464/pom.xml +++ b/test/issue5464/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 issue5464 diff --git a/test/issue5488/pom.xml b/test/issue5488/pom.xml index 7b66e6a7ef..ad0f5b4696 100644 --- a/test/issue5488/pom.xml +++ b/test/issue5488/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 issue5488 diff --git a/test/issue5503/pom.xml b/test/issue5503/pom.xml index a93b5cff4f..0ea9891371 100644 --- a/test/issue5503/pom.xml +++ b/test/issue5503/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 issue5503 diff --git a/test/issue5507/pom.xml b/test/issue5507/pom.xml index d1eea181ba..51aa422eda 100644 --- a/test/issue5507/pom.xml +++ b/test/issue5507/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 issue5507 diff --git a/test/issue5511/pom.xml b/test/issue5511/pom.xml index a299e7c47c..89c8502707 100644 --- a/test/issue5511/pom.xml +++ b/test/issue5511/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 issue5511 diff --git a/test/pom.xml b/test/pom.xml index ec932890ab..184e4179d1 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -22,7 +22,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1-SNAPSHOT + 4.0.9.payara-p1 org.eclipse.mojarra.test From 6fbe4825598143500ae950e8d6b79e5b7a4e6ccb Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 7 Nov 2024 09:18:28 +0000 Subject: [PATCH 3/3] Increment version to snapshot for development --- action/pom.xml | 2 +- cdi/pom.xml | 2 +- impl/pom.xml | 2 +- pom.xml | 2 +- rest/pom.xml | 2 +- test/base/pom.xml | 2 +- test/example_jar_with_metadata_complete_false/pom.xml | 2 +- test/example_jar_with_metadata_complete_true/pom.xml | 2 +- test/issue5460/pom.xml | 2 +- test/issue5464/pom.xml | 2 +- test/issue5488/pom.xml | 2 +- test/issue5503/pom.xml | 2 +- test/issue5507/pom.xml | 2 +- test/issue5511/pom.xml | 2 +- test/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/action/pom.xml b/action/pom.xml index 5268bdf754..13ea5949ec 100644 --- a/action/pom.xml +++ b/action/pom.xml @@ -22,7 +22,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT org.eclipse.mojarra diff --git a/cdi/pom.xml b/cdi/pom.xml index 0b7e29e36d..8990d6dce4 100644 --- a/cdi/pom.xml +++ b/cdi/pom.xml @@ -22,7 +22,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT org.eclipse.mojarra diff --git a/impl/pom.xml b/impl/pom.xml index bf6e001a6a..122c42131f 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -29,7 +29,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT jakarta.faces diff --git a/pom.xml b/pom.xml index 661a32421c..c3dfdac1ce 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT pom Mojarra ${project.version} - Project diff --git a/rest/pom.xml b/rest/pom.xml index 314ea3008c..9d021454f5 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -22,7 +22,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT org.eclipse.mojarra diff --git a/test/base/pom.xml b/test/base/pom.xml index aab60d5134..35c60f8d19 100644 --- a/test/base/pom.xml +++ b/test/base/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT base diff --git a/test/example_jar_with_metadata_complete_false/pom.xml b/test/example_jar_with_metadata_complete_false/pom.xml index 36df974dbf..95d3feb560 100644 --- a/test/example_jar_with_metadata_complete_false/pom.xml +++ b/test/example_jar_with_metadata_complete_false/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT example_jar_with_metadata_complete_false diff --git a/test/example_jar_with_metadata_complete_true/pom.xml b/test/example_jar_with_metadata_complete_true/pom.xml index 6395623f64..e27e4501ef 100644 --- a/test/example_jar_with_metadata_complete_true/pom.xml +++ b/test/example_jar_with_metadata_complete_true/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT example_jar_with_metadata_complete_true diff --git a/test/issue5460/pom.xml b/test/issue5460/pom.xml index 2378529a27..d652fa7e06 100644 --- a/test/issue5460/pom.xml +++ b/test/issue5460/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT issue5460 diff --git a/test/issue5464/pom.xml b/test/issue5464/pom.xml index 65245473f7..68cbbb46a4 100644 --- a/test/issue5464/pom.xml +++ b/test/issue5464/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT issue5464 diff --git a/test/issue5488/pom.xml b/test/issue5488/pom.xml index ad0f5b4696..e4bc64942f 100644 --- a/test/issue5488/pom.xml +++ b/test/issue5488/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT issue5488 diff --git a/test/issue5503/pom.xml b/test/issue5503/pom.xml index 0ea9891371..cd4199b099 100644 --- a/test/issue5503/pom.xml +++ b/test/issue5503/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT issue5503 diff --git a/test/issue5507/pom.xml b/test/issue5507/pom.xml index 51aa422eda..efb01b5a62 100644 --- a/test/issue5507/pom.xml +++ b/test/issue5507/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT issue5507 diff --git a/test/issue5511/pom.xml b/test/issue5511/pom.xml index 89c8502707..763491d075 100644 --- a/test/issue5511/pom.xml +++ b/test/issue5511/pom.xml @@ -22,7 +22,7 @@ org.eclipse.mojarra.test pom - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT issue5511 diff --git a/test/pom.xml b/test/pom.xml index 184e4179d1..bb0e4f12b9 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -22,7 +22,7 @@ org.glassfish mojarra-parent - 4.0.9.payara-p1 + 4.0.9.payara-p2-SNAPSHOT org.eclipse.mojarra.test