Introduce a leg-rc maven package

skestle · May 12, 2016 · 1bccade · 1bccade
1 parent 3735661
commit 1bccade
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 27 deletions.
diff --git a/Rakefile b/Rakefile
@@ -105,6 +105,7 @@ require 'rake-tasks/buck'
 
 # Java targets required for release. These should all have the correct maven_coords set.
 JAVA_RELEASE_TARGETS = [
+  '//java/client/src/com/thoughtworks/selenium:leg-rc',
   '//java/client/src/org/openqa/selenium:core',
   '//java/client/src/org/openqa/selenium:selenium',
   '//java/client/src/org/openqa/selenium/chrome:chrome',
@@ -114,6 +115,7 @@ JAVA_RELEASE_TARGETS = [
   '//java/client/src/org/openqa/selenium/opera:opera',
   '//java/client/src/org/openqa/selenium/remote:remote',
   '//java/client/src/org/openqa/selenium/safari:safari',
+  '//java/server/src/com/thoughtworks/selenium:leg-rc',
 ]
 
 

diff --git a/java/client/src/com/thoughtworks/selenium/BUCK b/java/client/src/com/thoughtworks/selenium/BUCK
@@ -1,11 +1,15 @@
+include_defs('//SELENIUM_VERSION')
+
 java_library(name = 'api',
   srcs = [
     'CommandProcessor.java',
     'Selenium.java',
     'SeleniumException.java',
     'Wait.java',
   ],
-  visibility = ['PUBLIC'],
+  visibility = [
+    '//java/client/src/com/thoughtworks/selenium/condition:condition',
+  ]
 )
 
 java_library(name = 'selenium',
@@ -23,21 +27,28 @@ java_library(name = 'selenium',
   ],
   exported_deps = [
     ':api',
-    '//java/client/src/com/thoughtworks/selenium/condition:condition',
   ],
   deps = [
     '//java/client/src/org/openqa/selenium:selenium',
     '//third_party/java/guava:guava',
     '//third_party/java/junit:junit',
     '//third_party/java/testng:testng',
   ],
-  visibility = ['PUBLIC'],
+  visibility = [
+    '//java/client/src/com/thoughtworks/selenium/...',
+    '//java/server/src/com/thoughtworks/selenium:leg-rc',
+  ]
 )
 
-
-java_binary(name = "legacy-selenium-client",
-  deps = [
+java_library(name = "leg-rc",
+  maven_coords = 'org.seleniumhq.selenium:leg-rc:' + SE_VERSION,
+  exported_deps = [
+    ':api',
     ':selenium',
+    '//java/client/src/com/thoughtworks/selenium/condition:condition',
     '//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
   ],
+  visibility = [
+    'PUBLIC',
+  ]
 )
diff --git a/java/client/src/com/thoughtworks/selenium/condition/BUCK b/java/client/src/com/thoughtworks/selenium/condition/BUCK
@@ -6,6 +6,6 @@ java_library(name = 'condition',
     '//third_party/java/junit:junit',
   ],
   visibility = [
-    '//java/client/src/com/thoughtworks/selenium:selenium',
+    '//java/client/src/com/thoughtworks/selenium:leg-rc',
   ],
 )
diff --git a/java/client/src/com/thoughtworks/selenium/corerunner/BUCK b/java/client/src/com/thoughtworks/selenium/corerunner/BUCK
@@ -23,5 +23,6 @@ java_library(
     '//third_party/java/guava:guava',
   ],
   visibility = [
+    '//java/server/src/com/thoughtworks/selenium:leg-rc',
   ],
 )
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/BUCK b/java/client/src/com/thoughtworks/selenium/webdriven/BUCK
@@ -58,7 +58,7 @@ java_library(name = 'emulation-api',
     'Windows.java',
   ],
   deps = [
-    '//java/client/src/com/thoughtworks/selenium:api',
+    '//java/client/src/com/thoughtworks/selenium:selenium',
     '//java/client/src/org/openqa/selenium:selenium',
     '//third_party/java/guava:guava',
   ],

diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK b/java/client/src/com/thoughtworks/selenium/webdriven/commands/BUCK
@@ -2,7 +2,7 @@
 java_library(name = 'commands',
   srcs = glob(['*.java']),
   deps = [
-    '//java/client/src/com/thoughtworks/selenium:api',
+    '//java/client/src/com/thoughtworks/selenium:selenium',
     '//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
     '//java/client/src/org/openqa/selenium:selenium',
     '//third_party/java/guava:guava',

diff --git a/java/client/test/com/thoughtworks/selenium/webdriven/BUCK b/java/client/test/com/thoughtworks/selenium/webdriven/BUCK
@@ -5,8 +5,7 @@ java_test(name = 'LargeTests',
     'WebDriverBackedSeleniumLargeTest.java',
   ],
   deps = [
-    '//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
-    '//java/client/src/com/thoughtworks/selenium:selenium',
+    '//java/client/src/com/thoughtworks/selenium:leg-rc',
     '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/test/org/openqa/selenium/testing:test-base',
     '//third_party/java/guava:guava',
@@ -30,10 +29,7 @@ java_test(name = 'small-tests',
 java_library(name = 'tests',
   srcs = glob(['*Test.java'], excludes = ['ScriptMutatorTest.java','WebDriverBackedSeleniumLargeTest.java']),
   deps = [
-    '//java/client/src/com/thoughtworks/selenium:selenium',
-    '//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
-    '//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
-    '//java/client/src/com/thoughtworks/selenium:api',
+    '//java/client/src/com/thoughtworks/selenium:leg-rc',
     '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/test/org/openqa/selenium:helpers',
     '//third_party/java/guava:guava',

diff --git a/java/server/src/com/thoughtworks/selenium/BUCK b/java/server/src/com/thoughtworks/selenium/BUCK
@@ -0,0 +1,12 @@
+include_defs('//SELENIUM_VERSION')
+
+java_library(
+  name = 'leg-rc',
+  maven_coords = 'org.seleniumhq.selenium:selenium-java:' + SE_VERSION,
+  deps = [
+    '//java/client/src/com/thoughtworks/selenium:selenium',
+    '//java/client/src/com/thoughtworks/selenium/corerunner:corerunner',
+    '//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet',
+  ],
+)
+
diff --git a/java/server/src/com/thoughtworks/selenium/webdriven/BUCK b/java/server/src/com/thoughtworks/selenium/webdriven/BUCK
@@ -4,8 +4,7 @@ java_library(name = 'rc-emulation-servlet',
     'WebDriverBackedSeleniumServlet.java',
   ],
   deps = [
-    '//java/client/src/com/thoughtworks/selenium:selenium',
-    '//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
+    '//java/client/src/com/thoughtworks/selenium:leg-rc',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/server/src/org/openqa/selenium/remote/server:server',
     '//java/server/src/org/openqa/selenium/remote/server:sessions',
@@ -15,6 +14,7 @@ java_library(name = 'rc-emulation-servlet',
     '//third_party/java/servlet:servlet-api',
   ],
   visibility = [
+    '//java/server/src/com/thoughtworks/selenium:leg-rc',
     '//java/server/src/org/openqa/selenium/remote/server:standalone-server',
     '//java/server/test/com/thoughtworks/selenium/webdriven:webdriven',
   ],

diff --git a/java/server/src/org/openqa/selenium/server/BUCK b/java/server/src/org/openqa/selenium/server/BUCK
diff --git a/java/server/test/com/thoughtworks/selenium/webdriven/BUCK b/java/server/test/com/thoughtworks/selenium/webdriven/BUCK
@@ -2,7 +2,7 @@
 java_test(name = 'webdriven',
   srcs = glob(['*.java']),
   deps = [
-    '//java/client/src/com/thoughtworks/selenium:selenium',
+    '//java/client/src/com/thoughtworks/selenium:leg-rc',
     '//java/client/src/org/openqa/selenium/firefox:firefox',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/test/org/openqa/selenium:helpers',

diff --git a/java/server/test/org/openqa/grid/BUCK b/java/server/test/org/openqa/grid/BUCK
@@ -23,7 +23,7 @@ java_library(name = 'test',
     'plugin/**/*.java',
   ], excludes = SUITES),
   deps = [
-    '//java/client/src/com/thoughtworks/selenium:selenium',
+    '//java/client/src/com/thoughtworks/selenium:leg-rc',
     '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/server/src/org/openqa/grid:grid',

diff --git a/java/server/test/org/openqa/grid/e2e/BUCK b/java/server/test/org/openqa/grid/e2e/BUCK
@@ -11,7 +11,7 @@ java_test(name = 'e2e',
 java_library(name = 'tests',
   srcs = glob(['**/*.java'], excludes = SUITES),
   deps = [
-    '//java/client/src/com/thoughtworks/selenium:selenium',
+    '//java/client/src/com/thoughtworks/selenium:leg-rc',
     '//java/client/src/org/openqa/selenium/chrome:chrome',
     '//java/client/src/org/openqa/selenium/firefox:firefox',
     '//java/client/src/org/openqa/selenium/remote:remote',