Skip to content

Commit ffefc27

Browse files
Updating dependencies
1 parent 2f721ca commit ffefc27

File tree

3 files changed

+31
-20
lines changed

3 files changed

+31
-20
lines changed

CHANGES.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
CHANGES
22
=======
33

4-
unreleased
4+
Unreleased
5+
----------
6+
* Updating xml-doclet to version 1.0.5
7+
* Updating selenium-server to version 2.48.2
8+
* Updating aspectjrt to version 1.8.7
9+
* Updating selendroid-client to version 0.17.0
10+
* Updating java-client to version 3.2.0
11+
12+
1.4.0.7
513
----------
614
* Avoid NullPointerException in isEnabled method. See #53, #56. Great thanks to atcarmo for this patch.
715
* Updated selenium-server dependency to 2.43.1. See #58. Great thanks to WojtekKowaluk for this patch.

pom.xml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34

45
<parent>
@@ -20,10 +21,11 @@
2021
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2122
<downloadSources>true</downloadSources>
2223
<downloadJavadocs>true</downloadJavadocs>
23-
<aspectj.version>1.7.3</aspectj.version>
24+
<aspectj.version>1.8.7</aspectj.version>
2425
<java.version>1.6</java.version>
25-
<xml.doclet.version>1.0.4</xml.doclet.version>
26+
<xml.doclet.version>1.0.5</xml.doclet.version>
2627
<robotframework.version>2.9.2</robotframework.version>
28+
<selenium.version>2.48.2</selenium.version>
2729
<keywords.class>Selenium2Library</keywords.class>
2830
</properties>
2931

@@ -62,7 +64,7 @@
6264
<dependency>
6365
<groupId>org.seleniumhq.selenium</groupId>
6466
<artifactId>selenium-server</artifactId>
65-
<version>2.47.1</version>
67+
<version>${selenium.version}</version>
6668
</dependency>
6769
<dependency>
6870
<groupId>com.opera</groupId>
@@ -92,23 +94,23 @@
9294
<dependency>
9395
<groupId>org.seleniumhq.selenium</groupId>
9496
<artifactId>selenium-remote-driver</artifactId>
95-
<version>2.47.1</version>
97+
<version>${selenium.version}</version>
9698
</dependency>
9799
<dependency>
98100
<groupId>io.selendroid</groupId>
99101
<artifactId>selendroid-client</artifactId>
100-
<version>0.11.0</version>
102+
<version>0.17.0</version>
101103
</dependency>
102104
<dependency>
103105
<groupId>io.appium</groupId>
104106
<artifactId>java-client</artifactId>
105-
<version>2.0.0</version>
107+
<version>3.2.0</version>
106108
</dependency>
107109
<dependency>
108-
<groupId>org.apache.commons</groupId>
109-
<artifactId>commons-exec</artifactId>
110-
<version>1.3</version>
111-
</dependency>
110+
<groupId>org.apache.commons</groupId>
111+
<artifactId>commons-exec</artifactId>
112+
<version>1.3</version>
113+
</dependency>
112114
</dependencies>
113115

114116
<build>
@@ -216,7 +218,7 @@
216218
<!-- Set 1.7 as target, use project source encoding -->
217219
<groupId>org.apache.maven.plugins</groupId>
218220
<artifactId>maven-compiler-plugin</artifactId>
219-
<version>2.5.1</version>
221+
<version>3.3</version>
220222
<configuration>
221223
<source>${java.version}</source>
222224
<target>${java.version}</target>
@@ -230,7 +232,7 @@
230232
<!-- Build the fat jar with all dependencies -->
231233
<groupId>org.apache.maven.plugins</groupId>
232234
<artifactId>maven-assembly-plugin</artifactId>
233-
<version>2.4</version>
235+
<version>2.6</version>
234236
<configuration>
235237
<descriptorRefs>
236238
<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -250,7 +252,7 @@
250252
<!-- extract documentation for libdoc -->
251253
<groupId>org.apache.maven.plugins</groupId>
252254
<artifactId>maven-javadoc-plugin</artifactId>
253-
<version>2.9.1</version>
255+
<version>2.10.3</version>
254256
<executions>
255257
<execution>
256258
<id>xml-doclet</id>
@@ -332,7 +334,7 @@
332334
<plugin>
333335
<groupId>org.apache.maven.plugins</groupId>
334336
<artifactId>maven-javadoc-plugin</artifactId>
335-
<version>2.9.1</version>
337+
<version>2.10.3</version>
336338
<executions>
337339
<execution>
338340
<id>attach-javadocs</id>
@@ -351,7 +353,7 @@
351353
<plugin>
352354
<groupId>org.codehaus.mojo</groupId>
353355
<artifactId>build-helper-maven-plugin</artifactId>
354-
<version>1.8</version>
356+
<version>1.9.1</version>
355357
<executions>
356358
<execution>
357359
<id>attach-artifacts</id>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.github.markusbernhardt.selenium2library.keywords;
22

3+
import io.appium.java_client.ios.IOSDriver;
4+
import io.selendroid.client.SelendroidDriver;
5+
36
import java.io.File;
47
import java.io.IOException;
58
import java.lang.reflect.Field;
@@ -26,13 +29,11 @@
2629
import org.openqa.selenium.Dimension;
2730
import org.openqa.selenium.WebDriver;
2831
import org.openqa.selenium.WebElement;
29-
import io.selendroid.SelendroidDriver;
3032
import org.openqa.selenium.chrome.ChromeDriver;
3133
import org.openqa.selenium.firefox.FirefoxDriver;
3234
import org.openqa.selenium.firefox.FirefoxProfile;
3335
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
3436
import org.openqa.selenium.ie.InternetExplorerDriver;
35-
import io.appium.java_client.ios.IOSDriver;
3637
import org.openqa.selenium.phantomjs.PhantomJSDriver;
3738
import org.openqa.selenium.remote.Augmenter;
3839
import org.openqa.selenium.remote.DesiredCapabilities;
@@ -1384,7 +1385,7 @@ protected WebDriver createLocalWebDriver(String browserName, DesiredCapabilities
13841385
return driver;
13851386
} else if ("iphone".equals(browserName) || "ipad".equals(browserName)) {
13861387
try {
1387-
return new IOSDriver(new URL(""), desiredCapabilities);
1388+
return new IOSDriver<WebElement>(new URL(""), desiredCapabilities);
13881389
} catch (Exception e) {
13891390
throw new Selenium2LibraryFatalException("Creating " + browserName + " instance failed.", e);
13901391
}

0 commit comments

Comments
 (0)