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-8142 Reapply Patches to 4.0.7 #22

Merged
merged 5 commits into from
Jul 23, 2024
Merged

FISH-8142 Reapply Patches to 4.0.7 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
058e7b9
Add patched-project-release profile
Pandrex247 Jul 18, 2024
8390546
FISH-6596 duplicate javax form data with jakarta prefix
aubi Nov 11, 2022
8a4eda4
FISH-6596 use regex for jakarta rename
aubi Dec 23, 2022
1b60943
4.0.7.payara-p1
Pandrex247 Jul 18, 2024
1699ec8
SNAPSHOT
Pandrex247 Jul 18, 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.7.payara-p1-SNAPSHOT</version>
<version>4.0.7.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.7.payara-p1-SNAPSHOT</version>
<version>4.0.7.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.7.payara-p1-SNAPSHOT</version>
<version>4.0.7.payara-p2-SNAPSHOT</version>
</parent>

<artifactId>jakarta.faces</artifactId>
Expand Down
15 changes: 15 additions & 0 deletions impl/src/main/resources/META-INF/resources/jakarta.faces/faces-uncompressed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Portions Copyright [2022] Payara Foundation and/or affiliates

/**
@project Faces JavaScript Library
Expand Down Expand Up @@ -2529,13 +2530,16 @@ if (!((faces && faces.specversion && faces.specversion >= 23000 ) &&
var namingContainerPrefix = viewStateElement.name.substring(0, viewStateElement.name.indexOf("jakarta.faces.ViewState"));

args[namingContainerPrefix + "jakarta.faces.source"] = element.id;
args[namingContainerPrefix + "javax.faces.source"] = element.id; // add javax duplicate arg

if (event && !!event.type) {
args[namingContainerPrefix + "jakarta.faces.partial.event"] = event.type;
args[namingContainerPrefix + "javax.faces.partial.event"] = event.type; // add javax duplicate arg
}

if ("resetValues" in options) {
args[namingContainerPrefix + "jakarta.faces.partial.resetValues"] = options.resetValues;
args[namingContainerPrefix + "javax.faces.partial.resetValues"] = options.resetValues;
}

// If we have 'execute' identifiers:
Expand Down Expand Up @@ -2563,10 +2567,12 @@ if (!((faces && faces.specversion && faces.specversion >= 23000 ) &&
options.execute = "@all";
}
args[namingContainerPrefix + "jakarta.faces.partial.execute"] = options.execute;
args[namingContainerPrefix + "javax.faces.partial.execute"] = options.execute; // add javax duplicate arg
}
} else {
options.execute = element.name + " " + element.id;
args[namingContainerPrefix + "jakarta.faces.partial.execute"] = options.execute;
args[namingContainerPrefix + "javax.faces.partial.execute"] = options.execute; // add javax duplicate arg
}

if (options.render) {
Expand All @@ -2583,6 +2589,7 @@ if (!((faces && faces.specversion && faces.specversion >= 23000 ) &&
options.render = "@all";
}
args[namingContainerPrefix + "jakarta.faces.partial.render"] = options.render;
args[namingContainerPrefix + "javax.faces.partial.render"] = options.render; // add javax duplicate arg
}
}
var explicitlyDoNotDelay = ((typeof options.delay == 'undefined') || (typeof options.delay == 'string') &&
Expand Down Expand Up @@ -2649,11 +2656,19 @@ if (!((faces && faces.specversion && faces.specversion >= 23000 ) &&
for (var property in options) {
if (options.hasOwnProperty(property)) {
args[namingContainerPrefix + property] = options[property];
if(/^jakarta\./.test(property.toString())) {
// add jakarta duplicate arg
jakartaProperty = "javax."+property.substring("jakarta.".length);
args[namingContainerPrefix + jakartaProperty] = options[property];
}
}
}

args[namingContainerPrefix + "jakarta.faces.partial.ajax"] = "true";
args[namingContainerPrefix + "javax.faces.partial.ajax"] = "true"; // add javax duplicate arg
args["method"] = "POST";
// add javax duplicate ViewState. It is added to parameters via viewState and queryString, so add javax version explicitly.
args[namingContainerPrefix + "javax.faces.ViewState"] = viewStateElement.value;

// Determine the posting url

Expand Down
55 changes: 54 additions & 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.7.payara-p1-SNAPSHOT</version>
<version>4.0.7.payara-p2-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Mojarra ${project.version} - Project</name>
Expand Down Expand Up @@ -85,4 +85,57 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>patched-project-release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
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.7.payara-p1-SNAPSHOT</version>
<version>4.0.7.payara-p2-SNAPSHOT</version>
</parent>

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