Bump the hmltunit version to 2.14

This also fixes the buck builds. There are two known build failures in the htmlunit JS tests, but these failed with the prior release, and so we're functionally equivalent.
Jonahss · May 12, 2014 · 62a47fd · 62a47fd
1 parent 00f9aea
commit 62a47fd
Show file tree

Hide file tree

Showing 62 changed files with 85 additions and 77 deletions.
diff --git a/.idea/libraries/commons_codec.xml b/.idea/libraries/commons_codec.xml
diff --git a/.idea/libraries/commons_httpclient.xml b/.idea/libraries/commons_httpclient.xml
diff --git a/.idea/libraries/commons_io.xml b/.idea/libraries/commons_io.xml
diff --git a/.idea/libraries/commons_lang.xml b/.idea/libraries/commons_lang.xml
diff --git a/.idea/libraries/commons_logging.xml b/.idea/libraries/commons_logging.xml
diff --git a/.idea/libraries/htmlunit.xml b/.idea/libraries/htmlunit.xml
diff --git a/.idea/libraries/nekohtml.xml b/.idea/libraries/nekohtml.xml
diff --git a/.idea/libraries/xml_apis.xml b/.idea/libraries/xml_apis.xml
diff --git a/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java b/java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java
@@ -243,19 +243,15 @@ static BrowserVersion determineBrowserVersion(Capabilities capabilities) {
       try {
         int version = Integer.parseInt(browserVersion);
         switch (version) {
-          case 6:
-            return BrowserVersion.INTERNET_EXPLORER_6;
-          case 7:
-            return BrowserVersion.INTERNET_EXPLORER_7;
           case 8:
             return BrowserVersion.INTERNET_EXPLORER_8;
           case 9:
             return BrowserVersion.INTERNET_EXPLORER_9;
           default:
-            return BrowserVersion.INTERNET_EXPLORER_8;
+            return BrowserVersion.INTERNET_EXPLORER_11;
         }
       } catch (NumberFormatException e) {
-        return BrowserVersion.INTERNET_EXPLORER_8;
+        return BrowserVersion.INTERNET_EXPLORER_11;
       }
     }
 

