Skip to content

Commit 1bccade

Browse files
committed
Introduce a leg-rc maven package
1 parent 3735661 commit 1bccade

File tree

13 files changed

+42
-27
lines changed
  • java
    • client
      • src/com/thoughtworks/selenium
      • test/com/thoughtworks/selenium/webdriven
    • server
      • src
        • com/thoughtworks/selenium
        • org/openqa/selenium/server
      • test
        • com/thoughtworks/selenium/webdriven
        • org/openqa/grid

13 files changed

+42
-27
lines changed

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ require 'rake-tasks/buck'
105105

106106
# Java targets required for release. These should all have the correct maven_coords set.
107107
JAVA_RELEASE_TARGETS = [
108+
'//java/client/src/com/thoughtworks/selenium:leg-rc',
108109
'//java/client/src/org/openqa/selenium:core',
109110
'//java/client/src/org/openqa/selenium:selenium',
110111
'//java/client/src/org/openqa/selenium/chrome:chrome',
@@ -114,6 +115,7 @@ JAVA_RELEASE_TARGETS = [
114115
'//java/client/src/org/openqa/selenium/opera:opera',
115116
'//java/client/src/org/openqa/selenium/remote:remote',
116117
'//java/client/src/org/openqa/selenium/safari:safari',
118+
'//java/server/src/com/thoughtworks/selenium:leg-rc',
117119
]
118120

119121

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1+
include_defs('//SELENIUM_VERSION')
2+
13
java_library(name = 'api',
24
srcs = [
35
'CommandProcessor.java',
46
'Selenium.java',
57
'SeleniumException.java',
68
'Wait.java',
79
],
8-
visibility = ['PUBLIC'],
10+
visibility = [
11+
'//java/client/src/com/thoughtworks/selenium/condition:condition',
12+
]
913
)
1014

1115
java_library(name = 'selenium',
@@ -23,21 +27,28 @@ java_library(name = 'selenium',
2327
],
2428
exported_deps = [
2529
':api',
26-
'//java/client/src/com/thoughtworks/selenium/condition:condition',
2730
],
2831
deps = [
2932
'//java/client/src/org/openqa/selenium:selenium',
3033
'//third_party/java/guava:guava',
3134
'//third_party/java/junit:junit',
3235
'//third_party/java/testng:testng',
3336
],
34-
visibility = ['PUBLIC'],
37+
visibility = [
38+
'//java/client/src/com/thoughtworks/selenium/...',
39+
'//java/server/src/com/thoughtworks/selenium:leg-rc',
40+
]
3541
)
3642

37-
38-
java_binary(name = "legacy-selenium-client",
39-
deps = [
43+
java_library(name = "leg-rc",
44+
maven_coords = 'org.seleniumhq.selenium:leg-rc:' + SE_VERSION,
45+
exported_deps = [
46+
':api',
4047
':selenium',
48+
'//java/client/src/com/thoughtworks/selenium/condition:condition',
4149
'//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
4250
],
51+
visibility = [
52+
'PUBLIC',
53+
]
4354
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ java_library(name = 'condition',
66
'//third_party/java/junit:junit',
77
],
88
visibility = [
9-
'//java/client/src/com/thoughtworks/selenium:selenium',
9+
'//java/client/src/com/thoughtworks/selenium:leg-rc',
1010
],
1111
)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ java_library(
2323
'//third_party/java/guava:guava',
2424
],
2525
visibility = [
26+
'//java/server/src/com/thoughtworks/selenium:leg-rc',
2627
],
2728
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ java_library(name = 'emulation-api',
5858
'Windows.java',
5959
],
6060
deps = [
61-
'//java/client/src/com/thoughtworks/selenium:api',
61+
'//java/client/src/com/thoughtworks/selenium:selenium',
6262
'//java/client/src/org/openqa/selenium:selenium',
6363
'//third_party/java/guava:guava',
6464
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
java_library(name = 'commands',
33
srcs = glob(['*.java']),
44
deps = [
5-
'//java/client/src/com/thoughtworks/selenium:api',
5+
'//java/client/src/com/thoughtworks/selenium:selenium',
66
'//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
77
'//java/client/src/org/openqa/selenium:selenium',
88
'//third_party/java/guava:guava',

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ java_test(name = 'LargeTests',
55
'WebDriverBackedSeleniumLargeTest.java',
66
],
77
deps = [
8-
'//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
9-
'//java/client/src/com/thoughtworks/selenium:selenium',
8+
'//java/client/src/com/thoughtworks/selenium:leg-rc',
109
'//java/client/src/org/openqa/selenium:selenium',
1110
'//java/client/test/org/openqa/selenium/testing:test-base',
1211
'//third_party/java/guava:guava',
@@ -30,10 +29,7 @@ java_test(name = 'small-tests',
3029
java_library(name = 'tests',
3130
srcs = glob(['*Test.java'], excludes = ['ScriptMutatorTest.java','WebDriverBackedSeleniumLargeTest.java']),
3231
deps = [
33-
'//java/client/src/com/thoughtworks/selenium:selenium',
34-
'//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api',
35-
'//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
36-
'//java/client/src/com/thoughtworks/selenium:api',
32+
'//java/client/src/com/thoughtworks/selenium:leg-rc',
3733
'//java/client/src/org/openqa/selenium:selenium',
3834
'//java/client/test/org/openqa/selenium:helpers',
3935
'//third_party/java/guava:guava',
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
include_defs('//SELENIUM_VERSION')
2+
3+
java_library(
4+
name = 'leg-rc',
5+
maven_coords = 'org.seleniumhq.selenium:selenium-java:' + SE_VERSION,
6+
deps = [
7+
'//java/client/src/com/thoughtworks/selenium:selenium',
8+
'//java/client/src/com/thoughtworks/selenium/corerunner:corerunner',
9+
'//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet',
10+
],
11+
)
12+

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ java_library(name = 'rc-emulation-servlet',
44
'WebDriverBackedSeleniumServlet.java',
55
],
66
deps = [
7-
'//java/client/src/com/thoughtworks/selenium:selenium',
8-
'//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
7+
'//java/client/src/com/thoughtworks/selenium:leg-rc',
98
'//java/client/src/org/openqa/selenium/remote:remote',
109
'//java/server/src/org/openqa/selenium/remote/server:server',
1110
'//java/server/src/org/openqa/selenium/remote/server:sessions',
@@ -15,6 +14,7 @@ java_library(name = 'rc-emulation-servlet',
1514
'//third_party/java/servlet:servlet-api',
1615
],
1716
visibility = [
17+
'//java/server/src/com/thoughtworks/selenium:leg-rc',
1818
'//java/server/src/org/openqa/selenium/remote/server:standalone-server',
1919
'//java/server/test/com/thoughtworks/selenium/webdriven:webdriven',
2020
],

java/server/src/org/openqa/selenium/server/BUCK

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)