From 20477f5d04bf804ffc3139a890a12f57f20f3418 Mon Sep 17 00:00:00 2001
From: Petr Aubrecht <aubrecht@asoftware.cz>
Date: Mon, 16 Dec 2024 13:09:12 +0100
Subject: [PATCH 1/5] FISH-10299 upgrade selenium libs to the latest version

---
 faces-tck/pom.xml          |  2 +-
 faces-tck/pom.xml-tck-util | 85 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100755 faces-tck/pom.xml-tck-util

diff --git a/faces-tck/pom.xml b/faces-tck/pom.xml
index 41f95bc..d3a260c 100644
--- a/faces-tck/pom.xml
+++ b/faces-tck/pom.xml
@@ -40,8 +40,8 @@
         <maven.settings.xml>${user.home}/.m2/settings.xml</maven.settings.xml>
         <maven.exec.params>-B -e -s ${maven.settings.xml} -f ${tck.root}/faces-tck-${faces.version}/tck/pom.xml</maven.exec.params>
         <maven.exec.projects></maven.exec.projects>
-        <maven.exec.goals>clean install</maven.exec.goals>
         <maven.exec.basic.options>-Ppayara-ci-remote -P!glassfish-ci-managed -Dpayara.version=${payara.version} -Dfaces.version=${faces.version} -Dsigtest.api.groupId=org.glassfish -Dsigtest.api.artifactId=jakarta.faces -Dsigtest.api.version=${sigtest.api.version} -Dpayara.arquillian.version=${payara.arquillian.version}</maven.exec.basic.options>
+        <maven.exec.goals>clean install verify</maven.exec.goals>
         <maven.exec.options></maven.exec.options>
         
         <maven.exec.skipping></maven.exec.skipping> <!-- these options should be removed for the final version -->
diff --git a/faces-tck/pom.xml-tck-util b/faces-tck/pom.xml-tck-util
new file mode 100755
index 0000000..d2591eb
--- /dev/null
+++ b/faces-tck/pom.xml-tck-util
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2021, 2024 Contributors to Eclipse Foundation.
+    Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.ee4j.faces.tck</groupId>
+        <artifactId>jakarta-faces-tck</artifactId>
+        <version>4.1.1</version>
+    </parent>
+
+    <groupId>org.eclipse.ee4j.tck.faces.test</groupId>
+    <artifactId>util</artifactId>
+
+    <name>Jakarta Faces TCK ${project.version} - Test - Util</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.junit</groupId>
+            <artifactId>arquillian-junit-container</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>4.27.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-chrome-driver</artifactId>
+            <version>4.27.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.bonigarcia</groupId>
+            <artifactId>webdrivermanager</artifactId>
+            <version>5.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-impl-maven-archive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eu.ingwar.tools</groupId>
+            <artifactId>arquillian-suite-extension</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.70.0</version>
+        </dependency>
+    </dependencies>
+</project>

From edfb8fa5e3a3f5d7ffdbda5d919ef2131b62784f Mon Sep 17 00:00:00 2001
From: Petr Aubrecht <aubrecht@asoftware.cz>
Date: Mon, 16 Dec 2024 13:10:07 +0100
Subject: [PATCH 2/5] FISH-10299 simplify the local runner

---
 faces-tck/run-tck.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/faces-tck/run-tck.sh b/faces-tck/run-tck.sh
index 125335c..71a87ab 100755
--- a/faces-tck/run-tck.sh
+++ b/faces-tck/run-tck.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
-if [ JAVA_HOME = "" ] ; then
+#if [ JAVA_HOME = "" ] ; then
     export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
-fi
+#fi
+
+#echo "Downloading Faces TCK"
+#cd ..
+#mvn clean install -pl .,:tck-download,:jakarta-faces-tck
+#cd faces-tck
+
+#echo "Building old tck, expected time 3-7 minutes"
+#cd target/faces-tck-4.1.1/tck/old-tck
+#mvn clean install -Dtck.mode=platform -Dmojarra.noupdate=true -Dpayara.version=7.2024.1.Alpha2 -Dfaces.version=4.1.1 -pl :old-faces-tck-parent,:old-tck-build | tee ../../../old-tck.log
+#cd ..
 
-echo "Downloading Faces TCK"
-cd ..
-mvn clean install -pl .,:tck-download,:jakarta-faces-tck
-cd faces-tck
 
 mvn clean verify

