Skip to content

Commit

Permalink
Merge pull request #5272 from jdi-testing/update_selenium
Browse files Browse the repository at this point in the history
Update selenium, webdriver and other libraries
  • Loading branch information
pnatashap authored Dec 19, 2023
2 parents 459e2cd + dedf853 commit f7e3e77
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 25 deletions.
2 changes: 1 addition & 1 deletion jdi-eyes-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<aspectj.version>1.9.20</aspectj.version>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
<aspectj.args></aspectj.args>
<java.version>11</java.version>
Expand Down
2 changes: 1 addition & 1 deletion jdi-light-angular-tests-with-mocks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<driver>chrome</driver>
<aspectj.version>1.9.20</aspectj.version>
<java.version>11</java.version>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<aspectj.args></aspectj.args>
Expand Down
2 changes: 1 addition & 1 deletion jdi-light-angular-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<driver>chrome</driver>
<aspectj.version>1.9.20</aspectj.version>
<java.version>11</java.version>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<suite-xml-file>src/test/resources/general.xml</suite-xml-file>
Expand Down
2 changes: 1 addition & 1 deletion jdi-light-applitools-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<driver>chrome</driver>
<domain>https://jdi-testing.github.io/jdi-light/</domain>
<aspectj.version>1.9.20</aspectj.version>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<testng.version>7.8.0</testng.version>
Expand Down
2 changes: 1 addition & 1 deletion jdi-light-bootstrap-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<driver>chrome</driver>
<!--driver>firefox</driver-->
<allure.maven>2.12.0</allure.maven>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<aspectj.version>1.9.20</aspectj.version>
<testng.version>7.8.0</testng.version>
<!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
Expand Down
16 changes: 8 additions & 8 deletions jdi-light-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@
<aspectj.version>1.9.20</aspectj.version>
<aspectj.maven>1.14.0</aspectj.maven>
<java.version>11</java.version>
<allure.version>2.23.0</allure.version>
<allure.version>2.25.0</allure.version>
<gpg.key></gpg.key>
</properties>

<dependencies>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>4.11.0</version>
<version>4.16.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.2</version>
<version>2.16.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.13.0</version>
<version>2.15.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.24.0</version>
<version>1.25.0</version>
</dependency>
<dependency>
<groupId>com.jdiai.tools</groupId>
Expand All @@ -66,7 +66,7 @@
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
<version>5.5.3</version>
<version>5.6.2</version>
<exclusions>
<exclusion>
<groupId>com.github.docker-java</groupId>
Expand Down Expand Up @@ -95,12 +95,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.2-jre</version>
<version>33.0.0-jre</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@
import org.openqa.selenium.firefox.FirefoxOptions;
import org.openqa.selenium.firefox.FirefoxProfile;
import org.openqa.selenium.ie.InternetExplorerOptions;
import org.openqa.selenium.logging.LoggingPreferences;
import org.openqa.selenium.safari.SafariOptions;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.logging.Level;

import static com.epam.jdi.light.driver.WebDriverUtils.maximizeWindow;
import static com.epam.jdi.light.driver.get.OsTypes.*;
Expand All @@ -34,8 +32,6 @@
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.openqa.selenium.UnexpectedAlertBehaviour.ACCEPT;
import static org.openqa.selenium.ie.InternetExplorerDriver.UNEXPECTED_ALERT_BEHAVIOR;
import static org.openqa.selenium.logging.LogType.PERFORMANCE;
import static org.openqa.selenium.remote.CapabilityType.*;

/**
Expand Down
2 changes: 1 addition & 1 deletion jdi-light-html-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<driver>chrome</driver>
<validate.performance>false</validate.performance>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<testng.version>7.8.0</testng.version>
<aspectj.version>1.9.20</aspectj.version>
Expand Down
2 changes: 1 addition & 1 deletion jdi-light-material-ui-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<driver>chrome</driver>
<aspectj.version>1.9.20</aspectj.version>
<java.version>11</java.version>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<jdi.version>1.5.2-SNAPSHOT</jdi.version>
Expand Down
2 changes: 1 addition & 1 deletion jdi-light-mobile-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<driver>chrome</driver>
<!--driver>firefox</driver-->
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<aspectj.version>1.9.20</aspectj.version>
Expand Down
2 changes: 1 addition & 1 deletion jdi-light-vuetify-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<driver>chrome</driver>
<aspectj.version>1.9.20</aspectj.version>
<java.version>11</java.version>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<suite-xml-file>src/test/resources/general.xml</suite-xml-file>
Expand Down
2 changes: 1 addition & 1 deletion jdi-light/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<properties>
<java.version>11</java.version>
<jdi.version>1.5.2-SNAPSHOT</jdi.version>
<log4j2.version>2.20.0</log4j2.version>
<log4j2.version>2.22.0</log4j2.version>
<gpg.key></gpg.key>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion test-examples/jdi-light-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<properties>
<jdi.version>1.5.2-SNAPSHOT</jdi.version>
<driver>chrome</driver>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<aspectj.version>1.9.20</aspectj.version>
Expand Down
2 changes: 1 addition & 1 deletion test-examples/jdi-performance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!--driver>firefox</driver-->
<domain>https://jdi-testing.github.io/jdi-light/</domain>
<aspectj.version>1.9.20</aspectj.version>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
Expand Down
2 changes: 1 addition & 1 deletion test-templates/jdi-light-testng-template/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<aspectj.version>1.9.20</aspectj.version>
<domain>https://jdi-testing.github.io/jdi-light/</domain>
<allure.testng>2.23.0</allure.testng>
<allure.testng>2.25.0</allure.testng>
<allure.maven>2.12.0</allure.maven>
<jetty.version>9.4.12.RC2</jetty.version>
<domain>https://jdi-testing.github.io/jdi-light/</domain>
Expand Down

0 comments on commit f7e3e77

Please sign in to comment.