Skip to content

Commit

Permalink
[bazel] Attempt to make sure maven artifacts include each library once
Browse files Browse the repository at this point in the history
  • Loading branch information
@shs96c
shs96c committed Aug 3, 2019
1 parent e54e2d9 commit 979ec6b
Show file tree
Hide file tree
Showing 48 changed files with 51 additions and 115 deletions.
3 changes: 3 additions & 0 deletions java/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,17 @@ maven_jars(
targets = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/chrome",
"//java/client/src/org/openqa/selenium/devtools",
"//java/client/src/org/openqa/selenium/edge:edgeium",
"//java/client/src/org/openqa/selenium/edge/edgehtml",
"//java/client/src/org/openqa/selenium/firefox",
"//java/client/src/org/openqa/selenium/firefox/xpi",
"//java/client/src/org/openqa/selenium/ie",
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/opera",
"//java/client/src/org/openqa/selenium/safari",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/remote/http",
"//java/server/src/org/openqa/selenium/grid",
"//java/server/src/com/thoughtworks/selenium/webdriven",
],
Expand Down
2 changes: 1 addition & 1 deletion java/client/src/com/thoughtworks/selenium/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ java_library(
":api",
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/edge",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote",
"//third_party/java/guava",
"//third_party/java/junit",
"//third_party/java/testng",
Expand Down
3 changes: 1 addition & 2 deletions java/client/src/com/thoughtworks/selenium/webdriven/commands/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ java_library(
deps = [
"//java/client/src/com/thoughtworks/selenium",
"//java/client/src/com/thoughtworks/selenium/webdriven:emulation-api",
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/io",
"//java/client/src/org/openqa/selenium/remote",
"//third_party/java/guava",
],
)
13 changes: 6 additions & 7 deletions java/client/src/org/openqa/selenium/devtools/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
load("//java:version.bzl", "SE_VERSION")

java_library(
name = "devtools",
srcs = glob(["**/*.java"]),
tags = [
"maven_coordinates=org.seleniumhq.selenium:selenium-devtools:%s" % SE_VERSION,
],
visibility = [
"//java/client/src/org/openqa/selenium/chrome:__pkg__",
"//java/client/src/org/openqa/selenium/chromium:__pkg__",
"//java/client/src/org/openqa/selenium/edge:__pkg__",
"//java/client/src/org/openqa/selenium/remote:__pkg__",
"//java/client/src/org/openqa/selenium/support/devtools:__pkg__",
"//java/client/test/org/openqa/selenium/devtools:__pkg__",
"//java/client/test/org/openqa/selenium/support/devtools:__pkg__",
"//visibility:public",
],
deps = [
"//java/client/src/org/openqa/selenium:core",
Expand Down
5 changes: 0 additions & 5 deletions java/client/src/org/openqa/selenium/firefox/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,8 @@ java_library(
],
visibility = ["//visibility:public"],
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/io",
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/os",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/remote/http",
"//third_party/java/guava",
"//third_party/java/service",
],
Expand Down
3 changes: 0 additions & 3 deletions java/client/src/org/openqa/selenium/firefox/xpi/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ java_library(
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/firefox",
"//java/client/src/org/openqa/selenium/io",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/os",
"//java/client/src/org/openqa/selenium/remote",
"//third_party/java/guava",
"//third_party/java/service",
Expand Down
7 changes: 0 additions & 7 deletions java/client/src/org/openqa/selenium/io/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,9 @@ java_library(
name = "io",
srcs = glob(["*.java"]),
visibility = [
"//java/client/src/com/thoughtworks/selenium/webdriven/commands:__pkg__",
"//java/client/src/org/openqa/selenium/firefox:__pkg__",
"//java/client/src/org/openqa/selenium/firefox/xpi:__pkg__",
"//java/client/src/org/openqa/selenium/os:__pkg__",
"//java/client/src/org/openqa/selenium/remote:__pkg__",
"//java/client/test/org/openqa/selenium/environment:__pkg__",
"//java/client/test/org/openqa/selenium/firefox:__pkg__",
"//java/client/test/org/openqa/selenium/io:__pkg__",
"//java/server/src/org/openqa/selenium/grid/session:__pkg__",
"//java/server/src/org/openqa/selenium/remote/server:__pkg__",
],
deps = [
"//java/client/src/org/openqa/selenium:core",
Expand Down
10 changes: 6 additions & 4 deletions java/client/src/org/openqa/selenium/json/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
load("//java:version.bzl", "SE_VERSION")

java_library(
name = "json",
srcs = glob(["*.java"]),
tags = [
"maven_coordinates=org.seleniumhq.selenium:selenium-json:%s" % SE_VERSION,
],
visibility = [
"//java/client/src/org/openqa:__subpackages__",
"//java/client/test/org/openqa:__subpackages__",
"//java/server/src/org/openqa:__subpackages__",
"//java/server/test/org/openqa:__subpackages__",
"//visibility:public",
],
deps = [
"//java/client/src/org/openqa/selenium:core",
Expand Down
12 changes: 0 additions & 12 deletions java/client/src/org/openqa/selenium/net/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,8 @@ java_library(
name = "net",
srcs = glob(["*.java"]),
visibility = [
"//java/client/src/com/thoughtworks/selenium:__pkg__",
"//java/client/src/org/openqa/selenium/firefox:__pkg__",
"//java/client/src/org/openqa/selenium/firefox/xpi:__pkg__",
"//java/client/src/org/openqa/selenium/remote:__pkg__",
"//java/client/src/org/openqa/selenium/safari:__pkg__",
"//java/client/test/org/openqa/selenium:__pkg__",
"//java/client/test/org/openqa/selenium/environment:__pkg__",
"//java/client/test/org/openqa/selenium/net:__pkg__",
"//java/client/test/org/openqa/selenium/remote/internal:__pkg__",
"//java/client/test/org/openqa/selenium/testing/drivers:__pkg__",
"//java/server/src/org/openqa/selenium/events/zeromq:__pkg__",
"//java/server/src/org/openqa/selenium/grid:__subpackages__",
"//java/server/test/com/thoughtworks/selenium:__subpackages__",
"//java/server/test/org/openqa/selenium/grid:__subpackages__",
],
deps = [
"//java/client/src/org/openqa/selenium:core",
Expand Down
7 changes: 7 additions & 0 deletions java/client/src/org/openqa/selenium/remote/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,20 @@ java_library(
":http-session-id",
":remote-lib",
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/io",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/os",
"//java/client/src/org/openqa/selenium/remote/http",
"//java/client/src/org/openqa/selenium/remote/tracing",
],
deps = [
":api",
":capabilities",
":remote-lib",
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/io",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/os",
"//java/client/src/org/openqa/selenium/remote/http/okhttp",
"//third_party/java/bytebuddy:byte-buddy",
"//third_party/java/guava",
Expand Down
19 changes: 6 additions & 13 deletions java/client/src/org/openqa/selenium/remote/http/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
load("//java:version.bzl", "SE_VERSION")

java_library(
name = "http",
srcs = glob(["*.java"]),
tags = [
"maven_coordinates=org.seleniumhq.selenium:selenium-http:%s" % SE_VERSION,
],
visibility = [
"//java/client/src/org/openqa/selenium/chrome:__pkg__",
"//java/client/src/org/openqa/selenium/devtools:__pkg__",
"//java/client/src/org/openqa/selenium/firefox:__pkg__",
"//java/client/src/org/openqa/selenium/remote:__subpackages__",
"//java/client/src/org/openqa/selenium/safari:__pkg__",
"//java/client/test/org/openqa/selenium/environment:__pkg__",
"//java/client/test/org/openqa/selenium/net:__pkg__",
"//java/client/test/org/openqa/selenium/remote:__subpackages__",
"//java/client/test/org/openqa/selenium/testing/drivers:__pkg__",
"//java/server/src/org/openqa/selenium/grid:__subpackages__",
"//java/server/src/org/openqa/selenium/netty:__subpackages__",
"//java/server/test/com/thoughtworks/selenium:__subpackages__",
"//java/server/test/org/openqa/selenium/grid:__subpackages__",
"//visibility:public",
],
deps = [
"//java/client/src/org/openqa/selenium:core",
Expand Down
3 changes: 1 addition & 2 deletions java/client/src/org/openqa/selenium/remote/tracing/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ java_library(
name = "tracing",
srcs = glob(["*.java"]),
visibility = [
"//java/client/src/org/openqa/selenium/remote:__pkg__",
"//java/client/test/org/openqa/selenium/remote/tracing:__subpackages__",
"//java/server/src/org/openqa/selenium/grid:__subpackages__",
"//java/server/test/org/openqa/selenium/grid:__subpackages__",
],
exports = [
# Exposed by tracing APIs
Expand Down
2 changes: 0 additions & 2 deletions java/client/src/org/openqa/selenium/safari/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/remote/http",
"//third_party/java/guava",
"//third_party/java/service",
],
Expand Down
1 change: 0 additions & 1 deletion java/client/src/org/openqa/selenium/support/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ java_library(
"pagefactory/*.java",
"pagefactory/internal/*.java",
]),
visibility = ["//visibility:public"],
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/support/ui:clock",
Expand Down
2 changes: 0 additions & 2 deletions java/client/test/org/openqa/selenium/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ java_selenium_test_suite(
),
deps = [
":helpers",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/support",
"//java/client/test/org/openqa/selenium/build",
Expand Down Expand Up @@ -99,7 +98,6 @@ java_library(
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/ie",
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/support",
"//java/client/src/org/openqa/selenium/support/ui:wait",
Expand Down
2 changes: 0 additions & 2 deletions java/client/test/org/openqa/selenium/environment/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ java_library(
],
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/io",
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/remote/http",
"//java/client/test/org/openqa/selenium/build",
Expand Down
3 changes: 1 addition & 2 deletions java/client/test/org/openqa/selenium/io/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ java_test_suite(
size = "small",
srcs = glob(["*.java"]),
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/io",
"//java/client/src/org/openqa/selenium/remote",
"//third_party/java/assertj",
"//third_party/java/junit",
],
Expand Down
2 changes: 1 addition & 1 deletion java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ java_library(
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/remote/http",
"//third_party/java/assertj",
"//third_party/java/guava",
Expand Down
2 changes: 0 additions & 2 deletions java/client/test/org/openqa/selenium/testing/drivers/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ java_library(
"//java/client/src/org/openqa/selenium/edge",
"//java/client/src/org/openqa/selenium/firefox",
"//java/client/src/org/openqa/selenium/ie",
"//java/client/src/org/openqa/selenium/os",
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote/http",
"//java/client/src/org/openqa/selenium/opera",
"//java/client/src/org/openqa/selenium/remote",
Expand Down
6 changes: 2 additions & 4 deletions java/server/src/org/openqa/selenium/events/zeromq/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ java_library(
name = "zeromq",
srcs = glob(["*.java"]),
visibility = [
"//java/server/src/org/openqa/selenium/grid:__pkg__",
"//java/server/src/org/openqa/selenium/grid/commands:__pkg__",
"//java/server/src/org/openqa/selenium/grid/server:__pkg__",
"//java/server/src/org/openqa/selenium/grid:__subpackages__",
"//java/server/test/org/openqa/selenium/grid/router:__pkg__",
],
deps = [
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote",
"//java/server/src/org/openqa/selenium/events",
"//java/server/src/org/openqa/selenium/grid/config",
"//third_party/java/guava",
Expand Down
5 changes: 4 additions & 1 deletion java/server/src/org/openqa/selenium/grid/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,8 @@ java_binary(
main_class = "org.openqa.selenium.grid.Main",
runtime_deps = [
":grid",
]
],
visibility = [
"//:__pkg__",
],
)
4 changes: 1 addition & 3 deletions java/server/src/org/openqa/selenium/grid/commands/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ java_library(
],
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote/http",
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/client/src/org/openqa/selenium/remote",
"//java/server/src/org/openqa/selenium/cli",
"//java/server/src/org/openqa/selenium/events",
"//java/server/src/org/openqa/selenium/grid/config",
Expand Down
3 changes: 1 addition & 2 deletions java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ java_library(
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/remote/http",
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/client/src/org/openqa/selenium/remote",
"//java/server/src/org/openqa/selenium/grid/data",
"//java/server/src/org/openqa/selenium/grid/node",
"//java/server/src/org/openqa/selenium/grid/node/remote",
Expand Down
4 changes: 1 addition & 3 deletions java/server/src/org/openqa/selenium/grid/distributor/config/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ java_library(
"//java/server/src/org/openqa/selenium/grid:__subpackages__",
],
deps = [
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote/http",
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/client/src/org/openqa/selenium/remote",
"//java/server/src/org/openqa/selenium/grid/config",
"//java/server/src/org/openqa/selenium/grid/distributor",
"//java/server/src/org/openqa/selenium/grid/distributor/remote",
Expand Down
2 changes: 1 addition & 1 deletion java/server/src/org/openqa/selenium/grid/distributor/httpd/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//java/server/src/org/openqa/selenium/grid:__pkg__",
],
deps = [
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/client/src/org/openqa/selenium/remote",
"//java/server/src/org/openqa/selenium/cli",
"//java/server/src/org/openqa/selenium/events",
"//java/server/src/org/openqa/selenium/grid/config",
Expand Down
1 change: 0 additions & 1 deletion java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ java_library(
deps = [
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/server/src/org/openqa/selenium/concurrent",
"//java/server/src/org/openqa/selenium/events",
"//java/server/src/org/openqa/selenium/grid/component",
Expand Down
2 changes: 1 addition & 1 deletion java/server/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ java_library(
deps = [
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/client/src/org/openqa/selenium/remote",
"//java/server/src/org/openqa/selenium/grid/data",
"//java/server/src/org/openqa/selenium/grid/distributor",
"//java/server/src/org/openqa/selenium/grid/node",
Expand Down
1 change: 0 additions & 1 deletion java/server/src/org/openqa/selenium/grid/docker/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ java_library(
],
deps = [
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/net",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/support",
"//java/server/src/org/openqa/selenium/docker",
Expand Down
2 changes: 1 addition & 1 deletion java/server/src/org/openqa/selenium/grid/log/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ java_library(
],
deps = [
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/client/src/org/openqa/selenium/remote",
"//java/server/src/org/openqa/selenium/grid/config",
],
)
2 changes: 0 additions & 2 deletions java/server/src/org/openqa/selenium/grid/node/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ java_library(
"//java/client/src/org/openqa/selenium:core",
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/remote/http",
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/server/src/org/openqa/selenium/grid/component",
"//java/server/src/org/openqa/selenium/grid/data",
"//java/server/src/org/openqa/selenium/grid/web",
Expand Down
2 changes: 1 addition & 1 deletion java/server/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//java/server/src/org/openqa/selenium/grid:__pkg__",
],
deps = [
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/client/src/org/openqa/selenium/remote",
"//java/server/src/org/openqa/selenium/cli",
"//java/server/src/org/openqa/selenium/concurrent",
"//java/server/src/org/openqa/selenium/events",
Expand Down
1 change: 0 additions & 1 deletion java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ java_library(
deps = [
"//java/client/src/org/openqa/selenium/json",
"//java/client/src/org/openqa/selenium/remote",
"//java/client/src/org/openqa/selenium/remote/tracing",
"//java/server/src/org/openqa/selenium/concurrent",
"//java/server/src/org/openqa/selenium/events",
"//java/server/src/org/openqa/selenium/grid/component",
Expand Down

0 comments on commit 979ec6b

Please sign in to comment.