fixing htmlunit project / dependencies

skestle · May 20, 2016 · e506776 · e506776
1 parent dbad0d8
commit e506776
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 21 deletions.
diff --git a/.idea/libraries/htmlunit.xml b/.idea/libraries/htmlunit.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -7,9 +7,10 @@
 	<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/guava/guava-19.0.jar" sourcepath="/third-party/java/guava/guava-19.0-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.20.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.20-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.21.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.21-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/neko-htmlunit-2.21.jar" sourcepath="/third-party/java/htmlunit/neko-htmlunit-2.21-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.17.jar" />
-	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-driver-2.20.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-driver-2.21.jar" sourcepath="/third-party/java/htmlunit/htmlunit-driver-2.21.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-4.1.0.jar" sourcepath="/third-party/java/jna/jna-4.1.0-src.jar"/>
 	<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"/>
 	<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"/>
@@ -31,7 +32,6 @@
 	<classpathentry kind="lib" path="/third-party/java/xalan/xalan-2.7.2.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/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.22.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xml/xml-apis-1.4.01.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-1.9.5.jar"/>

diff --git a/java/client/client.iml b/java/client/client.iml
@@ -36,7 +36,6 @@
     <orderEntry type="library" name="servlet-api" level="project" />
     <orderEntry type="library" name="testng" level="project" />
     <orderEntry type="library" name="xml-apis" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="nekohtml" level="project" />
     <orderEntry type="library" name="sac" level="project" />
     <orderEntry type="library" scope="TEST" name="dnsjava" level="project" />
     <orderEntry type="library" scope="TEST" name="dnssec4j" level="project" />
@@ -54,4 +53,4 @@
     <option name="useAlternativeWorkingDir" value="false" />
     <option name="workingDirSelection" value="&lt;PROJECT&gt;" />
   </component>
-</module>
+</module>
diff --git a/third_party/java/htmlunit/BUCK b/third_party/java/htmlunit/BUCK
@@ -11,12 +11,12 @@ prebuilt_jar(name = 'htmlunit',
   source_jar = 'htmlunit-2.21-sources.jar',
   deps = [
     ':js-core',
+    ':neko-htmlunit',
     '//third_party/java/httpcomponents:httpclient',
     '//third_party/java/commons-collections:commons-collections',
     '//third_party/java/commons-io:commons-io',
     '//third_party/java/commons:commons-lang',
     '//third_party/java/cssparser:cssparser',
-    '//third_party/java/nekohtml:nekohtml',
     '//third_party/java/serializer:serializer',
     '//third_party/java/websocket:websocket-client',
     '//third_party/java/xml:xml',
@@ -34,3 +34,9 @@ prebuilt_jar(name = 'js-core',
 #    '//java/client/src/org/openqa/selenium/htmlunit:htmlunit',
   ],
 )
+
+prebuilt_jar(name = 'neko-htmlunit',
+  binary_jar = 'neko-htmlunit-2.21.jar',
+  source_jar = 'neko-htmlunit-2.21-sources.jar',
+  visibility = [],
+)
diff --git a/third_party/java/htmlunit/build.desc b/third_party/java/htmlunit/build.desc
@@ -2,13 +2,13 @@ java_library(name = "htmlunit",
   deps = [
     "htmlunit-driver-2.21.jar",
     "htmlunit-2.21.jar",
+    "neko-htmlunit-2.21.jar",
     "htmlunit-core-js-2.17.jar",
     "//third_party/java/commons:commons-lang",
     "//third_party/java/commons-collections",
     "//third_party/java/commons-io",
     "//third_party/java/cssparser",
     "//third_party/java/httpcomponents:httpclient",
-    "//third_party/java/nekohtml",
     "//third_party/java/serializer",
     "//third_party/java/xml",
     "//third_party/java/websocket:websocket-client",

diff --git a/third_party/java/htmlunit/neko-htmlunit-2.21-sources.jar b/third_party/java/htmlunit/neko-htmlunit-2.21-sources.jar
diff --git a/third_party/java/htmlunit/neko-htmlunit-2.21.jar b/third_party/java/htmlunit/neko-htmlunit-2.21.jar
diff --git a/third_party/java/nekohtml/BUCK b/third_party/java/nekohtml/BUCK
diff --git a/third_party/java/nekohtml/build.desc b/third_party/java/nekohtml/build.desc
diff --git a/third_party/java/nekohtml/nekohtml-1.9.22-sources.jar b/third_party/java/nekohtml/nekohtml-1.9.22-sources.jar
diff --git a/third_party/java/nekohtml/nekohtml-1.9.22.jar b/third_party/java/nekohtml/nekohtml-1.9.22.jar