Skip to content

Commit 6ca78c5

Browse files
asashourlukeis
asashour
authored and
lukeis
committed
Upgrade htmlUnit to 2.17
Also updating comons-codec, cssparser, serializer, xalan and jetty-websocket Signed-off-by: Luke Inman-Semerau <[email protected]>
1 parent d10b2a8 commit 6ca78c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+49
-48
lines changed

Diff for: ‎java/client/.classpath

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
99
<classpathentry kind="lib" path="/third-party/java/testng/testng-6.8.5.jar" sourcepath="/third-party/java/testng/testng-6.8.5-sources.jar"/>
1010
<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-18.0.jar" sourcepath="/third-party/java/guava-libraries/guava-18.0-sources.jar"/>
11-
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.16.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.16-sources.jar"/>
12-
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.16.jar"/>
11+
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.17.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.17-sources.jar"/>
12+
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.17.jar"/>
1313
<classpathentry kind="lib" path="/third-party/java/jna/jna-4.1.0.jar" sourcepath="/third-party/java/jna/jna-4.1.0-src.jar"/>
1414
<classpathentry kind="lib" path="/third-party/java/jna/jna-platform-4.1.0.jar" sourcepath="/third-party/java/jna/jna-platform-4.1.0-src.jar"/>
1515
<classpathentry kind="lib" path="/third-party/java/commons-exec/commons-exec-1.3.jar" sourcepath="/third-party/java/commons-exec/commons-exec-1.3-sources.jar"/>
@@ -21,14 +21,14 @@
2121
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.4.1.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.4.1-sources.jar"/>
2222
<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.3.jar"/>
2323
<classpathentry kind="lib" path="/third-party/java/commons-io/commons-io-2.4.jar" sourcepath="/third-party/java/commons-io/commons-io-2.4-sources.jar"/>
24-
<classpathentry kind="lib" path="/third-party/java/commons-codec/commons-codec-1.9.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.9-sources.jar"/>
24+
<classpathentry kind="lib" path="/third-party/java/commons-codec/commons-codec-1.10.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.10-sources.jar"/>
2525
<classpathentry kind="lib" path="/third-party/java/sac/sac-1.3.jar"/>
2626
<classpathentry kind="lib" path="/third-party/java/commons-lang/commons-lang3-3.4.jar" sourcepath="/third-party/java/commons-lang/commons-lang3-3.4-sources.jar"/>
2727
<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpmime-4.4.1.jar" sourcepath="/third-party/java/apache-httpclient/httpmime-4.4.1-sources.jar"/>
2828
<classpathentry kind="lib" path="/third-party/java/commons-collections/commons-collections-3.2.1.jar" sourcepath="/third-party/java/commons-collections/commons-collections-3.2.1-sources.jar"/>
29-
<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.15.jar"/>
29+
<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.16.jar"/>
3030
<classpathentry kind="lib" path="/third-party/java/xml/xercesImpl-2.11.0.jar" sourcepath="/third-party/java/xml/xercesImpl-2.11.0-sources.jar"/>
31-
<classpathentry kind="lib" path="/third-party/java/xml/xalan-2.7.1.jar"/>
31+
<classpathentry kind="lib" path="/third-party/java/xml/xalan-2.7.2.jar"/>
3232
<classpathentry kind="lib" path="/third-party/java/commons-fileupload/commons-fileupload-1.2.2.jar" sourcepath="/third-party/java/commons-fileupload/commons-fileupload-1.2.2-src.jar"/>
3333
<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
3434
<classpathentry kind="lib" path="/third-party/java/little_proxy/littleproxy-0.5.3.jar" sourcepath="/third-party/java/little_proxy/littleproxy-0.5.3-sources.jar"/>
@@ -40,10 +40,10 @@
4040
<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-api-1.6.6.jar"/>
4141
<classpathentry kind="lib" path="/third-party/java/slf4j/slf4j-jdk14-1.6.6.jar"/>
4242
<classpathentry kind="lib" path="/third-party/java/gson/gson-2.3.1.jar"/>
43-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-api-9.2.10.v20150310.jar"/>
44-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-client-9.2.10.v20150310.jar"/>
45-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-common-9.2.10.v20150310.jar"/>
46-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-io-9.2.10.v20150310.jar"/>
47-
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-util-9.2.10.v20150310.jar"/>
43+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-api-9.2.11.v20150529.jar"/>
44+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-client-9.2.11.v20150529.jar"/>
45+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/websocket-common-9.2.11.v20150529.jar"/>
46+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-io-9.2.11.v20150529.jar"/>
47+
<classpathentry kind="lib" path="/third-party/java/jetty-websocket/jetty-util-9.2.11.v20150529.jar"/>
4848
<classpathentry kind="output" path="build/production"/>
4949
</classpath>

