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-10299 Faces old-tests #121

Merged
merged 5 commits into from
Dec 18, 2024
Merged

FISH-10299 Faces old-tests #121

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
20477f5
FISH-10299 upgrade selenium libs to the latest version
aubi Dec 16, 2024
edfb8fa
FISH-10299 simplify the local runner
aubi Dec 16, 2024
5202016
FISH-10299 copy the updated tck util pom.xml
aubi Dec 17, 2024
4cef7e3
FISH-10299 upgrade chrome dependency to 131
aubi Dec 17, 2024
a111f96
FISH-10299 removing verify as it is implied by install
aubi Dec 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
33 changes: 32 additions & 1 deletion faces-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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</maven.exec.goals>
<maven.exec.options></maven.exec.options>

<maven.exec.skipping></maven.exec.skipping> <!-- these options should be removed for the final version -->
Expand Down Expand Up @@ -107,11 +107,42 @@
<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>
</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>
Expand Down
90 changes: 90 additions & 0 deletions faces-tck/pom.xml-tck-util
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?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>org.seleniumhq.selenium</groupId>
<artifactId>selenium-devtools-v131</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>
18 changes: 12 additions & 6 deletions faces-tck/run-tck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Comment on lines 1 to -9
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you intend to commit these changes?

This is a script which just runs mvn clean verify and does nothing else.
If this is intentional I'd just delete the file as it's pointless.
If anything it's worse than pointless, as it will overwrite JAVA_HOME with an environment specific value

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll move the notes to README and delete the script


mvn clean verify