Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FISH-9992 FISH-10056 FISH-10072 Mojarra 4.0.9 #25

Merged
merged 3 commits into from
Nov 8, 2024
Merged

FISH-9992 FISH-10056 FISH-10072 Mojarra 4.0.9 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd34e1c
FISH-10072 Handle empty mapping in normalizeRequestURI
pdudits Nov 5, 2024
9f5b91a
4.0.9.payara-p1 release
Pandrex247 Nov 7, 2024
6fbe482
Increment version to snapshot for development
Pandrex247 Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion action/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish</groupId>
<artifactId>mojarra-parent</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.eclipse.mojarra</groupId>
Expand Down
2 changes: 1 addition & 1 deletion cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish</groupId>
<artifactId>mojarra-parent</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.eclipse.mojarra</groupId>
Expand Down
2 changes: 1 addition & 1 deletion impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>org.glassfish</groupId>
<artifactId>mojarra-parent</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jakarta.faces</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions impl/src/main/java/com/sun/faces/application/view/MultiViewHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<groupId>org.glassfish</groupId>
<artifactId>mojarra-parent</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Mojarra ${project.version} - Project</name>
Expand Down
2 changes: 1 addition & 1 deletion rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish</groupId>
<artifactId>mojarra-parent</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.eclipse.mojarra</groupId>
Expand Down
2 changes: 1 addition & 1 deletion test/base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>base</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/example_jar_with_metadata_complete_false/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>example_jar_with_metadata_complete_false</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/example_jar_with_metadata_complete_true/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>example_jar_with_metadata_complete_true</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/issue5460/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>issue5460</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/issue5464/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>issue5464</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/issue5488/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>issue5488</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/issue5503/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>issue5503</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/issue5507/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>issue5507</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/issue5511/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.mojarra.test</groupId>
<artifactId>pom</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>issue5511</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish</groupId>
<artifactId>mojarra-parent</artifactId>
<version>4.0.9.payara-p1-SNAPSHOT</version>
<version>4.0.9.payara-p2-SNAPSHOT</version>
</parent>

<groupId>org.eclipse.mojarra.test</groupId>
Expand Down
Loading