diff --git a/java/client/.classpath b/java/client/.classpath
index 6d51a955efdfe..f604d1ceff583 100644
--- a/java/client/.classpath
+++ b/java/client/.classpath
@@ -8,8 +8,8 @@
-
-
+
+
@@ -17,22 +17,22 @@
-
-
+
+
-
-
+
+
-
+
-
+
@@ -40,6 +40,10 @@
-
+
+
+
+
+
diff --git a/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java b/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java
index 45cdb02011f7c..9bc5cbe4ba625 100755
--- a/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java
+++ b/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java
@@ -239,13 +239,13 @@ static BrowserVersion determineBrowserVersion(Capabilities capabilities) {
try {
int version = Integer.parseInt(browserVersion);
switch (version) {
- case 17:
- return BrowserVersion.FIREFOX_17;
- default:
+ case 24:
return BrowserVersion.FIREFOX_24;
+ default:
+ return BrowserVersion.FIREFOX_31;
}
} catch (NumberFormatException e) {
- return BrowserVersion.FIREFOX_24;
+ return BrowserVersion.FIREFOX_31;
}
}
@@ -260,8 +260,6 @@ static BrowserVersion determineBrowserVersion(Capabilities capabilities) {
switch (version) {
case 8:
return BrowserVersion.INTERNET_EXPLORER_8;
- case 9:
- return BrowserVersion.INTERNET_EXPLORER_9;
default:
return BrowserVersion.INTERNET_EXPLORER_11;
}
@@ -590,7 +588,7 @@ public void close() {
@Override
public void quit() {
if (webClient != null) {
- webClient.closeAllWindows();
+ webClient.close();
webClient = null;
}
currentWindow = null;
diff --git a/java/client/test/org/openqa/selenium/CookieImplementationTest.java b/java/client/test/org/openqa/selenium/CookieImplementationTest.java
index 29f24fc9ba5ac..88ea7cdbfefc3 100644
--- a/java/client/test/org/openqa/selenium/CookieImplementationTest.java
+++ b/java/client/test/org/openqa/selenium/CookieImplementationTest.java
@@ -245,7 +245,7 @@ public void testShouldNotGetCookieOnDifferentDomain() {
assertCookieIsNotPresentWithName(cookieName);
}
- @Ignore(value = {CHROME, HTMLUNIT, IE}, reason = "Untested browsers.")
+ @Ignore(value = {CHROME, IE}, reason = "Untested browsers.")
@Test
public void testShouldBeAbleToAddToADomainWhichIsRelatedToTheCurrentDomain() {
String cookieName = "name";
@@ -403,7 +403,7 @@ public void testRetainsCookieSecure() {
assertTrue(retrieved.isSecure());
}
- @Ignore(value = {CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI})
+ @Ignore(value = {CHROME, FIREFOX, IE, PHANTOMJS, SAFARI})
@Test
public void testRetainsHttpOnlyFlag() {
Cookie addedCookie =
diff --git a/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java b/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java
index e18fc8acf64cb..fa55209c4e9f6 100644
--- a/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java
+++ b/java/client/test/org/openqa/selenium/CorrectEventFiringTest.java
@@ -210,7 +210,7 @@ public void testShouldEmitOnChangeEventsWhenSelectingElements() {
}
@JavascriptEnabled
- @Ignore(value = {HTMLUNIT, MARIONETTE})
+ @Ignore(MARIONETTE)
@Test
public void testShouldEmitOnClickEventsWhenSelectingElements() {
driver.get(pages.javascriptPage);
diff --git a/java/client/test/org/openqa/selenium/FormHandlingTest.java b/java/client/test/org/openqa/selenium/FormHandlingTest.java
index 19beec0c5d742..9c5df0ddd6512 100644
--- a/java/client/test/org/openqa/selenium/FormHandlingTest.java
+++ b/java/client/test/org/openqa/selenium/FormHandlingTest.java
@@ -283,7 +283,7 @@ public void testCanClickOnASubmitButton() {
checkSubmitButton("internal_explicit_submit");
}
- @Ignore(value = {HTMLUNIT, SAFARI}, reason = "untested")
+ @Ignore(value = {SAFARI}, reason = "untested")
@Test
public void testCanClickOnAnImplicitSubmitButton() {
assumeFalse(isIe6(driver) || isIe7(driver) );
diff --git a/java/client/test/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java b/java/client/test/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java
index 9dbde3f071a6b..8bdddc88aecca 100644
--- a/java/client/test/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java
+++ b/java/client/test/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java
@@ -45,7 +45,7 @@ public void configurationViaDirectCapabilities() {
new DesiredCapabilities(BrowserType.FIREFOX, "", Platform.ANY);
assertEquals(HtmlUnitDriver.determineBrowserVersion(firefoxCapabilities),
- BrowserVersion.FIREFOX_24);
+ BrowserVersion.FIREFOX_31);
}
@Test
@@ -54,7 +54,7 @@ public void configurationOfFirefoxViaRemote() {
new DesiredCapabilities(BrowserType.HTMLUNIT, "firefox", Platform.ANY);
assertEquals(HtmlUnitDriver.determineBrowserVersion(firefoxCapabilities),
- BrowserVersion.FIREFOX_24);
+ BrowserVersion.FIREFOX_31);
}
@Test
diff --git a/java/client/test/org/openqa/selenium/htmlunit/JavascriptEnabledHtmlUnitDriverTests.java b/java/client/test/org/openqa/selenium/htmlunit/JavascriptEnabledHtmlUnitDriverTests.java
index ef481724dcbd0..4e695c2f032f1 100644
--- a/java/client/test/org/openqa/selenium/htmlunit/JavascriptEnabledHtmlUnitDriverTests.java
+++ b/java/client/test/org/openqa/selenium/htmlunit/JavascriptEnabledHtmlUnitDriverTests.java
@@ -39,7 +39,7 @@ public HtmlUnitDriverForTest(Capabilities capabilities) {
private static Capabilities tweak(Capabilities capabilities) {
DesiredCapabilities caps = new DesiredCapabilities(capabilities);
caps.setJavascriptEnabled(true);
- caps.setVersion("3.6");
+ caps.setVersion("31");
return caps;
}
}
diff --git a/maven/htmlunit-driver/pom.xml b/maven/htmlunit-driver/pom.xml
index 17d02ee9a85d3..01fea0be8d11d 100644
--- a/maven/htmlunit-driver/pom.xml
+++ b/maven/htmlunit-driver/pom.xml
@@ -20,7 +20,7 @@
net.sourceforge.htmlunit
htmlunit
- 2.15
+ 2.16
org.apache.httpcomponents
diff --git a/maven/pom.xml b/maven/pom.xml
index b05c8591556a1..56cb27a23cc3f 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -180,12 +180,12 @@
org.apache.httpcomponents
httpclient
- 4.3.6
+ 4.4.1
org.apache.httpcomponents
httpcore
- 4.3.3
+ 4.4.1
org.hamcrest
diff --git a/third_party/java/apache-httpclient/BUCK b/third_party/java/apache-httpclient/BUCK
index 2dfae996d2a9e..2d540dcce1813 100644
--- a/third_party/java/apache-httpclient/BUCK
+++ b/third_party/java/apache-httpclient/BUCK
@@ -11,16 +11,16 @@ java_library(name = "apache-httpclient",
)
prebuilt_jar(name = 'client',
- binary_jar = 'httpclient-4.3.6.jar',
- source_jar = 'httpclient-4.3.6-sources.jar',
+ binary_jar = 'httpclient-4.4.1.jar',
+ source_jar = 'httpclient-4.4.1-sources.jar',
)
prebuilt_jar(name = 'core',
- binary_jar = 'httpcore-4.3.3.jar',
- source_jar = 'httpcore-4.3.3-sources.jar',
+ binary_jar = 'httpcore-4.4.1.jar',
+ source_jar = 'httpcore-4.4.1-sources.jar',
)
prebuilt_jar(name = 'mime',
- binary_jar = 'httpmime-4.3.6.jar',
- source_jar = 'httpmime-4.3.6-sources.jar',
+ binary_jar = 'httpmime-4.4.1.jar',
+ source_jar = 'httpmime-4.4.1-sources.jar',
)
diff --git a/third_party/java/apache-httpclient/build.desc b/third_party/java/apache-httpclient/build.desc
index fcf125a67292b..b4d556ceaadce 100644
--- a/third_party/java/apache-httpclient/build.desc
+++ b/third_party/java/apache-httpclient/build.desc
@@ -1,9 +1,9 @@
java_library(name = "apache-httpclient",
deps = [
- "httpclient-4.3.6.jar",
- "httpcore-4.3.3.jar",
- "httpmime-4.3.6.jar",
+ "httpclient-4.4.1.jar",
+ "httpcore-4.4.1.jar",
+ "httpmime-4.4.1.jar",
"//third_party/java/apache-mime4j",
"//third_party/java/commons-codec",
"//third_party/java/commons-logging"
diff --git a/third_party/java/apache-httpclient/httpclient-4.3.6-sources.jar b/third_party/java/apache-httpclient/httpclient-4.3.6-sources.jar
deleted file mode 100644
index fb3b62f8c26c7..0000000000000
Binary files a/third_party/java/apache-httpclient/httpclient-4.3.6-sources.jar and /dev/null differ
diff --git a/third_party/java/apache-httpclient/httpclient-4.3.6.jar b/third_party/java/apache-httpclient/httpclient-4.3.6.jar
deleted file mode 100644
index 091498c9642d5..0000000000000
Binary files a/third_party/java/apache-httpclient/httpclient-4.3.6.jar and /dev/null differ
diff --git a/third_party/java/apache-httpclient/httpclient-4.4.1-sources.jar b/third_party/java/apache-httpclient/httpclient-4.4.1-sources.jar
new file mode 100644
index 0000000000000..bf73ef44c2460
Binary files /dev/null and b/third_party/java/apache-httpclient/httpclient-4.4.1-sources.jar differ
diff --git a/third_party/java/apache-httpclient/httpclient-4.4.1.jar b/third_party/java/apache-httpclient/httpclient-4.4.1.jar
new file mode 100644
index 0000000000000..b80d37967e14f
Binary files /dev/null and b/third_party/java/apache-httpclient/httpclient-4.4.1.jar differ
diff --git a/third_party/java/apache-httpclient/httpcore-4.3.3-sources.jar b/third_party/java/apache-httpclient/httpcore-4.3.3-sources.jar
deleted file mode 100644
index c89f423e51774..0000000000000
Binary files a/third_party/java/apache-httpclient/httpcore-4.3.3-sources.jar and /dev/null differ
diff --git a/third_party/java/apache-httpclient/httpcore-4.3.3.jar b/third_party/java/apache-httpclient/httpcore-4.3.3.jar
deleted file mode 100644
index a8747b0cf91cd..0000000000000
Binary files a/third_party/java/apache-httpclient/httpcore-4.3.3.jar and /dev/null differ
diff --git a/third_party/java/apache-httpclient/httpcore-4.4.1-sources.jar b/third_party/java/apache-httpclient/httpcore-4.4.1-sources.jar
new file mode 100644
index 0000000000000..657ac1d6e6575
Binary files /dev/null and b/third_party/java/apache-httpclient/httpcore-4.4.1-sources.jar differ
diff --git a/third_party/java/apache-httpclient/httpcore-4.4.1.jar b/third_party/java/apache-httpclient/httpcore-4.4.1.jar
new file mode 100644
index 0000000000000..99715b6a9f06f
Binary files /dev/null and b/third_party/java/apache-httpclient/httpcore-4.4.1.jar differ
diff --git a/third_party/java/apache-httpclient/httpmime-4.3.6-sources.jar b/third_party/java/apache-httpclient/httpmime-4.3.6-sources.jar
deleted file mode 100644
index 3966ee9163916..0000000000000
Binary files a/third_party/java/apache-httpclient/httpmime-4.3.6-sources.jar and /dev/null differ
diff --git a/third_party/java/apache-httpclient/httpmime-4.3.6.jar b/third_party/java/apache-httpclient/httpmime-4.3.6.jar
deleted file mode 100644
index a2ba4f28e7870..0000000000000
Binary files a/third_party/java/apache-httpclient/httpmime-4.3.6.jar and /dev/null differ
diff --git a/third_party/java/apache-httpclient/httpmime-4.4.1-sources.jar b/third_party/java/apache-httpclient/httpmime-4.4.1-sources.jar
new file mode 100644
index 0000000000000..fa606d9ef5bc9
Binary files /dev/null and b/third_party/java/apache-httpclient/httpmime-4.4.1-sources.jar differ
diff --git a/third_party/java/apache-httpclient/httpmime-4.4.1.jar b/third_party/java/apache-httpclient/httpmime-4.4.1.jar
new file mode 100644
index 0000000000000..e748cbde7d29d
Binary files /dev/null and b/third_party/java/apache-httpclient/httpmime-4.4.1.jar differ
diff --git a/third_party/java/commons-lang/BUCK b/third_party/java/commons-lang/BUCK
index 8ede63a0a969f..86ec83141f992 100644
--- a/third_party/java/commons-lang/BUCK
+++ b/third_party/java/commons-lang/BUCK
@@ -1,6 +1,6 @@
prebuilt_jar(name = 'commons-lang',
- binary_jar = 'commons-lang3-3.3.2.jar',
- source_jar = 'commons-lang3-3.3.2-sources.jar',
+ binary_jar = 'commons-lang3-3.4.jar',
+ source_jar = 'commons-lang3-3.4-sources.jar',
visibility = [
'//third_party/java/...',
],
diff --git a/third_party/java/commons-lang/build.desc b/third_party/java/commons-lang/build.desc
index c79fdf9d2738e..e2863f4598afc 100644
--- a/third_party/java/commons-lang/build.desc
+++ b/third_party/java/commons-lang/build.desc
@@ -1,4 +1,4 @@
java_library(name = "commons-lang",
deps = [
- "commons-lang3-3.3.2.jar"
+ "commons-lang3-3.4.jar"
])
diff --git a/third_party/java/commons-lang/commons-lang3-3.3.2-sources.jar b/third_party/java/commons-lang/commons-lang3-3.3.2-sources.jar
deleted file mode 100644
index fa12693c28f71..0000000000000
Binary files a/third_party/java/commons-lang/commons-lang3-3.3.2-sources.jar and /dev/null differ
diff --git a/third_party/java/commons-lang/commons-lang3-3.3.2.jar b/third_party/java/commons-lang/commons-lang3-3.3.2.jar
deleted file mode 100644
index 2ce08ae99d17d..0000000000000
Binary files a/third_party/java/commons-lang/commons-lang3-3.3.2.jar and /dev/null differ
diff --git a/third_party/java/commons-lang/commons-lang3-3.4-sources.jar b/third_party/java/commons-lang/commons-lang3-3.4-sources.jar
new file mode 100644
index 0000000000000..ac262ee429586
Binary files /dev/null and b/third_party/java/commons-lang/commons-lang3-3.4-sources.jar differ
diff --git a/third_party/java/commons-lang/commons-lang3-3.4.jar b/third_party/java/commons-lang/commons-lang3-3.4.jar
new file mode 100644
index 0000000000000..8ec91d454c31f
Binary files /dev/null and b/third_party/java/commons-lang/commons-lang3-3.4.jar differ
diff --git a/third_party/java/cssparser/BUCK b/third_party/java/cssparser/BUCK
index 0ca26cc32e036..c578a89083159 100644
--- a/third_party/java/cssparser/BUCK
+++ b/third_party/java/cssparser/BUCK
@@ -1,5 +1,5 @@
prebuilt_jar(name = 'cssparser',
- binary_jar = 'cssparser-0.9.14.jar',
+ binary_jar = 'cssparser-0.9.15.jar',
deps = [
'//third_party/java/sac:sac',
],
diff --git a/third_party/java/cssparser/build.desc b/third_party/java/cssparser/build.desc
index 0cf41d8c89e1a..88d1b63680179 100644
--- a/third_party/java/cssparser/build.desc
+++ b/third_party/java/cssparser/build.desc
@@ -1,5 +1,5 @@
java_library(name = "cssparser",
deps = [
- "cssparser-0.9.14.jar",
+ "cssparser-0.9.15.jar",
"//third_party/java/sac"
])
\ No newline at end of file
diff --git a/third_party/java/cssparser/cssparser-0.9.14.jar b/third_party/java/cssparser/cssparser-0.9.14.jar
deleted file mode 100644
index 237f3b341287a..0000000000000
Binary files a/third_party/java/cssparser/cssparser-0.9.14.jar and /dev/null differ
diff --git a/third_party/java/cssparser/cssparser-0.9.15.jar b/third_party/java/cssparser/cssparser-0.9.15.jar
new file mode 100644
index 0000000000000..08f673aed3fb6
Binary files /dev/null and b/third_party/java/cssparser/cssparser-0.9.15.jar differ
diff --git a/third_party/java/htmlunit/BUCK b/third_party/java/htmlunit/BUCK
index f7e57cd00402f..6d06c6174d03c 100644
--- a/third_party/java/htmlunit/BUCK
+++ b/third_party/java/htmlunit/BUCK
@@ -1,6 +1,6 @@
prebuilt_jar(name = 'htmlunit',
- binary_jar = 'htmlunit-2.15.jar',
- source_jar = 'htmlunit-2.15-sources.jar',
+ binary_jar = 'htmlunit-2.16.jar',
+ source_jar = 'htmlunit-2.16-sources.jar',
deps = [
':js-core',
'//third_party/java/apache-httpclient:apache-httpclient',
@@ -17,7 +17,7 @@ prebuilt_jar(name = 'htmlunit',
)
prebuilt_jar(name = 'js-core',
- binary_jar = 'htmlunit-core-js-2.15.jar',
+ binary_jar = 'htmlunit-core-js-2.16.jar',
visibility = [
'//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
],
diff --git a/third_party/java/htmlunit/build.desc b/third_party/java/htmlunit/build.desc
index efd71a1537297..7215d1cc3963d 100644
--- a/third_party/java/htmlunit/build.desc
+++ b/third_party/java/htmlunit/build.desc
@@ -1,7 +1,7 @@
java_library(name = "htmlunit",
deps = [
- "htmlunit-2.15.jar",
- "htmlunit-core-js-2.15.jar",
+ "htmlunit-2.16.jar",
+ "htmlunit-core-js-2.16.jar",
"//third_party/java/apache-httpclient",
"//third_party/java/commons-collections",
"//third_party/java/commons-io",
diff --git a/third_party/java/htmlunit/htmlunit-2.15-sources.jar b/third_party/java/htmlunit/htmlunit-2.15-sources.jar
deleted file mode 100644
index c30318cd4ecea..0000000000000
Binary files a/third_party/java/htmlunit/htmlunit-2.15-sources.jar and /dev/null differ
diff --git a/third_party/java/htmlunit/htmlunit-2.15.jar b/third_party/java/htmlunit/htmlunit-2.15.jar
deleted file mode 100644
index b2e050e784f28..0000000000000
Binary files a/third_party/java/htmlunit/htmlunit-2.15.jar and /dev/null differ
diff --git a/third_party/java/htmlunit/htmlunit-2.16-sources.jar b/third_party/java/htmlunit/htmlunit-2.16-sources.jar
new file mode 100644
index 0000000000000..0664990a0d01d
Binary files /dev/null and b/third_party/java/htmlunit/htmlunit-2.16-sources.jar differ
diff --git a/third_party/java/htmlunit/htmlunit-2.16.jar b/third_party/java/htmlunit/htmlunit-2.16.jar
new file mode 100644
index 0000000000000..fcf925c29f86e
Binary files /dev/null and b/third_party/java/htmlunit/htmlunit-2.16.jar differ
diff --git a/third_party/java/htmlunit/htmlunit-core-js-2.15.jar b/third_party/java/htmlunit/htmlunit-core-js-2.16.jar
similarity index 82%
rename from third_party/java/htmlunit/htmlunit-core-js-2.15.jar
rename to third_party/java/htmlunit/htmlunit-core-js-2.16.jar
index ce0e46ce055f1..86365e7d0f40e 100644
Binary files a/third_party/java/htmlunit/htmlunit-core-js-2.15.jar and b/third_party/java/htmlunit/htmlunit-core-js-2.16.jar differ
diff --git a/third_party/java/jetty-websocket/BUCK b/third_party/java/jetty-websocket/BUCK
index 846cb9389da8b..bab9f79102bf0 100644
--- a/third_party/java/jetty-websocket/BUCK
+++ b/third_party/java/jetty-websocket/BUCK
@@ -1,6 +1,32 @@
-prebuilt_jar(name = 'jetty-websocket',
- binary_jar = 'jetty-websocket-8.1.8.jar',
+java_library(name = 'jetty-websocket',
+ exported_deps = [
+ ':websocket-api',
+ ':websocket-client',
+ ':websocket-common',
+ ':jetty-util',
+ ':jetty-io',
+ ],
visibility = [
'//third_party/java/...',
],
)
+
+prebuilt_jar(name = 'websocket-api',
+ binary_jar = 'websocket-api-9.2.10.v20150310.jar',
+)
+
+prebuilt_jar(name = 'websocket-client',
+ binary_jar = 'websocket-client-9.2.10.v20150310.jar',
+)
+
+prebuilt_jar(name = 'websocket-common',
+ binary_jar = 'websocket-common-9.2.10.v20150310.jar',
+)
+
+prebuilt_jar(name = 'jetty-util',
+ binary_jar = 'jetty-util-9.2.10.v20150310.jar',
+)
+
+prebuilt_jar(name = 'jetty-io',
+ binary_jar = 'jetty-io-9.2.10.v20150310.jar',
+)
\ No newline at end of file
diff --git a/third_party/java/jetty-websocket/build.desc b/third_party/java/jetty-websocket/build.desc
index 7c2e8bc1c35fd..54ad89dcabf98 100644
--- a/third_party/java/jetty-websocket/build.desc
+++ b/third_party/java/jetty-websocket/build.desc
@@ -1,4 +1,8 @@
java_library(name = "jetty-websocket",
deps = [
- "jetty-websocket-8.1.8.jar",
+ "websocket-api-9.2.10.v20150310.jar",
+ "websocket-client-9.2.10.v20150310.jar",
+ "websocket-common-9.2.10.v20150310.jar",
+ "jetty-util-9.2.10.v20150310.jar",
+ "jetty-io-9.2.10.v20150310.jar"
])
diff --git a/third_party/java/jetty-websocket/jetty-io-9.2.10.v20150310.jar b/third_party/java/jetty-websocket/jetty-io-9.2.10.v20150310.jar
new file mode 100644
index 0000000000000..56cee2c30c53a
Binary files /dev/null and b/third_party/java/jetty-websocket/jetty-io-9.2.10.v20150310.jar differ
diff --git a/third_party/java/jetty-websocket/jetty-util-9.2.10.v20150310.jar b/third_party/java/jetty-websocket/jetty-util-9.2.10.v20150310.jar
new file mode 100644
index 0000000000000..fe27758783ef3
Binary files /dev/null and b/third_party/java/jetty-websocket/jetty-util-9.2.10.v20150310.jar differ
diff --git a/third_party/java/jetty-websocket/jetty-websocket-8.1.8.jar b/third_party/java/jetty-websocket/jetty-websocket-8.1.8.jar
deleted file mode 100644
index ca9e40b3b8766..0000000000000
Binary files a/third_party/java/jetty-websocket/jetty-websocket-8.1.8.jar and /dev/null differ
diff --git a/third_party/java/jetty-websocket/websocket-api-9.2.10.v20150310.jar b/third_party/java/jetty-websocket/websocket-api-9.2.10.v20150310.jar
new file mode 100644
index 0000000000000..09a073da2c82a
Binary files /dev/null and b/third_party/java/jetty-websocket/websocket-api-9.2.10.v20150310.jar differ
diff --git a/third_party/java/jetty-websocket/websocket-client-9.2.10.v20150310.jar b/third_party/java/jetty-websocket/websocket-client-9.2.10.v20150310.jar
new file mode 100644
index 0000000000000..8f141af6a11c0
Binary files /dev/null and b/third_party/java/jetty-websocket/websocket-client-9.2.10.v20150310.jar differ
diff --git a/third_party/java/jetty-websocket/websocket-common-9.2.10.v20150310.jar b/third_party/java/jetty-websocket/websocket-common-9.2.10.v20150310.jar
new file mode 100644
index 0000000000000..a86665fb2d7aa
Binary files /dev/null and b/third_party/java/jetty-websocket/websocket-common-9.2.10.v20150310.jar differ
diff --git a/third_party/java/nekohtml/BUCK b/third_party/java/nekohtml/BUCK
index 5a1601018f707..21e73db9971eb 100644
--- a/third_party/java/nekohtml/BUCK
+++ b/third_party/java/nekohtml/BUCK
@@ -1,6 +1,6 @@
prebuilt_jar(name = 'nekohtml',
- binary_jar = 'nekohtml-1.9.21.jar',
- source_jar = 'nekohtml-1.9.21-sources.jar',
+ binary_jar = 'nekohtml-1.9.22.jar',
+ source_jar = 'nekohtml-1.9.22-sources.jar',
visibility = [
'//third_party/java/...',
],
diff --git a/third_party/java/nekohtml/build.desc b/third_party/java/nekohtml/build.desc
index bd0acfec52be2..29bc387641207 100644
--- a/third_party/java/nekohtml/build.desc
+++ b/third_party/java/nekohtml/build.desc
@@ -1,4 +1,4 @@
java_library(name = "nekohtml",
deps = [
- "nekohtml-1.9.21.jar"
+ "nekohtml-1.9.22.jar"
])
diff --git a/third_party/java/nekohtml/nekohtml-1.9.21-sources.jar b/third_party/java/nekohtml/nekohtml-1.9.22-sources.jar
similarity index 69%
rename from third_party/java/nekohtml/nekohtml-1.9.21-sources.jar
rename to third_party/java/nekohtml/nekohtml-1.9.22-sources.jar
index a2313d8b8ae64..32ef5b7ff2eaf 100644
Binary files a/third_party/java/nekohtml/nekohtml-1.9.21-sources.jar and b/third_party/java/nekohtml/nekohtml-1.9.22-sources.jar differ
diff --git a/third_party/java/nekohtml/nekohtml-1.9.21.jar b/third_party/java/nekohtml/nekohtml-1.9.22.jar
similarity index 77%
rename from third_party/java/nekohtml/nekohtml-1.9.21.jar
rename to third_party/java/nekohtml/nekohtml-1.9.22.jar
index d46601dcb5e36..6a2e7828d60d6 100644
Binary files a/third_party/java/nekohtml/nekohtml-1.9.21.jar and b/third_party/java/nekohtml/nekohtml-1.9.22.jar differ