Skip to content

Commit 702b3aa

Browse files
authored
Move java sources and tests into a single tree (#9710)
This emphasizes that all the java code is inter-related. We make use of bazel to avoid introducing Java 8 incompatible changes, and bazel's visibility rules to ensure that generated jars only contain what they should.
1 parent 6665715 commit 702b3aa

File tree

1,900 files changed

+2691
-2724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,900 files changed

+2691
-2724
lines changed

.github/workflows/java.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
- name: Run browser tests in Chrome
128128
uses: ./.github/actions/bazel-test
129129
with:
130-
query: attr(tags, chrome, tests(//java/client/...)) except attr(tags, remote, tests(//java/client/...))
130+
query: attr(tags, chrome, tests(//java/...)) except attr(tags, remote, tests(//java/...))
131131
env:
132132
DISPLAY: :99
133133

@@ -160,7 +160,7 @@ jobs:
160160
- name: Run browser tests in Firefox
161161
uses: ./.github/actions/bazel-test
162162
with:
163-
query: attr(tags, firefox, tests(//java/client/...)) except attr(tags, remote, tests(//java/client/...))
163+
query: attr(tags, firefox, tests(//java/...)) except attr(tags, remote, tests(//java/...))
164164
env:
165165
DISPLAY: :99
166166

@@ -196,7 +196,7 @@ jobs:
196196
- name: Run server tests
197197
uses: ./.github/actions/bazel-test
198198
with:
199-
query: tests(//java/server/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/server/...))
199+
query: tests(//java/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/...))
200200
env:
201201
DISPLAY: :99
202202

.idea/encodings.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/libcdp.xml

+13-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/maven.xml

+1-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/tools.xml

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/sonarSettings.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BUILD.bazel

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ filegroup(
1313

1414
alias(
1515
name = "grid",
16-
actual = "//java/server/src/org/openqa/selenium/grid:executable-grid",
16+
actual = "//java/src/org/openqa/selenium/grid:executable-grid",
1717
)
1818

1919
alias(
2020
name = "pinned-grid",
21-
actual = "//java/server/src/org/openqa/selenium/grid:pinned-grid",
21+
actual = "//java/src/org/openqa/selenium/grid:pinned-grid",
2222
)
2323

2424
alias(
2525
name = "debug-server",
26-
actual = "//java/client/test/org/openqa/selenium/environment:appserver",
26+
actual = "//java/test/org/openqa/selenium/environment:appserver",
2727
)
2828

2929
alias(
@@ -33,7 +33,7 @@ alias(
3333

3434
alias(
3535
name = "selenium-server-standalone",
36-
actual = "//java/server/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
36+
actual = "//java/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
3737
)
3838

3939
java_binary(
@@ -47,7 +47,7 @@ java_binary(
4747
jvm_flags = chrome_jvm_flags + firefox_jvm_flags,
4848
main_class = "org.openqa.selenium.grid.Bootstrap",
4949
runtime_deps = [
50-
"//java/server/src/org/openqa/selenium/grid",
50+
"//java/src/org/openqa/selenium/grid",
5151
artifact("org.slf4j:slf4j-jdk14"),
5252
],
5353
)

0 commit comments

Comments
 (0)