From 5202016d5520ab214606b0d0bf68f5962c20485b Mon Sep 17 00:00:00 2001
From: Petr Aubrecht <aubrecht@asoftware.cz>
Date: Tue, 17 Dec 2024 15:55:58 +0100
Subject: [PATCH 3/5] FISH-10299 copy the updated tck util pom.xml

---
 faces-tck/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/faces-tck/pom.xml b/faces-tck/pom.xml
index d3a260c..cda1de9 100644
--- a/faces-tck/pom.xml
+++ b/faces-tck/pom.xml
@@ -107,6 +107,10 @@
                                 <copy file="pom.xml-tck"
                                     tofile="${project.build.directory}/faces-tck-${faces.version}/tck/pom.xml" 
                                     overwrite="true" />
+                                <echo>Upgrade Selenium libs to latest Chrome</echo>
+                                <copy file="pom.xml-tck-util"
+                                    tofile="${project.build.directory}/faces-tck-${faces.version}/tck/util/pom.xml" 
+                                    overwrite="true" />
                             </target>
                         </configuration>
                     </execution>

From 4cef7e3973b82e5f843ed78ae98f2d41f3a7bad9 Mon Sep 17 00:00:00 2001
From: Petr Aubrecht <aubrecht@asoftware.cz>
Date: Tue, 17 Dec 2024 15:57:59 +0100
Subject: [PATCH 4/5] FISH-10299 upgrade chrome dependency to 131

The TCK is written for Chrome 124.*, but the current version is 131.
This commit upgrades the dependency, first using the selenium dev tools
and then rewriting java test imports.
---
 faces-tck/pom.xml          | 27 +++++++++++++++++++++++++++
 faces-tck/pom.xml-tck-util |  5 +++++
 2 files changed, 32 insertions(+)

diff --git a/faces-tck/pom.xml b/faces-tck/pom.xml
index cda1de9..d97908f 100644
--- a/faces-tck/pom.xml
+++ b/faces-tck/pom.xml
@@ -116,6 +116,33 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <id>replace-selenium-driver-version</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                        <configuration>
+                            <ignoreMissingFile>false</ignoreMissingFile>
+                            <includes>
+                                <include>${project.build.directory}/faces-tck-${faces.version}/tck/util/src/main/java/ee/jakarta/tck/faces/test/util/selenium/ChromeDevtoolsDriver.java</include>
+                            </includes>
+                            <replacements>
+                                <replacement>
+                                    <!-- replace with the used version of Chrome! -->
+                                    <token>devtools.v124.network</token>
+                                    <value>devtools.v131.network</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
diff --git a/faces-tck/pom.xml-tck-util b/faces-tck/pom.xml-tck-util
index d2591eb..8e7dfee 100755
--- a/faces-tck/pom.xml-tck-util
+++ b/faces-tck/pom.xml-tck-util
@@ -52,6 +52,11 @@
             <artifactId>selenium-chrome-driver</artifactId>
             <version>4.27.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-devtools-v131</artifactId>
+            <version>4.27.0</version>
+        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>

From a111f96c38fae4e6f6e9c4b8ec5cd6bc2692fcf6 Mon Sep 17 00:00:00 2001
From: Petr Aubrecht <aubrecht@asoftware.cz>
Date: Wed, 18 Dec 2024 14:47:02 +0100
Subject: [PATCH 5/5] FISH-10299 removing verify as it is implied by install

Co-authored-by: Andrew Pielage <pandrex247@hotmail.com>
---
 faces-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/faces-tck/pom.xml b/faces-tck/pom.xml
index d97908f..a0c53ac 100644
--- a/faces-tck/pom.xml
+++ b/faces-tck/pom.xml
@@ -41,7 +41,7 @@
         <maven.exec.params>-B -e -s ${maven.settings.xml} -f ${tck.root}/faces-tck-${faces.version}/tck/pom.xml</maven.exec.params>
         <maven.exec.projects></maven.exec.projects>
         <maven.exec.basic.options>-Ppayara-ci-remote -P!glassfish-ci-managed -Dpayara.version=${payara.version} -Dfaces.version=${faces.version} -Dsigtest.api.groupId=org.glassfish -Dsigtest.api.artifactId=jakarta.faces -Dsigtest.api.version=${sigtest.api.version} -Dpayara.arquillian.version=${payara.arquillian.version}</maven.exec.basic.options>
-        <maven.exec.goals>clean install verify</maven.exec.goals>
+        <maven.exec.goals>clean install</maven.exec.goals>
         <maven.exec.options></maven.exec.options>
         
         <maven.exec.skipping></maven.exec.skipping> <!-- these options should be removed for the final version -->