Prepare for the maven publish from Buck.

This means that we need to prepare the libraries so that
the dependencies of the maven modules is modelled in the
BUCK files. This involves a certain amount of
jiggery-pokery.

Although this isn't complete, we get a lot closer to being
able to do the libraries under //java/client/src/... with
this change. In order to create the jars correctly, this
will also need a buck version bump.

Rakefile

@@ -103,6 +103,18 @@ crazy_fun.create_tasks(Dir["**/build.desc"])
 # This is because the buck integration creates a rule for "//.*"
 require 'rake-tasks/buck'
 
+# Java targets required for release. These should all have the correct maven_coords set.
+JAVA_RELEASE_TARGETS = [
+  '//java/client/src/org/openqa/selenium:core',
+  '//java/client/src/org/openqa/selenium:selenium',
+  '//java/client/src/org/openqa/selenium/chrome:chrome',
+  '//java/client/src/org/openqa/selenium/edge:edge',
+  '//java/client/src/org/openqa/selenium/firefox:firefox',
+  '//java/client/src/org/openqa/selenium/ie:ie',
+  '//java/client/src/org/openqa/selenium/remote:remote',
+  '//java/client/src/org/openqa/selenium/safari:safari',
+]
+
 
 # Notice that because we're using rake, anything you can do in a normal rake
 # build can also be done here. For example, here we set the default task
@@ -526,7 +538,7 @@ task :push_release => [:release] do
 end
 
 desc 'Build the selenium client jars'
-task 'selenium-java' => '//java/client/src/org/openqa/selenium:client-combined-v3:project'
+task 'selenium-java' => '//java/client/src/org/openqa/selenium:selenium-java'
 
 desc 'Build and package Selenium IDE'
 task :release_ide  => [:ide] do

java/client/src/com/thoughtworks/selenium/BUCK

