Updating HtmlUnit to 2.15

aquawoman22 · Jun 11, 2014 · 3b2b574 · 3b2b574
1 parent b74e6db
commit 3b2b574
Show file tree

Hide file tree

Showing 40 changed files with 51 additions and 51 deletions.
diff --git a/.idea/libraries/commons_httpclient.xml b/.idea/libraries/commons_httpclient.xml
diff --git a/.idea/libraries/commons_httpcore.xml b/.idea/libraries/commons_httpcore.xml
diff --git a/.idea/libraries/commons_lang.xml b/.idea/libraries/commons_lang.xml
diff --git a/.idea/libraries/cssparser.xml b/.idea/libraries/cssparser.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/java/client/.classpath b/java/client/.classpath
@@ -8,8 +8,8 @@
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.8.5.jar" sourcepath="/third-party/java/testng/testng-6.8.5-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-15.0.jar" sourcepath="/third-party/java/guava-libraries/guava-15.0-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.13.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.13-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.13.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.15.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.15-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.15.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-3.4.0.jar" sourcepath="/third-party/java/jna/jna-3.4.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-platform-3.4.0.jar" sourcepath="/third-party/java/jna/jna-platform-3.4.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-exec/commons-exec-1.1.jar" sourcepath="/third-party/java/commons-exec/commons-exec-1.1-sources.jar"/>
@@ -19,22 +19,22 @@
 	<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/opera-driver/operadriver-1.5.jar" />
 	<classpathentry kind="lib" path="/third-party/java/phantomjs-driver/phantomjsdriver-1.1.0.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.1.0-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.1.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.1-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.4-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.2.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.2-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-io/commons-io-2.2.jar" sourcepath="/third-party/java/commons-io/commons-io-2.2-src.zip"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-codec/commons-codec-1.8.jar" sourcepath="/third-party/java/commons-codec/commons-codec-1.8-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/sac/sac-1.3.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/commons-lang/commons-lang3-3.1.jar" sourcepath="/third-party/java/commons-lang/commons-lang3-3.1-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpmime-4.3.1.jar" sourcepath="/third-party/java/apache-httpclient/httpmime-4.3.1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/commons-lang/commons-lang3-3.3.2.jar" sourcepath="/third-party/java/commons-lang/commons-lang3-3.3.2-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpmime-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpmime-4.3.4-sources.jar"/>
 	<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"/>
-	<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.11.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/cssparser/cssparser-0.9.14.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xml/xercesImpl-2.10.0.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xml/xalan-2.7.1.jar"/>
 	<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"/>
 	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
 	<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"/>
-	<classpathentry kind="lib" path="/third-party/java/nekohtml/nekohtml-1.9.19.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/nekohtml/nekohtml-1.9.21.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/google-protobuffers/protobuf-java-2.4.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-jxpath/commons-jxpath-1.3.jar"/>

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -6,8 +6,8 @@
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/client"/>
 	<classpathentry kind="lib" path="/third-party/java/json/json-20080701.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.1.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.1-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.3.4-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.3.4.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.3.4-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/junit/junit-dep-4.11.jar" sourcepath="/third-party/java/junit/junit-dep-4.11-src.jar"/>

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.14</version>
+            <version>2.15</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -179,12 +179,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.3.2</version>
+                <version>4.3.4</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.3.1</version>
+                <version>4.3.4</version>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>