Diff for: ‎java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public HtmlUnitDriver(boolean enableJavascript) {
223223
* and browserVersion denotes the desired version.</li>
224224
* <li>The second one is where the browserName is "htmlunit" and the browserVersion
225225
* denotes the required browser AND its version. In this mode the browserVersion could be
226-
* "chrome" for Chrome, "firefox-31" for Firefox 31 or "internet explorer-11" for IE 11.</li>
226+
* "chrome" for Chrome, "firefox-38" for Firefox 38 or "internet explorer-11" for IE 11.</li>
227227
* </ol>
228228
* <p>The Remote WebDriver uses the second mode - the first mode is deprecated and should not be used.
229229
*/
@@ -262,13 +262,13 @@ static BrowserVersion determineBrowserVersion(Capabilities capabilities) {
262262
try {
263263
int version = Integer.parseInt(browserVersion);
264264
switch (version) {
265-
case 24:
266-
return BrowserVersion.FIREFOX_24;
267-
default:
265+
case 31:
268266
return BrowserVersion.FIREFOX_31;
267+
default:
268+
return BrowserVersion.FIREFOX_38;
269269
}
270270
} catch (NumberFormatException e) {
271-
return BrowserVersion.FIREFOX_31;
271+
return BrowserVersion.FIREFOX_38;
272272
}
273273
}
274274

Diff for: ‎java/client/src/org/openqa/selenium/htmlunit/HtmlUnitKeyboard.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
3131
import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
3232
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
33-
import com.gargoylesoftware.htmlunit.javascript.host.Event;
34-
import com.gargoylesoftware.htmlunit.javascript.host.KeyboardEvent;
33+
import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
34+
import com.gargoylesoftware.htmlunit.javascript.host.event.KeyboardEvent;
3535

3636
/**
3737
* Implements keyboard operations using the HtmlUnit WebDriver.

Diff for: ‎java/client/src/org/openqa/selenium/htmlunit/HtmlUnitMouse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.gargoylesoftware.htmlunit.ScriptException;
2828
import com.gargoylesoftware.htmlunit.html.HtmlElement;
2929
import com.gargoylesoftware.htmlunit.html.HtmlInput;
30-
import com.gargoylesoftware.htmlunit.javascript.host.MouseEvent;
30+
import com.gargoylesoftware.htmlunit.javascript.host.event.MouseEvent;
3131
import com.google.common.base.Preconditions;
3232

3333
/**

Diff for: ‎java/client/src/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
import com.gargoylesoftware.htmlunit.html.HtmlSelect;
6767
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
6868
import com.gargoylesoftware.htmlunit.html.HtmlTextArea;
69-
import com.gargoylesoftware.htmlunit.javascript.host.Event;
69+
import com.gargoylesoftware.htmlunit.javascript.host.event.Event;
7070
import com.google.common.base.Strings;
7171
import com.google.common.base.Throwables;
7272

Diff for: ‎java/client/test/org/openqa/selenium/TypingTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,7 @@ public void testShouldBeAbleToTypeOnAnEmailInputField() {
717717
assertThat(email.getAttribute("value"), equalTo("foobar"));
718718
}
719719

720+
@Ignore(HTMLUNIT)
720721
@Test
721722
public void testShouldBeAbleToTypeOnANumberInputField() {
722723
driver.get(pages.formPage);

Diff for: ‎java/client/test/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void configurationViaDirectCapabilities() {
4545
new DesiredCapabilities(BrowserType.FIREFOX, "", Platform.ANY);
4646

4747
assertEquals(HtmlUnitDriver.determineBrowserVersion(firefoxCapabilities),
48-
BrowserVersion.FIREFOX_31);
48+
BrowserVersion.FIREFOX_38);
4949
}
5050

5151
@Test
@@ -54,7 +54,7 @@ public void configurationOfFirefoxViaRemote() {
5454
new DesiredCapabilities(BrowserType.HTMLUNIT, "firefox", Platform.ANY);
5555

5656
assertEquals(HtmlUnitDriver.determineBrowserVersion(firefoxCapabilities),
57-
BrowserVersion.FIREFOX_31);
57+
BrowserVersion.FIREFOX_38);
5858
}
5959

6060
@Test

Diff for: ‎maven/htmlunit-driver/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>net.sourceforge.htmlunit</groupId>
2222
<artifactId>htmlunit</artifactId>
23-
<version>2.16</version>
23+
<version>2.17</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.apache.httpcomponents</groupId>

Diff for: ‎maven/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
<dependency>
151151
<groupId>commons-codec</groupId>
152152
<artifactId>commons-codec</artifactId>
153-
<version>1.9</version>
153+
<version>1.10</version>
154154
</dependency>
155155
<dependency>
156156
<groupId>org.apache.commons</groupId>

Diff for: ‎third_party/java/commons-codec/BUCK

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
prebuilt_jar(name = 'commons-codec',
2-
binary_jar = 'commons-codec-1.9.jar',
3-
source_jar = 'commons-codec-1.9-sources.jar',
2+
binary_jar = 'commons-codec-1.10.jar',
3+
source_jar = 'commons-codec-1.10-sources.jar',
44
visibility = [
55
'//third_party/java/...',
66
],

Diff for: ‎third_party/java/commons-codec/build.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
java_library(name = "commons-codec",
22
deps = [
3-
"commons-codec-1.9.jar"
3+
"commons-codec-1.10.jar"
44
])

Diff for: ‎third_party/java/commons-codec/commons-codec-1.10-sources.jar

294 KB
Binary file not shown.

Diff for: ‎third_party/java/commons-codec/commons-codec-1.9.jar renamed to ‎third_party/java/commons-codec/commons-codec-1.10.jar

258 KB
Binary file not shown.

Diff for: ‎third_party/java/commons-codec/commons-codec-1.9-sources.jar

-272 KB
Binary file not shown.

Diff for: ‎third_party/java/cssparser/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prebuilt_jar(name = 'cssparser',
2-
binary_jar = 'cssparser-0.9.15.jar',
2+
binary_jar = 'cssparser-0.9.16.jar',
33
deps = [
44
'//third_party/java/sac:sac',
55
],

Diff for: ‎third_party/java/cssparser/build.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
java_library(name = "cssparser",
22
deps = [
3-
"cssparser-0.9.15.jar",
3+
"cssparser-0.9.16.jar",
44
"//third_party/java/sac"
55
])

Diff for: ‎third_party/java/cssparser/cssparser-0.9.15.jar

-356 KB
Binary file not shown.

Diff for: ‎third_party/java/cssparser/cssparser-0.9.16.jar

371 KB
Binary file not shown.

Diff for: ‎third_party/java/htmlunit/BUCK

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
prebuilt_jar(name = 'htmlunit',
2-
binary_jar = 'htmlunit-2.16.jar',
3-
source_jar = 'htmlunit-2.16-sources.jar',
2+
binary_jar = 'htmlunit-2.17.jar',
3+
source_jar = 'htmlunit-2.17-sources.jar',
44
deps = [
55
':js-core',
66
'//third_party/java/apache-httpclient:apache-httpclient',
@@ -17,7 +17,7 @@ prebuilt_jar(name = 'htmlunit',
1717
)
1818

1919
prebuilt_jar(name = 'js-core',
20-
binary_jar = 'htmlunit-core-js-2.16.jar',
20+
binary_jar = 'htmlunit-core-js-2.17.jar',
2121
visibility = [
2222
'//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
2323
],

Diff for: ‎third_party/java/htmlunit/build.desc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
java_library(name = "htmlunit",
22
deps = [
3-
"htmlunit-2.16.jar",
4-
"htmlunit-core-js-2.16.jar",
3+
"htmlunit-2.17.jar",
4+
"htmlunit-core-js-2.17.jar",
55
"//third_party/java/apache-httpclient",
66
"//third_party/java/commons-collections",
77
"//third_party/java/commons-io",

Diff for: ‎third_party/java/htmlunit/htmlunit-2.16-sources.jar

-1.46 MB
Binary file not shown.

Diff for: ‎third_party/java/htmlunit/htmlunit-2.17-sources.jar

1.68 MB
Binary file not shown.

Diff for: ‎third_party/java/htmlunit/htmlunit-2.16.jar renamed to ‎third_party/java/htmlunit/htmlunit-2.17.jar

1.56 MB
Binary file not shown.

Diff for: ‎third_party/java/htmlunit/htmlunit-core-js-2.16.jar

-1000 KB
Binary file not shown.

Diff for: ‎third_party/java/htmlunit/htmlunit-core-js-2.17.jar

1.04 MB
Binary file not shown.

Diff for: ‎third_party/java/jetty-websocket/BUCK

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ java_library(name = 'jetty-websocket',
1212
)
1313

1414
prebuilt_jar(name = 'websocket-api',
15-
binary_jar = 'websocket-api-9.2.10.v20150310.jar',
15+
binary_jar = 'websocket-api-9.2.11.v20150529.jar',
1616
)
1717

1818
prebuilt_jar(name = 'websocket-client',
19-
binary_jar = 'websocket-client-9.2.10.v20150310.jar',
19+
binary_jar = 'websocket-client-9.2.11.v20150529.jar',
2020
)
2121

2222
prebuilt_jar(name = 'websocket-common',
23-
binary_jar = 'websocket-common-9.2.10.v20150310.jar',
23+
binary_jar = 'websocket-common-9.2.11.v20150529.jar',
2424
)
2525

2626
prebuilt_jar(name = 'jetty-util',
27-
binary_jar = 'jetty-util-9.2.10.v20150310.jar',
27+
binary_jar = 'jetty-util-9.2.11.v20150529.jar',
2828
)
2929

3030
prebuilt_jar(name = 'jetty-io',
31-
binary_jar = 'jetty-io-9.2.10.v20150310.jar',
31+
binary_jar = 'jetty-io-9.9.2.11.v20150529.jar',
3232
)

Diff for: ‎third_party/java/jetty-websocket/build.desc

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
java_library(name = "jetty-websocket",
22
deps = [
3-
"websocket-api-9.2.10.v20150310.jar",
4-
"websocket-client-9.2.10.v20150310.jar",
5-
"websocket-common-9.2.10.v20150310.jar",
6-
"jetty-util-9.2.10.v20150310.jar",
7-
"jetty-io-9.2.10.v20150310.jar"
3+
"websocket-api-9.2.11.v20150529.jar",
4+
"websocket-client-9.2.11.v20150529.jar",
5+
"websocket-common-9.2.11.v20150529.jar",
6+
"jetty-util-9.2.11.v20150529.jar",
7+
"jetty-io-9.2.11.v20150529.jar"
88
])

Diff for: ‎third_party/java/jetty-websocket/jetty-io-9.2.10.v20150310.jar renamed to ‎third_party/java/jetty-websocket/jetty-io-9.2.11.v20150529.jar

106 KB
Binary file not shown.

Diff for: ‎third_party/java/jetty-websocket/jetty-util-9.2.10.v20150310.jar renamed to ‎third_party/java/jetty-websocket/jetty-util-9.2.11.v20150529.jar

348 KB
Binary file not shown.

Diff for: ‎third_party/java/jetty-websocket/websocket-api-9.2.10.v20150310.jar renamed to ‎third_party/java/jetty-websocket/websocket-api-9.2.11.v20150529.jar

42.7 KB
Binary file not shown.

Diff for: ‎third_party/java/jetty-websocket/websocket-client-9.2.10.v20150310.jar renamed to ‎third_party/java/jetty-websocket/websocket-client-9.2.11.v20150529.jar

34.9 KB
Binary file not shown.

Diff for: ‎third_party/java/jetty-websocket/websocket-common-9.2.10.v20150310.jar renamed to ‎third_party/java/jetty-websocket/websocket-common-9.2.11.v20150529.jar

176 KB
Binary file not shown.

Diff for: ‎third_party/java/serializer/BUCK

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prebuilt_jar(name = 'serializer',
2-
binary_jar = 'serializer-2.7.1.jar',
2+
binary_jar = 'serializer-2.7.2.jar',
33
visibility = [
44
'//third_party/java/...',
55
],

Diff for: ‎third_party/java/serializer/build.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
java_library(name = "serializer",
22
deps = [
3-
"serializer-2.7.1.jar"
3+
"serializer-2.7.2.jar"
44
])

Diff for: ‎third_party/java/serializer/serializer-2.7.1.jar

-272 KB
Binary file not shown.

Diff for: ‎third_party/java/serializer/serializer-2.7.2.jar

270 KB
Binary file not shown.

Diff for: ‎third_party/java/xml/BUCK

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ java_library(name = 'xml',
1111
)
1212

1313
prebuilt_jar(name = 'xalan',
14-
binary_jar = 'xalan-2.7.1.jar',
15-
source_jar = 'xalan-2.7.1-sources.jar',
14+
binary_jar = 'xalan-2.7.2.jar',
15+
source_jar = 'xalan-2.7.2-sources.jar',
1616
)
1717

1818
prebuilt_jar(name = 'xerces',

Diff for: ‎third_party/java/xml/build.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
java_library(name = "xml",
22
deps = [
3-
"xalan-2.7.1.jar",
3+
"xalan-2.7.2.jar",
44
"xercesImpl-2.11.0.jar",
55
"xml-apis-1.4.01.jar"
66
])

Diff for: ‎third_party/java/xml/xalan-2.7.1.jar

-3.03 MB
Binary file not shown.

Diff for: ‎third_party/java/xml/xalan-2.7.1-sources.jar renamed to ‎third_party/java/xml/xalan-2.7.2-sources.jar

3.26 MB
Binary file not shown.

Diff for: ‎third_party/java/xml/xalan-2.7.2.jar

3.01 MB
Binary file not shown.

0 commit comments

Comments
 (0)