deps: update dependencies

Author: Hi-Fi

DEPENDENCIES.md

@@ -18,18 +18,18 @@ your pom.xml:
     <dependency>
         <groupId>com.github.marketsquare</groupId>
         <artifactId>robotframework-seleniumlibrary</artifactId>
-        <version>4.0.0.0</version>
+        <version>4.28.1.0</version>
         <scope>test</scope>
     </dependency>
 
 If you cannot use the robotframework-maven-plugin you can use the
-[jar-with-dependencies](https://repo1.maven.org/maven2/com/github/marketsquare/robotframework-seleniumlibrary/4.0.0.0/robotframework-seleniumlibrary-4.0.0.0-jar-with-dependencies.jar),
-which contains all required libraries except ios/android ones (Appium and Selendroid). Running of tests with this can be done with command `java -jar robotframework-seleniumlibrary-4.0.0.0-jar-with-dependencies.jar <test location>`.
+[jar-with-dependencies](https://repo1.maven.org/maven2/com/github/marketsquare/robotframework-seleniumlibrary/4.28.1.0/robotframework-seleniumlibrary-4.28.1.0-jar-with-dependencies.jar),
+which contains all required libraries except ios/android ones (Appium). Running of tests with this can be done with command `java -jar robotframework-seleniumlibrary-4.28.1.0-jar-with-dependencies.jar <test location>`.
 
 - More information about this library can be found in the
-  [Keyword Documentation](https://repo1.maven.org/maven2/com/github/marketsquare/robotframework-seleniumlibrary/4.0.0.0/robotframework-seleniumlibrary-4.0.0.0.html).
+  [Keyword Documentation](https://repo1.maven.org/maven2/com/github/marketsquare/robotframework-seleniumlibrary/4.28.1.0/robotframework-seleniumlibrary-4.28.1.0.html).
 - For keyword completion in RIDE you can download this
-  [Library Specs](https://repo1.maven.org/maven2/com/github/marketsquare/robotframework-seleniumlibrary/4.0.0.0/robotframework-seleniumlibrary-4.0.0.0.xml)
+  [Library Specs](https://repo1.maven.org/maven2/com/github/marketsquare/robotframework-seleniumlibrary/4.28.1.0/robotframework-seleniumlibrary-4.28.1.0.xml)
   and place it in your PYTHONPATH.
 
 ## Old versions
@@ -82,8 +82,8 @@ which contains all required libraries. Running of tests with this can be done wi
 
 ## Testing IOS/Android browsers with library
 
-Pre-Selenium 4 fat-jar contains Appium and Selendroid that allow testing of IOS and Android browsers. Those are dropped in Selenium 4 -versions,
-so dependencies needs to be handles self with either Maven/Gradle or manually. If there's need to have fat-jar with those, please create issue about that.
+Pre-Selenium 4 fat-jar contained Appium and Selendroid that allowed testing of IOS and Android browsers. Those are dropped in Selenium 4 -versions,
+so dependencies needs to be handles self with either Maven/Gradle or manually. Also 4.28.1.0 version of the library moved purely to Appium. If there's need to have fat-jar with those, please create issue about that.
 
 ## Differences
 

README.md

@@ -4,7 +4,7 @@
 
 	<groupId>com.github.marketsquare</groupId>
 	<artifactId>robotframework-seleniumlibrary</artifactId>
-	<version>4.0.0.1-SNAPSHOT</version>
+	<version>4.28.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Robot Framework :: SeleniumLibrary</name>
@@ -72,11 +72,12 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<downloadSources>true</downloadSources>
 		<downloadJavadocs>true</downloadJavadocs>
-		<aspectj.version>1.9.8.RC1</aspectj.version>
-		<java.version>11</java.version>
+		<aspectj.version>1.9.21.2</aspectj.version>
+		<java.compile.version>17</java.compile.version>
+		<java.runtime.version>11</java.runtime.version>
 		<robotframework.maven.plugin.version>2.1.0</robotframework.maven.plugin.version>
-		<robotframework.version>4.1</robotframework.version>
-		<selenium.version>4.0.0</selenium.version>
+		<robotframework.version>4.1.2</robotframework.version>
+		<selenium.version>4.28.1</selenium.version>
 		<keywords.class>SeleniumLibrary</keywords.class>
 		<browser>googlechromeheadless</browser>
 		<downloadWebDriver>False</downloadWebDriver>
@@ -108,22 +109,10 @@
 			<artifactId>json-simple</artifactId>
 			<version>1.1.1</version>
 		</dependency>
-		<dependency>
-			<groupId>io.selendroid</groupId>
-			<artifactId>selendroid-client</artifactId>
-			<version>0.17.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.seleniumhq.selenium</groupId>
-					<artifactId>selenium-java</artifactId>
-				</exclusion>
-			</exclusions>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>io.appium</groupId>
 			<artifactId>java-client</artifactId>
-			<version>7.6.0</version>
+			<version>9.4.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.seleniumhq.selenium</groupId>
@@ -139,12 +128,12 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-exec</artifactId>
-			<version>1.3</version>
+			<version>1.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>htmlunit-driver</artifactId>
-			<version>2.53.0</version>
+			<version>4.13.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.seleniumhq.selenium</groupId>
@@ -163,18 +152,19 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.28.2</version>
+			<version>5.15.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.github.bonigarcia</groupId>
 			<artifactId>webdrivermanager</artifactId>
-			<version>5.0.3</version>
+			<!-- Issue with newer versions: https://github.com/bonigarcia/webdrivermanager/issues/1408 -->
+			<version>5.7.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.12.0</version>
+			<version>3.17.0</version>
 		</dependency>
 	</dependencies>
 
@@ -341,9 +331,9 @@
 							</execution>
 						</executions>
 						<configuration>
-							<source>${java.version}</source>
-							<target>${java.version}</target>
-							<complianceLevel>${java.version}</complianceLevel>
+							<source>${java.compile.version}</source>
+							<target>${java.runtime.version}</target>
+							<complianceLevel>${java.compile.version}</complianceLevel>
 							<showWeaveInfo>true</showWeaveInfo>
 						</configuration>
 						<dependencies>

pom.xml

@@ -1,9 +1,9 @@
 package com.github.markusbernhardt.seleniumlibrary.keywords;
 
+import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.ios.IOSDriver;
 import io.github.bonigarcia.wdm.WebDriverManager;
 import io.github.bonigarcia.wdm.config.DriverManagerType;
-import io.selendroid.client.SelendroidDriver;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -61,6 +61,8 @@
 import com.github.markusbernhardt.seleniumlibrary.utils.WebDriverCache;
 import com.github.markusbernhardt.seleniumlibrary.utils.WebDriverCache.SessionIdAliasWebDriverTuple;
 
+import static org.openqa.selenium.remote.Browser.HTMLUNIT;
+
 @RobotKeywords
 public class BrowserManagement extends RunOnFailureKeywordsAdapter {
 
@@ -639,14 +641,14 @@ protected WebDriver createLocalWebDriver(String browserName, Capabilities desire
                 return new SafariDriver(new SafariOptions().merge(desiredCapabilities));
             case "android":
                 try {
-                    return new SelendroidDriver(desiredCapabilities);
+                    return new AndroidDriver(desiredCapabilities);
                 } catch (Exception e) {
                     throw new SeleniumLibraryFatalException(e);
                 }
             case "ipad":
             case "iphone":
                 try {
-                    return new IOSDriver<>(new URL(""), desiredCapabilities);
+                    return new IOSDriver(new URL(""), desiredCapabilities);
                 } catch (Exception e) {
                     throw new SeleniumLibraryFatalException("Creating " + browserName + " instance failed.", e);
                 }
@@ -716,7 +718,7 @@ protected Capabilities createCapabilities(String browserName, String desiredCapa
         case "firefoxheadless":
             desiredCapabilities = new FirefoxOptions();
             parseBrowserOptionsFirefox(browserOptions, desiredCapabilities);
-            ((FirefoxOptions)desiredCapabilities).setHeadless(true);
+            ((FirefoxOptions)desiredCapabilities).addArguments("-headless");
             break;
         case "ie":
         case "internetexplorer":
@@ -727,7 +729,7 @@ protected Capabilities createCapabilities(String browserName, String desiredCapa
             break;
         case "edgeheadless":
             desiredCapabilities = new EdgeOptions();
-            ((EdgeOptions)desiredCapabilities).setHeadless(true);
+            ((EdgeOptions)desiredCapabilities).addArguments("--headless=chrome");
             break;           
         case "gc":
         case "chrome":
@@ -742,14 +744,14 @@ protected Capabilities createCapabilities(String browserName, String desiredCapa
             desiredCapabilities = new ChromeOptions();
             logging.debug("Parsing chrome options: "+browserOptions);
             parseBrowserOptionsChrome(browserOptions, desiredCapabilities);
-            ((ChromeOptions)desiredCapabilities).setHeadless(true);
+            ((ChromeOptions)desiredCapabilities).addArguments("--headless=chrome");
             break;
         case "safari":
             desiredCapabilities = new SafariOptions();
             break;
         case "htmlunit":
         case "htmlunitwithjs":
-            desiredCapabilities = DesiredCapabilities.htmlUnit();
+            desiredCapabilities = new DesiredCapabilities(HTMLUNIT.browserName(), "", Platform.ANY);
             ((DesiredCapabilities) desiredCapabilities).setBrowserName("htmlunit");
             break;
         default:
@@ -858,7 +860,7 @@ protected void parseBrowserOptionsFirefox(String browserOptions, Capabilities de
                         logging.warn("Unknown browserOption: " + key + ":" + entry.getValue());
                     }
                 }
-                ((FirefoxOptions) desiredCapabilities).setCapability(FirefoxDriver.PROFILE, firefoxProfile);
+                ((FirefoxOptions) desiredCapabilities).setProfile(firefoxProfile);
             } else {
                 logging.warn("Invalid browserOptions: " + browserOptions);
             }

src/main/java/com/github/markusbernhardt/seleniumlibrary/keywords/BrowserManagement.java

@@ -1,8 +1,12 @@
 package com.github.markusbernhardt.seleniumlibrary.keywords;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
+import java.io.IOException;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
@@ -41,25 +45,39 @@ public void testCreateDesiredCapabilities() {
         String desired = "{\"platform\":\"WINDOWS\",\"browserName\":\"firefox\",\"version\":\"\"}";
         String browserOptions = "{\"preferences\": {\"network.proxy.type\": 1, \"network.proxy.http\": \"localhost\", \"network.proxy.http_port\": 73571}}";
         Capabilities dc = bm.createCapabilities("firefox", desired, browserOptions);
-        FirefoxProfile profile = (FirefoxProfile) dc.getCapability("firefox_profile");
-        assertTrue(dc.getCapability("platform").toString().equals("WINDOWS"));
-        assertTrue(profile.getStringPreference("network.proxy.http", "wrong") != "wrong");
+        @SuppressWarnings("unchecked")
+        String profileString = ((java.util.Map<String, String>) dc.getCapability("moz:firefoxOptions")).get("profile");
+        FirefoxProfile profile;
+        try {
+            profile = FirefoxProfile.fromJson(profileString);
+            assertTrue(dc.getCapability("platform").toString().equals("WINDOWS"));
+            assertTrue(profile.getStringPreference("network.proxy.http", "wrong") != "wrong");
+        } catch (IOException e) {
+            fail(e.getMessage());
+        }
     }
 
     @Test
     public void testCreateDesiredCapabilitiesWithoutBrowserOptions() {
         String desired = "{\"platform\":\"WINDOWS\",\"browserName\":\"firefox\",\"version\":\"\"}";
         Capabilities dc = bm.createCapabilities("firefox", desired, null);
-        FirefoxProfile profile = (FirefoxProfile) dc.getCapability("firefox_profile");
         assertTrue(dc.getCapability("platform").toString().equals("WINDOWS"));
     }
 
+    @SuppressWarnings("rawtypes")
     @Test
     public void testCreateDesiredCapabilitiesWithOnlyBrowserOptions() {
         String browserOptions = "{\"preferences\": {\"network.proxy.type\": 1, \"network.proxy.http\": \"localhost\", \"network.proxy.http_port\": 73571}}";
         Capabilities dc = bm.createCapabilities("firefox", null, browserOptions);
-        FirefoxProfile profile = (FirefoxProfile) dc.getCapability("firefox_profile");
-        assertTrue(profile.getStringPreference("network.proxy.http", "wrong") != "wrong");
+        @SuppressWarnings("unchecked")
+        String profileString = ((java.util.Map<String, String>) dc.getCapability("moz:firefoxOptions")).get("profile");
+        FirefoxProfile profile;
+        try {
+            profile = FirefoxProfile.fromJson(profileString);
+            assertTrue(profile.getStringPreference("network.proxy.http", "wrong") != "wrong");
+        } catch (IOException e) {
+            fail(e.getMessage());
+        }
     }
 
     @Test
@@ -79,7 +97,6 @@ public void parseChromeBrowserOptions() {
 
     @Test
     public void parseChromeCapabilities() {
-        ChromeOptions chromeOptions = new ChromeOptions();
         String browserName = "googlechromeheadless";
         String browserOptions = "{\"args\":[\"start-maximized\"],\"extensions\":[],\"prefs\":{\"intl.accept_languages\":\"de-AT\"}}";
         String desiredCapabilitiesString = "{}";