diff --git 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.2.jar',
-  source_jar = 'httpclient-4.3.2-sources.jar',
+  binary_jar = 'httpclient-4.3.4.jar',
+  source_jar = 'httpclient-4.3.4-sources.jar',
 )
 
 prebuilt_jar(name = 'core',
-  binary_jar = 'httpcore-4.3.1.jar',
-  source_jar = 'httpcore-4.3.1-sources.jar',
+  binary_jar = 'httpcore-4.3.2.jar',
+  source_jar = 'httpcore-4.3.2-sources.jar',
 )
 
 prebuilt_jar(name = 'mime',
-  binary_jar = 'httpmime-4.3.2.jar',
-  source_jar = 'httpmime-4.3.2-sources.jar',
+  binary_jar = 'httpmime-4.3.4.jar',
+  source_jar = 'httpmime-4.3.4-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.2.jar",
-    "httpcore-4.3.1.jar",
-    "httpmime-4.3.2.jar",
+    "httpclient-4.3.4.jar",
+    "httpcore-4.3.2.jar",
+    "httpmime-4.3.4.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.2-sources.jar b/third_party/java/apache-httpclient/httpclient-4.3.2-sources.jar
diff --git a/third_party/java/apache-httpclient/httpclient-4.3.4-sources.jar b/third_party/java/apache-httpclient/httpclient-4.3.4-sources.jar
diff --git a/...va/apache-httpclient/httpclient-4.3.2.jar → ...va/apache-httpclient/httpclient-4.3.4.jar b/...va/apache-httpclient/httpclient-4.3.2.jar → ...va/apache-httpclient/httpclient-4.3.4.jar
diff --git a/...che-httpclient/httpcore-4.3.1-sources.jar → ...che-httpclient/httpcore-4.3.2-sources.jar b/...che-httpclient/httpcore-4.3.1-sources.jar → ...che-httpclient/httpcore-4.3.2-sources.jar
diff --git a/...java/apache-httpclient/httpcore-4.3.1.jar → ...java/apache-httpclient/httpcore-4.3.2.jar b/...java/apache-httpclient/httpcore-4.3.1.jar → ...java/apache-httpclient/httpcore-4.3.2.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/third_party/java/apache-httpclient/httpmime-4.3.4-sources.jar b/third_party/java/apache-httpclient/httpmime-4.3.4-sources.jar
diff --git a/...java/apache-httpclient/httpmime-4.3.2.jar → ...java/apache-httpclient/httpmime-4.3.4.jar b/...java/apache-httpclient/httpmime-4.3.2.jar → ...java/apache-httpclient/httpmime-4.3.4.jar
diff --git 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.2.1.jar',
-  source_jar = 'commons-lang3-3.2.1-sources.jar',
+  binary_jar = 'commons-lang3-3.3.2.jar',
+  source_jar = 'commons-lang3-3.3.2-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.2.1.jar"
+    "commons-lang3-3.3.2.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-lang/commons-lang3-3.3.2-sources.jar b/third_party/java/commons-lang/commons-lang3-3.3.2-sources.jar
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
diff --git 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.11.jar',
+  binary_jar = 'cssparser-0.9.14.jar',
   deps = [
     '//third_party/java/sac:sac',
   ],

diff --git 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.11.jar",
+    "cssparser-0.9.14.jar",
     "//third_party/java/sac"
   ])
diff --git a/...party/java/cssparser/cssparser-0.9.11.jar → ...party/java/cssparser/cssparser-0.9.14.jar b/...party/java/cssparser/cssparser-0.9.11.jar → ...party/java/cssparser/cssparser-0.9.14.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.14.jar',
-  source_jar = 'htmlunit-2.14-sources.jar',
+  binary_jar = 'htmlunit-2.15.jar',
+  source_jar = 'htmlunit-2.15-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.14.jar',
+  binary_jar = 'htmlunit-core-js-2.15.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.14.jar",
-    "htmlunit-core-js-2.14.jar",
+    "htmlunit-2.15.jar",
+    "htmlunit-core-js-2.15.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.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/third_party/java/htmlunit/htmlunit-2.15-sources.jar b/third_party/java/htmlunit/htmlunit-2.15-sources.jar
diff --git a/third_party/java/htmlunit/htmlunit-2.15.jar b/third_party/java/htmlunit/htmlunit-2.15.jar
diff --git a/...y/java/htmlunit/htmlunit-core-js-2.14.jar → ...y/java/htmlunit/htmlunit-core-js-2.15.jar b/...y/java/htmlunit/htmlunit-core-js-2.14.jar → ...y/java/htmlunit/htmlunit-core-js-2.15.jar
diff --git 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.20.jar',
-  source_jar = 'nekohtml-1.9.20-sources.jar',
+  binary_jar = 'nekohtml-1.9.21.jar',
+  source_jar = 'nekohtml-1.9.21-sources.jar',
   visibility = [
     '//third_party/java/...',
   ],

diff --git 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.20.jar"
+    "nekohtml-1.9.21.jar"
   ])
diff --git a/...java/nekohtml/nekohtml-1.9.20-sources.jar → ...java/nekohtml/nekohtml-1.9.21-sources.jar b/...java/nekohtml/nekohtml-1.9.20-sources.jar → ...java/nekohtml/nekohtml-1.9.21-sources.jar
diff --git a/...d_party/java/nekohtml/nekohtml-1.9.20.jar → ...d_party/java/nekohtml/nekohtml-1.9.21.jar b/...d_party/java/nekohtml/nekohtml-1.9.20.jar → ...d_party/java/nekohtml/nekohtml-1.9.21.jar