standalone-server jar needs client combined dependencies, also adding…

… phantomjs/htmlunit to buck standalone-server build Fixes SeleniumHQ#1847
skestle · Mar 20, 2016 · 327dcae · 327dcae
1 parent e7c6b91
commit 327dcae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/java/client/src/org/openqa/selenium/build.desc b/java/client/src/org/openqa/selenium/build.desc
@@ -107,7 +107,8 @@ java_library(name = "client-combined-v3",
     "//java/client/src/org/openqa/selenium/safari",
     "//java/client/src/org/openqa/selenium/support",
     "//java/client/src/org/openqa/selenium/remote:augmenter",
-    "//third_party/java/phantomjs-driver"
+    "//third_party/java/phantomjs-driver",
+    "//third_party/java/htmlunit"
   ])
 
 java_library(name = "codecs",

diff --git a/java/server/src/org/openqa/selenium/remote/server/BUCK b/java/server/src/org/openqa/selenium/remote/server/BUCK
@@ -112,6 +112,8 @@ java_binary(name = 'standalone-server',
     '//java/client/src/org/openqa/selenium/ie:ie',
     '//java/client/src/org/openqa/selenium/opera:opera',
     '//java/client/src/org/openqa/selenium/safari:safari',
+    '//third_party/java/phantomjs-driver:phantomjs-driver',
+    '//third_party/java/htmlunit:htmlunit-driver',
     '//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet',
   ],
 )
diff --git a/java/server/src/org/openqa/selenium/remote/server/build.desc b/java/server/src/org/openqa/selenium/remote/server/build.desc
@@ -17,9 +17,8 @@ java_library(name = "real-server",
 java_library(name = "server",
   deps = [
     ":server_core",
+    "//java/client/src/org/openqa/selenium:client-combined-v3",
     "//java/client/src/org/openqa/selenium:webdriver-api",
-    "//java/client/src/org/openqa/selenium/ie",
-    "//java/client/src/org/openqa/selenium/firefox",
   ])
 
 java_library(name = "restish",

diff --git a/third_party/java/phantomjs-driver/BUCK b/third_party/java/phantomjs-driver/BUCK
@@ -5,5 +5,6 @@ prebuilt_jar(name = 'phantomjs-driver',
   ],
   visibility = [
     '//java/client/test/org/openqa/selenium/testing/drivers:drivers',
+    '//java/server/src/org/openqa/selenium/remote/server:standalone-server',
   ],
 )