@@ -26,8 +26,7 @@ java_library(name = 'selenium',
     '//java/client/src/com/thoughtworks/selenium/condition:condition',
   ],
   deps = [
-    '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//java/client/src/org/openqa/selenium/net:net',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//third_party/java/guava:guava',
     '//third_party/java/junit:junit',
     '//third_party/java/testng:testng',

java/client/src/com/thoughtworks/selenium/webdriven/BUCK

@@ -33,7 +33,7 @@ java_library(name = 'webdriven',
   deps = [
     '//java/client/src/com/thoughtworks/selenium:selenium',
     '//java/client/src/com/thoughtworks/selenium/webdriven/commands:commands',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//third_party/java/guava:guava',
   ],
   visibility = [
@@ -59,7 +59,7 @@ java_library(name = 'emulation-api',
   ],
   deps = [
     '//java/client/src/com/thoughtworks/selenium:api',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//third_party/java/guava:guava',
   ],
   visibility = [

java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK

@@ -4,8 +4,7 @@ java_library(name = 'commands',
   deps = [
     '//java/client/src/com/thoughtworks/selenium:api',
     '//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//java/client/src/org/openqa/selenium/io:io',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//third_party/java/guava:guava',
   ],
   visibility = [

java/client/src/org/openqa/selenium/BUCK

@@ -1,13 +1,18 @@
-java_library(name = 'webdriver-api',
+java_library(name = 'selenium',
+  maven_coords = 'org.seleniumhq.selenium:selenium-java:2.49.0',
   exported_deps = [
     ':beta',
+    ':codecs',
     ':core',
     ':exceptions',
     ':platform',
     ':primitives',
     '//java/client/src/org/openqa/selenium/interactions:interactions',
-    '//java/client/src/org/openqa/selenium/interactions:exceptions',
+    '//java/client/src/org/openqa/selenium/io:io',
     '//java/client/src/org/openqa/selenium/logging:api',
+    '//java/client/src/org/openqa/selenium/logging:logging',
+    '//java/client/src/org/openqa/selenium/net:net',
+    '//java/client/src/org/openqa/selenium/os:os',
     '//java/client/src/org/openqa/selenium/security:security',
   ],
   visibility = ['PUBLIC'],
@@ -22,7 +27,7 @@ java_library(
 )
 
 java_library(name = 'core',
-  maven_coords = "org.seleniumhq.selenium:selenium-api:2.49.0",
+  maven_coords = 'org.seleniumhq.selenium:selenium-api:2.49.0',
   srcs = [
     'Alert.java',
     'By.java',
@@ -71,7 +76,12 @@ java_library(name = 'core',
 
 java_library(name = 'beta',
   srcs = [ 'Beta.java' ],
-  visibility = [ 'PUBLIC' ],
+  visibility = [
+    '//java/client/src/org/openqa/selenium/logging:api',
+    '//java/client/src/org/openqa/selenium/logging:logging',
+    '//java/client/src/org/openqa/selenium/os:os',
+    '//java/client/src/org/openqa/selenium/security:security',
+  ],
 )
 
 java_library(name = 'exceptions',
@@ -100,6 +110,8 @@ java_library(name = 'exceptions',
   visibility = [
     '//java/client/src/org/openqa/selenium/interactions:exceptions',
     '//java/client/src/org/openqa/selenium/io:io',
+    '//java/client/src/org/openqa/selenium/net:net',
+    '//java/client/src/org/openqa/selenium/os:os',
     '//java/client/test/org/openqa/selenium/testing:helpers',
   ],
 )
@@ -113,7 +125,11 @@ java_library(
   deps = [
     ':exceptions',
   ],
-  visibility = ['PUBLIC'],
+  visibility = [
+    '//java/client/src/org/openqa/selenium/io:io',
+    '//java/client/src/org/openqa/selenium/net:net',
+    '//java/client/src/org/openqa/selenium/os:os',
+  ],
 )
 
 java_library(name = 'primitives',
@@ -126,16 +142,3 @@ java_library(name = 'primitives',
     '//java/client/src/org/openqa/selenium/interactions:core',
   ],
 )
-
-java_binary(name = 'selenium-java',
-  deps = [
-    ':webdriver-api',
-    '//java/client/src/org/openqa/selenium/ie:ie',
-    '//java/client/src/org/openqa/selenium/chrome:chrome',
-    '//java/client/src/org/openqa/selenium/firefox:firefox',
-    '//java/client/src/org/openqa/selenium/lift:lift',
-    '//java/client/src/org/openqa/selenium/remote:remote',
-    '//java/client/src/org/openqa/selenium/safari:safari',
-    '//java/client/src/org/openqa/selenium/support:support',
-  ],
-)

java/client/src/org/openqa/selenium/browserlaunchers/locators/BUCK

@@ -1,10 +1,8 @@
 java_library(name = 'locators',
   srcs = glob(['*.java']),
   deps = [
-    '//java/client/src/org/openqa/selenium/io:io',
-    '//java/client/src/org/openqa/selenium/os:os',
-    '//java/client/src/org/openqa/selenium/remote:capabilities',
-    '//java/client/src/org/openqa/selenium:platform',
+    '//java/client/src/org/openqa/selenium:selenium',
+    '//java/client/src/org/openqa/selenium/remote:remote',
     '//third_party/java/guava:guava',
   ],
   visibility = [

java/client/src/org/openqa/selenium/chrome/BUCK

@@ -1,15 +1,10 @@
 java_library(
   name = 'chrome',
+  maven_coords = 'org.seleniumhq.selenium:selenium-chrome-driver:2.49.0',
   srcs = glob(['*.java']),
   deps = [
-    '//java/client/src/org/openqa/selenium:codecs',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//java/client/src/org/openqa/selenium/logging:logging',
-    '//java/client/src/org/openqa/selenium/net:net',
-    '//java/client/src/org/openqa/selenium/remote:api',
-    '//java/client/src/org/openqa/selenium/remote:capabilities',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium/remote:remote',
-    '//java/client/src/org/openqa/selenium/remote/service:service',
     '//third_party/java/gson:gson',
     '//third_party/java/guava:guava',
   ],

java/client/src/org/openqa/selenium/edge/BUCK

@@ -1,15 +1,10 @@
 java_library(
   name = 'edge',
+  maven_coords = 'org.seleniumhq.selenium:selenium-edge-driver:2.49.0',
   srcs = glob(['*.java']),
   deps = [
-    '//java/client/src/org/openqa/selenium:codecs',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//java/client/src/org/openqa/selenium/logging:logging',
-    '//java/client/src/org/openqa/selenium/net:net',
-    '//java/client/src/org/openqa/selenium/remote:api',
-    '//java/client/src/org/openqa/selenium/remote:capabilities',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium/remote:remote',
-    '//java/client/src/org/openqa/selenium/remote/service:service',
     '//third_party/java/gson:gson',
     '//third_party/java/guava:guava',
   ],

java/client/src/org/openqa/selenium/firefox/BUCK

@@ -7,12 +7,8 @@ java_library(name = 'firefox',
   ],
   deps = [
     ':prefs',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//java/client/src/org/openqa/selenium/io:io',
-    '//java/client/src/org/openqa/selenium/net:net',
-    '//java/client/src/org/openqa/selenium/os:os',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium/remote:remote',
-    '//java/client/src/org/openqa/selenium/remote/service:service',
     '//third_party/java/guava:guava',
   ],
   visibility = [ 'PUBLIC' ],

java/client/src/org/openqa/selenium/ie/BUCK

@@ -1,10 +1,9 @@
 java_library(name = 'ie',
+  maven_coords = 'org.seleniumhq.selenium:selenium-ie-driver:2.49.0',
   srcs = glob(['*.java']),
   deps = [
-    '//java/client/src/org/openqa/selenium/net:net',
-    '//java/client/src/org/openqa/selenium/remote/service:service',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium/remote:remote',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
     '//third_party/java/guava:guava',
   ],
   visibility = [ 'PUBLIC' ],

java/client/src/org/openqa/selenium/interactions/BUCK

@@ -3,21 +3,23 @@ java_library(name = 'interactions',
     'ActionChainExecutor.java',
     'Actions.java',
     'CanPerformActionChain.java',
-  ] + glob(['*Action.java', 'internal/*Action.java', 'touch/*.java']),
+  ] + glob(['*Action.java', 'internal/*Action.java', 'touch/*.java'], excludes = ['Action.java']),
   exported_deps = [
     ':core',
     ':exceptions',
     '//java/client/src/org/openqa/selenium:core',
   ],
   deps = [
-    ':core',
     '//third_party/java/guava:guava',
   ],
-  visibility = ['PUBLIC'],
+  visibility = [
+    '//java/client/src/org/openqa/selenium:selenium',
+  ],
 )
 
 java_library(name = 'core',
   srcs = [
+    'Action.java',
     'HasInputDevices.java',
     'HasTouchScreen.java',
     'Keyboard.java',
@@ -42,7 +44,6 @@ java_library(name = 'exceptions',
     '//java/client/src/org/openqa/selenium:exceptions',
   ],
   visibility = [
-    '//java/client/src/org/openqa/selenium:webdriver-api',
     '//java/client/src/org/openqa/selenium:core',
     '//java/client/src/org/openqa/selenium/remote:remote',
   ],

java/client/src/org/openqa/selenium/io/BUCK

@@ -7,6 +7,9 @@ java_library(
     '//java/client/src/org/openqa/selenium:platform',
     '//third_party/java/guava:guava',
   ],
-  visibility = ['PUBLIC'],
+  visibility = [
+    '//java/client/src/org/openqa/selenium:selenium',
+    '//java/client/src/org/openqa/selenium/os:os',
+  ],
 )
 

java/client/src/org/openqa/selenium/lift/BUCK

@@ -1,7 +1,7 @@
 java_library(name = 'lift',
   srcs = glob(['**/*.java']),
   deps = [
-    '//java/client/src/org/openqa/selenium:webdriver-api',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium/support/ui:wait',
     '//java/client/src/org/openqa/selenium/support/ui:clock',
     '//third_party/java/guava:guava',

java/client/src/org/openqa/selenium/logging/BUCK

@@ -10,7 +10,10 @@ java_library(name = 'api',
   deps = [
     '//java/client/src/org/openqa/selenium:beta',
   ],
-  visibility = ['PUBLIC'],
+  visibility = [
+    '//java/client/src/org/openqa/selenium:core',
+    '//java/client/src/org/openqa/selenium:selenium',
+  ],
 )
 
 java_library(name = 'logging',
@@ -21,5 +24,7 @@ java_library(name = 'logging',
     '//third_party/java/guava:guava',
     '//third_party/java/gson:gson',
   ],
-  visibility = ['PUBLIC'],
+  visibility = [
+    '//java/client/src/org/openqa/selenium:selenium'
+  ],
 )

java/client/src/org/openqa/selenium/net/BUCK

@@ -2,8 +2,11 @@ java_library(
   name = 'net',
   srcs = glob(['*.java']),
   deps = [
-    '//java/client/src/org/openqa/selenium:webdriver-api',
+   '//java/client/src/org/openqa/selenium:exceptions',
+   '//java/client/src/org/openqa/selenium:platform',
     '//third_party/java/guava:guava',
   ],
-  visibility = ['PUBLIC'],
+  visibility = [
+    '//java/client/src/org/openqa/selenium:selenium',
+  ]
 )

java/client/src/org/openqa/selenium/opera/BUCK

@@ -2,14 +2,8 @@ java_library(
   name = 'opera',
   srcs = glob(['*.java']),
   deps = [
-    '//java/client/src/org/openqa/selenium:codecs',
-    '//java/client/src/org/openqa/selenium:webdriver-api',
-    '//java/client/src/org/openqa/selenium/logging:logging',
-    '//java/client/src/org/openqa/selenium/net:net',
-    '//java/client/src/org/openqa/selenium/remote:api',
-    '//java/client/src/org/openqa/selenium/remote:capabilities',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium/remote:remote',
-    '//java/client/src/org/openqa/selenium/remote/service:service',
     '//third_party/java/gson:gson',
     '//third_party/java/guava:guava',
   ],

java/client/src/org/openqa/selenium/os/BUCK

@@ -2,20 +2,18 @@ java_library(
   name = 'os',
   srcs = glob(['*.java']),
   deps = [
-    '//java/client/src/org/openqa/selenium:webdriver-api',
+    '//java/client/src/org/openqa/selenium:beta',
+    '//java/client/src/org/openqa/selenium:exceptions',
+    '//java/client/src/org/openqa/selenium:platform',
     '//java/client/src/org/openqa/selenium/io:io',
     '//third_party/java/commons-exec:commons-exec',
     '//third_party/java/guava:guava',
     '//third_party/java/jna:jna',
   ],
   visibility = [
-    '//java/client/src/org/openqa/selenium/browserlaunchers/locators:locators',
-    '//java/client/src/org/openqa/selenium/firefox:firefox',
-    '//java/client/src/org/openqa/selenium/remote/service:service',
-    '//java/client/src/org/openqa/selenium/safari:safari',
+    '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/test/org/openqa/selenium:tests',
     '//java/client/test/org/openqa/selenium/testing/drivers:drivers',
-    '//java/server/src/org/openqa/selenium/server:server',
   ],
 )