Skip to content

Commit

Permalink
Move java sources and tests into a single tree (SeleniumHQ#9710)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
shs96c authored Aug 3, 2021
1 parent 6665715 commit 702b3aa
Show file tree
Hide file tree
Showing 1,900 changed files with 2,691 additions and 2,724 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
- name: Run browser tests in Chrome
uses: ./.github/actions/bazel-test
with:
query: attr(tags, chrome, tests(//java/client/...)) except attr(tags, remote, tests(//java/client/...))
query: attr(tags, chrome, tests(//java/...)) except attr(tags, remote, tests(//java/...))
env:
DISPLAY: :99

Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
- name: Run browser tests in Firefox
uses: ./.github/actions/bazel-test
with:
query: attr(tags, firefox, tests(//java/client/...)) except attr(tags, remote, tests(//java/client/...))
query: attr(tags, firefox, tests(//java/...)) except attr(tags, remote, tests(//java/...))
env:
DISPLAY: :99

Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
- name: Run server tests
uses: ./.github/actions/bazel-test
with:
query: tests(//java/server/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/server/...))
query: tests(//java/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/...))
env:
DISPLAY: :99

Expand Down
4 changes: 2 additions & 2 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions .idea/libraries/libcdp.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions .idea/libraries/maven.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/libraries/tools.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/sonarSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ filegroup(

alias(
name = "grid",
actual = "//java/server/src/org/openqa/selenium/grid:executable-grid",
actual = "//java/src/org/openqa/selenium/grid:executable-grid",
)

alias(
name = "pinned-grid",
actual = "//java/server/src/org/openqa/selenium/grid:pinned-grid",
actual = "//java/src/org/openqa/selenium/grid:pinned-grid",
)

alias(
name = "debug-server",
actual = "//java/client/test/org/openqa/selenium/environment:appserver",
actual = "//java/test/org/openqa/selenium/environment:appserver",
)

alias(
Expand All @@ -33,7 +33,7 @@ alias(

alias(
name = "selenium-server-standalone",
actual = "//java/server/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
actual = "//java/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
)

java_binary(
Expand All @@ -47,7 +47,7 @@ java_binary(
jvm_flags = chrome_jvm_flags + firefox_jvm_flags,
main_class = "org.openqa.selenium.grid.Bootstrap",
runtime_deps = [
"//java/server/src/org/openqa/selenium/grid",
"//java/src/org/openqa/selenium/grid",
artifact("org.slf4j:slf4j-jdk14"),
],
)
Expand Down
Loading

0 comments on commit 702b3aa

Please sign in to comment.