diff --git a/java/client/src/org/openqa/selenium/remote/BUCK b/java/client/src/org/openqa/selenium/remote/BUCK
@@ -33,6 +33,7 @@ java_library(
 java_library(name = 'remote',
   srcs = [
     'BeanToJsonConverter.java',
+    'CommandCodec.java',
     'CommandInfo.java',
     'CoordinatesUtils.java',
     'DriverCommand.java',
@@ -52,18 +53,24 @@ java_library(name = 'remote',
     'RemoteTouchScreen.java',
     'RemoteWebDriver.java',
     'RemoteWebElement.java',
+    'ResponseCodec.java',
     'ScreenshotException.java',
     'SessionNotFoundException.java',
     'SimplePropertyDescriptor.java',
     'UnreachableBrowserException.java',
     'UselessFileDetector.java',
     'html5/RemoteApplicationCache.java',
-    'html5/RemoteBrowserConnection.java',
     'html5/RemoteDatabaseStorage.java',
     'html5/RemoteLocalStorage.java',
     'html5/RemoteLocationContext.java',
     'html5/RemoteSessionStorage.java',
     'html5/RemoteWebStorage.java',
+    'http/HttpMessage.java',
+    'http/HttpMethod.java',
+    'http/HttpRequest.java',
+    'http/HttpResponse.java',
+    'http/JsonHttpCommandCodec.java',
+    'http/JsonHttpResponseCodec.java',
     'internal/CircularOutputStream.java',
     'internal/HttpClientFactory.java',
     'internal/JsonToWebElementConverter.java',

diff --git a/java/client/test/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java b/java/client/test/org/openqa/selenium/htmlunit/HtmlUnitCapabilitiesTest.java
@@ -34,17 +34,11 @@
 public class HtmlUnitCapabilitiesTest {
   @Test
   public void configurationViaDirectCapabilities() {
-    DesiredCapabilities ie7Capabilities =
-        new DesiredCapabilities(BrowserType.IE, "7", Platform.ANY);
-
-    assertEquals(HtmlUnitDriver.determineBrowserVersion(ie7Capabilities),
-        BrowserVersion.INTERNET_EXPLORER_7);
-
     DesiredCapabilities ieCapabilities =
         new DesiredCapabilities(BrowserType.IE, "", Platform.ANY);
 
     assertEquals(HtmlUnitDriver.determineBrowserVersion(ieCapabilities),
-        BrowserVersion.INTERNET_EXPLORER_8);
+        BrowserVersion.INTERNET_EXPLORER_11);
 
     DesiredCapabilities firefoxCapabilities =
         new DesiredCapabilities(BrowserType.FIREFOX, "", Platform.ANY);
@@ -68,13 +62,13 @@ public void configurationOfIEViaRemote() {
         new DesiredCapabilities(BrowserType.HTMLUNIT, "internet explorer", Platform.ANY);
 
     assertEquals(HtmlUnitDriver.determineBrowserVersion(ieCapabilities),
-        BrowserVersion.INTERNET_EXPLORER_8);
+        BrowserVersion.INTERNET_EXPLORER_11);
 
-    DesiredCapabilities ie7Capabilities =
-        new DesiredCapabilities(BrowserType.HTMLUNIT, "internet explorer-7", Platform.ANY);
+    DesiredCapabilities ie8Capabilities =
+        new DesiredCapabilities(BrowserType.HTMLUNIT, "internet explorer-8", Platform.ANY);
 
-    assertEquals(HtmlUnitDriver.determineBrowserVersion(ie7Capabilities),
-        BrowserVersion.INTERNET_EXPLORER_7);
+    assertEquals(HtmlUnitDriver.determineBrowserVersion(ie8Capabilities),
+        BrowserVersion.INTERNET_EXPLORER_8);
   }
 
   @Test

diff --git a/java/client/test/org/openqa/selenium/remote/HttpRequest.java b/java/client/test/org/openqa/selenium/remote/HttpRequest.java
@@ -31,7 +31,6 @@
 import org.openqa.selenium.remote.internal.HttpClientFactory;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 
 public class HttpRequest {
@@ -98,11 +97,7 @@ public HttpUriRequest prepare(String url, Object payload) {
 
         if (payload != null) {
           String content = new BeanToJsonConverter().convert(payload);
-          try {
-            post.setEntity(new StringEntity(content, "UTF-8"));
-          } catch (UnsupportedEncodingException e) {
-            throw Throwables.propagate(e);
-          }
+          post.setEntity(new StringEntity(content, "UTF-8"));
         }
         return post;
       }

diff --git a/maven/htmlunit-driver/pom.xml b/maven/htmlunit-driver/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.13</version>
+            <version>2.14</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -144,12 +144,12 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.2</version>
+                <version>2.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.8</version>
+                <version>1.9</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -179,12 +179,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.3.1</version>
+                <version>4.3.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.3</version>
+                <version>4.3.1</version>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>

diff --git a/third_party/java/apache-httpclient/BUCK b/third_party/java/apache-httpclient/BUCK
@@ -11,13 +11,16 @@ java_library(name = "apache-httpclient",
 )
 
 prebuilt_jar(name = 'client',
-  binary_jar = 'httpclient-4.3.1.jar',
+  binary_jar = 'httpclient-4.3.2.jar',
+  source_jar = 'httpclient-4.3.2-sources.jar',
 )
 
 prebuilt_jar(name = 'core',
-  binary_jar = 'httpcore-4.3.jar',
+  binary_jar = 'httpcore-4.3.1.jar',
+  source_jar = 'httpcore-4.3.1-sources.jar',
 )
 
 prebuilt_jar(name = 'mime',
-  binary_jar = 'httpmime-4.3.1.jar',
+  binary_jar = 'httpmime-4.3.2.jar',
+  source_jar = 'httpmime-4.3.2-sources.jar',
 )
diff --git 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.1.jar",
-    "httpcore-4.3.jar",
-    "httpmime-4.3.1.jar",
+    "httpclient-4.3.2.jar",
+    "httpcore-4.3.1.jar",
+    "httpmime-4.3.2.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.1-sources.jar b/third_party/java/apache-httpclient/httpclient-4.3.1-sources.jar
diff --git a/third_party/java/apache-httpclient/httpclient-4.3.2-sources.jar b/third_party/java/apache-httpclient/httpclient-4.3.2-sources.jar
diff --git a/...va/apache-httpclient/httpclient-4.3.1.jar → ...va/apache-httpclient/httpclient-4.3.2.jar b/...va/apache-httpclient/httpclient-4.3.1.jar → ...va/apache-httpclient/httpclient-4.3.2.jar
diff --git a/...pache-httpclient/httpcore-4.3-sources.jar → ...che-httpclient/httpcore-4.3.1-sources.jar b/...pache-httpclient/httpcore-4.3-sources.jar → ...che-httpclient/httpcore-4.3.1-sources.jar
diff --git a/...y/java/apache-httpclient/httpcore-4.3.jar → ...java/apache-httpclient/httpcore-4.3.1.jar b/...y/java/apache-httpclient/httpcore-4.3.jar → ...java/apache-httpclient/httpcore-4.3.1.jar
diff --git a/third_party/java/apache-httpclient/httpmime-4.3.1-sources.jar b/third_party/java/apache-httpclient/httpmime-4.3.1-sources.jar
diff --git a/third_party/java/apache-httpclient/httpmime-4.3.2-sources.jar b/third_party/java/apache-httpclient/httpmime-4.3.2-sources.jar
diff --git a/...java/apache-httpclient/httpmime-4.3.1.jar → ...java/apache-httpclient/httpmime-4.3.2.jar b/...java/apache-httpclient/httpmime-4.3.1.jar → ...java/apache-httpclient/httpmime-4.3.2.jar
diff --git a/third_party/java/commons-codec/BUCK b/third_party/java/commons-codec/BUCK
@@ -1,5 +1,6 @@
 prebuilt_jar(name = 'commons-codec',
-  binary_jar = 'commons-codec-1.8.jar',
+  binary_jar = 'commons-codec-1.9.jar',
+  source_jar = 'commons-codec-1.9-sources.jar',
   visibility = [
     '//third_party/java/...',
   ],

diff --git a/third_party/java/commons-codec/build.desc b/third_party/java/commons-codec/build.desc
@@ -1,4 +1,4 @@
 java_library(name = "commons-codec",
   deps = [
-    "commons-codec-1.8.jar"
+    "commons-codec-1.9.jar"
   ])
diff --git a/third_party/java/commons-codec/commons-codec-1.8-sources.jar b/third_party/java/commons-codec/commons-codec-1.8-sources.jar
diff --git a/third_party/java/commons-codec/commons-codec-1.9-sources.jar b/third_party/java/commons-codec/commons-codec-1.9-sources.jar
diff --git a/.../java/commons-codec/commons-codec-1.8.jar → .../java/commons-codec/commons-codec-1.9.jar b/.../java/commons-codec/commons-codec-1.8.jar → .../java/commons-codec/commons-codec-1.9.jar
diff --git a/third_party/java/commons-io/BUCK b/third_party/java/commons-io/BUCK
@@ -1,5 +1,6 @@
 prebuilt_jar(name = 'commons-io',
-  binary_jar = 'commons-io-2.2.jar',
+  binary_jar = 'commons-io-2.4.jar',
+  source_jar = 'commons-io-2.4-sources.jar',
   visibility = [
     '//third_party/java/...',
   ],

diff --git a/third_party/java/commons-io/build.desc b/third_party/java/commons-io/build.desc
@@ -1,2 +1,2 @@
 java_library(name = "commons-io",
-  deps = [ "commons-io-2.2.jar" ])
+  deps = [ "commons-io-2.4.jar" ])
diff --git a/third_party/java/commons-io/commons-io-2.2-src.zip b/third_party/java/commons-io/commons-io-2.2-src.zip
diff --git a/third_party/java/commons-io/commons-io-2.2.jar b/third_party/java/commons-io/commons-io-2.2.jar
diff --git a/third_party/java/commons-io/commons-io-2.4-sources.jar b/third_party/java/commons-io/commons-io-2.4-sources.jar
diff --git a/third_party/java/commons-io/commons-io-2.4.jar b/third_party/java/commons-io/commons-io-2.4.jar
diff --git a/third_party/java/commons-lang/BUCK b/third_party/java/commons-lang/BUCK
@@ -1,5 +1,6 @@
 prebuilt_jar(name = 'commons-lang',
-  binary_jar = 'commons-lang3-3.1.jar',
+  binary_jar = 'commons-lang3-3.2.1.jar',
+  source_jar = 'commons-lang3-3.2.1-sources.jar',
   visibility = [
     '//third_party/java/...',
   ],

diff --git 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.1.jar"
-  ])
+    "commons-lang3-3.2.1.jar"
+  ])
diff --git a/third_party/java/commons-lang/commons-lang3-3.1-sources.jar b/third_party/java/commons-lang/commons-lang3-3.1-sources.jar
diff --git a/third_party/java/commons-lang/commons-lang3-3.1.jar b/third_party/java/commons-lang/commons-lang3-3.1.jar
diff --git a/third_party/java/commons-lang/commons-lang3-3.2.1-sources.jar b/third_party/java/commons-lang/commons-lang3-3.2.1-sources.jar
diff --git a/third_party/java/commons-lang/commons-lang3-3.2.1.jar b/third_party/java/commons-lang/commons-lang3-3.2.1.jar
diff --git a/third_party/java/commons-logging/BUCK b/third_party/java/commons-logging/BUCK
@@ -1,5 +1,5 @@
 prebuilt_jar(name = 'commons-logging',
-  binary_jar = 'commons-logging-1.1.1.jar',
+  binary_jar = 'commons-logging-1.1.3.jar',
   visibility = [
     '//third_party/java/...',
   ],

diff --git a/third_party/java/commons-logging/build.desc b/third_party/java/commons-logging/build.desc
@@ -1,5 +1,5 @@
 java_library(name = "commons-logging",
   deps = [
-    "commons-logging-1.1.1.jar"
+    "commons-logging-1.1.3.jar"
   ]
-)
+)
diff --git a/third_party/java/commons-logging/commons-logging-1.1.1.jar b/third_party/java/commons-logging/commons-logging-1.1.1.jar
diff --git a/third_party/java/commons-logging/commons-logging-1.1.3.jar b/third_party/java/commons-logging/commons-logging-1.1.3.jar
diff --git a/third_party/java/htmlunit/BUCK b/third_party/java/htmlunit/BUCK
@@ -1,6 +1,6 @@
 prebuilt_jar(name = 'htmlunit',
-  binary_jar = 'htmlunit-2.13.jar',
-  source_jar = 'htmlunit-2.13-sources.jar',
+  binary_jar = 'htmlunit-2.14.jar',
+  source_jar = 'htmlunit-2.14-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.13.jar',
+  binary_jar = 'htmlunit-core-js-2.14.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
@@ -1,7 +1,7 @@
 java_library(name = "htmlunit",
   deps = [
-    "htmlunit-2.13.jar",
-    "htmlunit-core-js-2.13.jar",
+    "htmlunit-2.14.jar",
+    "htmlunit-core-js-2.14.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.13-sources.jar b/third_party/java/htmlunit/htmlunit-2.13-sources.jar
diff --git a/third_party/java/htmlunit/htmlunit-2.13.jar b/third_party/java/htmlunit/htmlunit-2.13.jar
diff --git a/third_party/java/htmlunit/htmlunit-2.14-sources.jar b/third_party/java/htmlunit/htmlunit-2.14-sources.jar
diff --git a/third_party/java/htmlunit/htmlunit-2.14.jar b/third_party/java/htmlunit/htmlunit-2.14.jar
diff --git a/...y/java/htmlunit/htmlunit-core-js-2.13.jar → ...y/java/htmlunit/htmlunit-core-js-2.14.jar b/...y/java/htmlunit/htmlunit-core-js-2.13.jar → ...y/java/htmlunit/htmlunit-core-js-2.14.jar