Updating dependencies

Author: MarkusBernhardt

CHANGES.md

@@ -1,7 +1,15 @@
 CHANGES
 =======
 
-unreleased
+Unreleased
+----------
+* Updating xml-doclet to version 1.0.5
+* Updating selenium-server to version 2.48.2
+* Updating aspectjrt to version 1.8.7
+* Updating selendroid-client to version 0.17.0
+* Updating java-client to version 3.2.0
+
+1.4.0.7
 ----------
 * Avoid NullPointerException in isEnabled method. See #53, #56. Great thanks to atcarmo for this patch.
 * Updated selenium-server dependency to 2.43.1. See #58. Great thanks to WojtekKowaluk for this patch.

pom.xml

@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -20,10 +21,11 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<downloadSources>true</downloadSources>
 		<downloadJavadocs>true</downloadJavadocs>
-		<aspectj.version>1.7.3</aspectj.version>
+		<aspectj.version>1.8.7</aspectj.version>
 		<java.version>1.6</java.version>
-		<xml.doclet.version>1.0.4</xml.doclet.version>
+		<xml.doclet.version>1.0.5</xml.doclet.version>
 		<robotframework.version>2.9.2</robotframework.version>
+		<selenium.version>2.48.2</selenium.version>
 		<keywords.class>Selenium2Library</keywords.class>
 	</properties>
 
@@ -62,7 +64,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-server</artifactId>
-			<version>2.47.1</version>
+			<version>${selenium.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.opera</groupId>
@@ -92,23 +94,23 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-remote-driver</artifactId>
-			<version>2.47.1</version>
+			<version>${selenium.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.selendroid</groupId>
 			<artifactId>selendroid-client</artifactId>
-			<version>0.11.0</version>
+			<version>0.17.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.appium</groupId>
 			<artifactId>java-client</artifactId>
-			<version>2.0.0</version>
+			<version>3.2.0</version>
 		</dependency>
 		<dependency>
-            		<groupId>org.apache.commons</groupId>
-            		<artifactId>commons-exec</artifactId>
-            		<version>1.3</version>
-        	</dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-exec</artifactId>
+			<version>1.3</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -216,7 +218,7 @@
 				<!-- Set 1.7 as target, use project source encoding -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
+				<version>3.3</version>
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
@@ -230,7 +232,7 @@
 				<!-- Build the fat jar with all dependencies -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.4</version>
+				<version>2.6</version>
 				<configuration>
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -250,7 +252,7 @@
 				<!-- extract documentation for libdoc -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
+				<version>2.10.3</version>
 				<executions>
 					<execution>
 						<id>xml-doclet</id>
@@ -332,7 +334,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>2.9.1</version>
+						<version>2.10.3</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -351,7 +353,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>1.8</version>
+						<version>1.9.1</version>
 						<executions>
 							<execution>
 								<id>attach-artifacts</id>

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

@@ -1,5 +1,8 @@
 package com.github.markusbernhardt.selenium2library.keywords;
 
+import io.appium.java_client.ios.IOSDriver;
+import io.selendroid.client.SelendroidDriver;
+
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -26,13 +29,11 @@
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import io.selendroid.SelendroidDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxProfile;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 import org.openqa.selenium.ie.InternetExplorerDriver;
-import io.appium.java_client.ios.IOSDriver;
 import org.openqa.selenium.phantomjs.PhantomJSDriver;
 import org.openqa.selenium.remote.Augmenter;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -1384,7 +1385,7 @@ protected WebDriver createLocalWebDriver(String browserName, DesiredCapabilities
 			return driver;
 		} else if ("iphone".equals(browserName) || "ipad".equals(browserName)) {
 			try {
-				return new IOSDriver(new URL(""), desiredCapabilities);
+				return new IOSDriver<WebElement>(new URL(""), desiredCapabilities);
 			} catch (Exception e) {
 				throw new Selenium2LibraryFatalException("Creating " + browserName + " instance failed.", e);
 			}