Skip to content

Commit

Permalink
Update for Faces 4.1.0-M1 and other M1 versions
Browse files Browse the repository at this point in the history 
Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
  • Loading branch information
@arjantijms
arjantijms committed Feb 10, 2024
1 parent 595e72e commit b1713a8
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 43 deletions.
26 changes: 13 additions & 13 deletions tck/faces-signaturetest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
<name>Faces TCK Signature Test</name>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<sigtest.plugin.version>1.6</sigtest.plugin.version>
<junit.jupiter.version>[5.7.2, 5.8-A00)</junit.jupiter.version>
<faces.api.version>4.0.0</faces.api.version>
<enterprise.cdi.api.version>4.0.0</enterprise.cdi.api.version>
<el.api.version>5.0.0</el.api.version>
<websocket.api.version>2.1.0</websocket.api.version>
<servlet.api.version>6.0.0</servlet.api.version>
<inject.api.version>2.0.1</inject.api.version>
<validation.api.version>3.0.2</validation.api.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<sigtest.plugin.version>1.7</sigtest.plugin.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
<faces.api.version>4.1.0-M1</faces.api.version>
<enterprise.cdi.api.version>4.1.0-M1</enterprise.cdi.api.version>
<el.api.version>6.0.0-M2</el.api.version>
<websocket.api.version>2.2.0-M1</websocket.api.version>
<servlet.api.version>6.1.0-M1</servlet.api.version>
<inject.api.version>2.0.1.MR</inject.api.version>
<validation.api.version>3.1.0-M1</validation.api.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -83,13 +83,13 @@
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>2.1.0</version>
<version>2.2.0-M1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<version>2.1.0</version>
<version>2.2.0-M1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
37 changes: 19 additions & 18 deletions tck/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2020, 2022 Contributors to Eclipse Foundation. All rights reserved.
Copyright (c) 2020, 2024 Contributors to Eclipse Foundation. 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
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.9</version>
<relativePath />
</parent>

Expand All @@ -44,14 +44,15 @@
</modules>

<properties>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.test.skip>false</maven.test.skip>
<skipTests>false</skipTests>
<test.selenium>true</test.selenium>

<faces.version>4.0.0</faces.version>
<faces.version>4.1.0-M1</faces.version>

<!-- Application Server versions (these are downloaded and installed in these versions by Maven for the CI profiles) -->
<tomcat.version>9.0.12</tomcat.version>
Expand All @@ -62,14 +63,14 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.7.1.Final</version>
<version>1.8.0.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-api</artifactId>
<version>1.7.1.Final</version>
<version>1.8.0.Final</version>
</dependency>
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
Expand All @@ -90,41 +91,41 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<version>6.1.0-M1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>2.1.0</version>
<version>2.2.0-M1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<version>2.1.0</version>
<version>2.2.0-M1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>5.0.0</version>
<version>6.0.0-M2</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.0.1</version>
<version>4.1.0-M1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.1</version>
<version>3.1.0-M1</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -160,7 +161,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -301,6 +301,7 @@
<configuration>
<systemPropertyVariables>
<finalName>${project.build.finalName}</finalName>
<test.selenium>${test.selenium}</test.selenium>
</systemPropertyVariables>
</configuration>
</plugin>
Expand Down Expand Up @@ -376,9 +377,9 @@
<mojarra.noupdate>false</mojarra.noupdate>

<!-- Verhicle used for testing the Mojarra version -->
<glassfish.version>7.0.8</glassfish.version>
<glassfish.version>8.0.0-M2</glassfish.version>
<glassfish.root>${maven.multiModuleProjectDirectory}/target</glassfish.root>
<glassfish.home>${glassfish.root}/glassfish7</glassfish.home>
<glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
</properties>

<dependencies>
Expand All @@ -394,7 +395,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
Expand Down Expand Up @@ -433,7 +433,7 @@
<version>${mojarra.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${glassfish.root}/glassfish7/glassfish/modules</outputDirectory>
<outputDirectory>${glassfish.root}/glassfish8/glassfish/modules</outputDirectory>
<destFileName>jakarta.faces.jar</destFileName>
</artifactItem>
</artifactItems>
Expand All @@ -445,7 +445,8 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<glassfish.home>${glassfish.root}/glassfish7</glassfish.home>
<glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
<test.selenium>${test.selenium}</test.selenium>
</systemPropertyVariables>
</configuration>
</plugin>
Expand Down
10 changes: 5 additions & 5 deletions tck/util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
Expand All @@ -45,12 +45,12 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>4.7.2</version>
<version>4.16.1</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
<version>4.7.2</version>
<version>4.16.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand All @@ -60,7 +60,7 @@
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
<version>5.3.1</version>
<version>5.6.2</version>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
Expand All @@ -79,7 +79,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.58.0</version>
<version>2.70.0</version>
</dependency>
</dependencies>
</project>
14 changes: 7 additions & 7 deletions tck/util/src/main/java/ee/jakarta/tck/faces/test/util/selenium/ChromeDevtoolsDriver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,15 @@
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.chrome.ChromeDriverLogLevel;
import org.openqa.selenium.chrome.ChromeDriverService;
import org.openqa.selenium.chrome.ChromeOptions;
import org.openqa.selenium.chromium.ChromiumNetworkConditions;
import org.openqa.selenium.devtools.DevTools;
import org.openqa.selenium.devtools.v108.network.Network;
import org.openqa.selenium.devtools.v108.network.model.Request;
import org.openqa.selenium.devtools.v108.network.model.RequestId;
import org.openqa.selenium.devtools.v108.network.model.ResponseReceived;
import org.openqa.selenium.devtools.v108.network.model.TimeSinceEpoch;
import org.openqa.selenium.devtools.v118.network.Network;
import org.openqa.selenium.devtools.v118.network.model.Request;
import org.openqa.selenium.devtools.v118.network.model.RequestId;
import org.openqa.selenium.devtools.v118.network.model.ResponseReceived;
import org.openqa.selenium.devtools.v118.network.model.TimeSinceEpoch;
import org.openqa.selenium.html5.LocalStorage;
import org.openqa.selenium.html5.Location;
import org.openqa.selenium.html5.SessionStorage;
Expand Down Expand Up @@ -126,7 +125,8 @@ public static ExtendedWebDriver stdInit() {
options.setExperimentalOption("prefs", prefs);
options.addArguments("--lang=en");

options.setLogLevel(ChromeDriverLogLevel.OFF);
//* @deprecated Use {@link ChromeDriverService.Builder#withLogLevel(ChromeDriverLogLevel)} to set log level.
// options.setLogLevel(ChromeDriverLogLevel.OFF);

ExtendedWebDriver driver = new ChromeDevtoolsDriver(options);
driver.manage().timeouts().implicitlyWait(WebPage.STD_TIMEOUT);
Expand Down

0 comments on commit b1713a8

Please sign in to comment.