diff --git a/pom.xml b/pom.xml index ba12098..2aaafeb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.aquality-automation aquality-selenium - 2.5.0 + 2.5.1 jar Aquality Selenium Library around Selenium WebDriver @@ -85,7 +85,7 @@ io.github.bonigarcia webdrivermanager - 3.4.0 + 4.2.0 diff --git a/src/main/java/aquality/selenium/browser/LocalBrowserFactory.java b/src/main/java/aquality/selenium/browser/LocalBrowserFactory.java index 218db86..97a7b20 100644 --- a/src/main/java/aquality/selenium/browser/LocalBrowserFactory.java +++ b/src/main/java/aquality/selenium/browser/LocalBrowserFactory.java @@ -4,8 +4,8 @@ import aquality.selenium.configuration.driversettings.IDriverSettings; import aquality.selenium.core.localization.ILocalizedLogger; import aquality.selenium.core.utilities.IActionRetrier; -import io.github.bonigarcia.wdm.Architecture; import io.github.bonigarcia.wdm.WebDriverManager; +import io.github.bonigarcia.wdm.config.Architecture; import org.openqa.selenium.Capabilities; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.edge.EdgeDriver; @@ -32,19 +32,19 @@ protected RemoteWebDriver getDriver() { Architecture systemArchitecture = driverSettings.getSystemArchitecture(); switch (browserName) { case CHROME: - WebDriverManager.chromedriver().version(webDriverVersion).setup(); + WebDriverManager.chromedriver().driverVersion(webDriverVersion).setup(); driver = getDriver(ChromeDriver.class, driverSettings.getCapabilities()); break; case FIREFOX: - WebDriverManager.firefoxdriver().version(webDriverVersion).setup(); + WebDriverManager.firefoxdriver().driverVersion(webDriverVersion).setup(); driver = getDriver(FirefoxDriver.class, driverSettings.getCapabilities()); break; case IEXPLORER: - WebDriverManager.iedriver().architecture(systemArchitecture).version(webDriverVersion).setup(); + WebDriverManager.iedriver().architecture(systemArchitecture).driverVersion(webDriverVersion).setup(); driver = getDriver(InternetExplorerDriver.class, driverSettings.getCapabilities()); break; case EDGE: - WebDriverManager.edgedriver().version(webDriverVersion).setup(); + WebDriverManager.edgedriver().driverVersion(webDriverVersion).setup(); driver = getDriver(EdgeDriver.class, driverSettings.getCapabilities()); break; case SAFARI: @@ -56,7 +56,7 @@ protected RemoteWebDriver getDriver() { return driver; } - private T getDriver(Class driverClass, Capabilities capabilities) { + private T getDriver(Class driverClass, Capabilities capabilities) { try { return driverClass.getDeclaredConstructor(Capabilities.class).newInstance(capabilities); } catch (ReflectiveOperationException e) { diff --git a/src/main/java/aquality/selenium/configuration/driversettings/DriverSettings.java b/src/main/java/aquality/selenium/configuration/driversettings/DriverSettings.java index 2ce04ca..c89cc1f 100644 --- a/src/main/java/aquality/selenium/configuration/driversettings/DriverSettings.java +++ b/src/main/java/aquality/selenium/configuration/driversettings/DriverSettings.java @@ -4,7 +4,7 @@ import aquality.selenium.core.localization.ILocalizationManager; import aquality.selenium.core.logging.Logger; import aquality.selenium.core.utilities.ISettingsFile; -import io.github.bonigarcia.wdm.Architecture; +import io.github.bonigarcia.wdm.config.Architecture; import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.MutableCapabilities; import org.openqa.selenium.PageLoadStrategy; diff --git a/src/main/java/aquality/selenium/configuration/driversettings/IDriverSettings.java b/src/main/java/aquality/selenium/configuration/driversettings/IDriverSettings.java index a7b4549..3a63184 100644 --- a/src/main/java/aquality/selenium/configuration/driversettings/IDriverSettings.java +++ b/src/main/java/aquality/selenium/configuration/driversettings/IDriverSettings.java @@ -1,7 +1,7 @@ package aquality.selenium.configuration.driversettings; import aquality.selenium.browser.BrowserName; -import io.github.bonigarcia.wdm.Architecture; +import io.github.bonigarcia.wdm.config.Architecture; import org.openqa.selenium.Capabilities; import org.openqa.selenium.PageLoadStrategy;