Fix the build after recent changes

SeleniumHQ · Jun 3, 2019 · fc427c0 · fc427c0
1 parent a7887c9
commit fc427c0
Show file tree

Hide file tree

Showing 20 changed files with 93 additions and 74 deletions.
diff --git a/java/client/src/org/openqa/selenium/chrome/BUILD.bazel b/java/client/src/org/openqa/selenium/chrome/BUILD.bazel
@@ -4,6 +4,7 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
+        "//java/client/src/org/openqa/selenium/chromium",
         "//java/client/src/org/openqa/selenium/devtools",
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",

diff --git a/java/client/src/org/openqa/selenium/chromium/BUILD.bazel b/java/client/src/org/openqa/selenium/chromium/BUILD.bazel
@@ -0,0 +1,14 @@
+java_library(
+    name = "chromium",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        "//java/client/src/org/openqa/selenium/devtools",
+        "//java/client/src/org/openqa/selenium/json",
+        "//java/client/src/org/openqa/selenium/remote",
+        "//third_party/java/guava",
+        "//third_party/java/service",
+    ],
+)
diff --git a/java/client/src/org/openqa/selenium/devtools/BUILD.bazel b/java/client/src/org/openqa/selenium/devtools/BUILD.bazel
@@ -3,6 +3,8 @@ java_library(
     srcs = glob(["**/*.java"]),
     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__",
     ],
     deps = [

diff --git a/java/client/src/org/openqa/selenium/edge/BUILD.bazel b/java/client/src/org/openqa/selenium/edge/BUILD.bazel
@@ -4,6 +4,7 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
+        "//java/client/src/org/openqa/selenium/chromium",
         "//java/client/src/org/openqa/selenium/remote",
         "//third_party/java/guava",
         "//third_party/java/service",

diff --git a/java/client/src/org/openqa/selenium/remote/BUILD.bazel b/java/client/src/org/openqa/selenium/remote/BUILD.bazel
@@ -90,6 +90,7 @@ java_library(
         "HandshakeResponse.java",
         "HttpCommandExecutor.java",
         "InitialHandshakeResponse.java",
+        "JsonToWebElementConverter.java",
         "JsonWireProtocolResponse.java",
         "LocalFileDetector.java",
         "NewSessionPayload.java",

diff --git a/java/server/src/org/openqa/selenium/cli/BUILD.bazel b/java/server/src/org/openqa/selenium/cli/BUILD.bazel
@@ -1,10 +1,10 @@
 java_library(
     name = "cli",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-    ]
-)
+)
diff --git a/java/server/src/org/openqa/selenium/docker/BUILD.bazel b/java/server/src/org/openqa/selenium/docker/BUILD.bazel
@@ -1,12 +1,12 @@
 java_library(
     name = "docker",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid/docker:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid/docker:__pkg__",
-    ]
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/BUILD.bazel
@@ -1,10 +1,7 @@
 java_binary(
     name = "grid",
-    main_class = "org.openqa.selenium.grid.Main",
     srcs = glob(["*.java"]),
-    deps = [
-        "//java/server/src/org/openqa/selenium/cli",
-    ],
+    main_class = "org.openqa.selenium.grid.Main",
     runtime_deps = [
         "//java/client/src/org/openqa/selenium/chrome",
         "//java/client/src/org/openqa/selenium/edge",
@@ -18,5 +15,8 @@ java_binary(
         "//java/server/src/org/openqa/selenium/grid/node/httpd",
         "//java/server/src/org/openqa/selenium/grid/router/httpd",
         "//java/server/src/org/openqa/selenium/grid/sessionmap/httpd",
-    ]
+    ],
+    deps = [
+        "//java/server/src/org/openqa/selenium/cli",
+    ],
 )
diff --git a/java/server/src/org/openqa/selenium/grid/commands/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/commands/BUILD.bazel
@@ -1,6 +1,12 @@
 java_library(
     name = "commands",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__pkg__",
+    ],
+    runtime_deps = [
+        "//java/server/src/org/openqa/selenium/events/local",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/net",
@@ -25,10 +31,4 @@ java_library(
         "//third_party/java/guava",
         "//third_party/java/service",
     ],
-    runtime_deps = [
-        "//java/server/src/org/openqa/selenium/events/local",
-    ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__pkg__",
-    ],
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/distributor/config/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/config/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "config",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/net",
         "//java/client/src/org/openqa/selenium/remote/http",
@@ -10,7 +13,4 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/distributor/remote",
         "//third_party/java/beust:jcommander",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-    ]
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/distributor/httpd/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/httpd/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "httpd",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote/tracing",
         "//java/server/src/org/openqa/selenium/cli",
@@ -17,7 +20,4 @@ java_library(
         "//third_party/java/guava",
         "//third_party/java/service",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__pkg__",
-    ]
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/docker/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/docker/BUILD.bazel
@@ -1,6 +1,10 @@
 java_library(
     name = "docker",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid/commands:__pkg__",
+        "//java/server/src/org/openqa/selenium/grid/node/httpd:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/net",
@@ -14,8 +18,4 @@ java_library(
         "//third_party/java/beust:jcommander",
         "//third_party/java/guava",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid/commands:__pkg__",
-        "//java/server/src/org/openqa/selenium/grid/node/httpd:__pkg__",
-    ]
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/log/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/log/BUILD.bazel
@@ -1,12 +1,12 @@
 java_library(
     name = "log",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote/tracing",
         "//java/server/src/org/openqa/selenium/grid/config",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-    ]
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/node/config/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/node/config/BUILD.bazel
@@ -1,14 +1,14 @@
 java_library(
     name = "config",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote",
         "//java/server/src/org/openqa/selenium/grid/config",
         "//java/server/src/org/openqa/selenium/grid/data",
         "//java/server/src/org/openqa/selenium/grid/node",
         "//java/server/src/org/openqa/selenium/grid/node/local",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-    ]
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "httpd",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote/tracing",
         "//java/server/src/org/openqa/selenium/cli",
@@ -19,7 +22,4 @@ java_library(
         "//third_party/java/guava",
         "//third_party/java/service",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__pkg__",
-    ]
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "httpd",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote/http",
         "//java/client/src/org/openqa/selenium/remote/tracing",
@@ -18,7 +21,4 @@ java_library(
         "//third_party/java/beust:jcommander",
         "//third_party/java/service",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__pkg__",
-    ]
-)
+)
diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel
@@ -1,14 +1,14 @@
 java_library(
     name = "config",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote/http",
         "//java/server/src/org/openqa/selenium/grid/config",
         "//java/server/src/org/openqa/selenium/grid/sessionmap",
         "//java/server/src/org/openqa/selenium/grid/sessionmap/remote",
         "//third_party/java/beust:jcommander",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__subpackages__",
-    ]
 )
diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel
@@ -1,6 +1,9 @@
 java_library(
     name = "httpd",
     srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid:__pkg__",
+    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote/tracing",
         "//java/server/src/org/openqa/selenium/cli",
@@ -15,7 +18,4 @@ java_library(
         "//third_party/java/guava",
         "//third_party/java/service",
     ],
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid:__pkg__",
-    ]
-)
+)
diff --git a/third_party/java/contrib/BUILD.bazel b/third_party/java/contrib/BUILD.bazel
@@ -6,9 +6,9 @@ package(default_visibility = ["//visibility:public"])
 
 maven_java_import(
     name = "opentracing-concurrent",
-    coords = "io.opentracing.contrib:opentracing-concurrent:jar:0.1.0",
-    jar = "opentracing-concurrent-0.1.0.jar",
-    srcjar = "opentracing-concurrent-0.1.0-sources.jar",
+    coords = "io.opentracing.contrib:opentracing-concurrent:jar:0.4.0",
+    jar = "opentracing-concurrent-0.4.0.jar",
+    srcjar = "opentracing-concurrent-0.4.0-sources.jar",
     deps = [
         "//third_party/java/opentracing:opentracing-api",
         "//third_party/java/opentracing:opentracing-noop",
@@ -17,9 +17,9 @@ maven_java_import(
 
 maven_java_import(
     name = "opentracing-okhttp3",
-    coords = "io.opentracing.contrib:opentracing-okhttp3:jar:0.1.0",
-    jar = "opentracing-okhttp3-0.1.0.jar",
-    srcjar = "opentracing-okhttp3-0.1.0-sources.jar",
+    coords = "io.opentracing.contrib:opentracing-okhttp3:jar:2.0.1",
+    jar = "opentracing-okhttp3-2.0.1.jar",
+    srcjar = "opentracing-okhttp3-2.0.1-sources.jar",
     deps = [
         ":opentracing-concurrent",
         "//third_party/java/okhttp3:okhttp",
@@ -30,9 +30,9 @@ maven_java_import(
 
 maven_java_import(
     name = "opentracing-tracerresolver",
-    coords = "io.opentracing.contrib:opentracing-tracerresolver:jar:0.1.5",
-    jar = "opentracing-tracerresolver-0.1.5.jar",
-    srcjar = "opentracing-tracerresolver-0.1.5-sources.jar",
+    coords = "io.opentracing.contrib:opentracing-tracerresolver:jar:0.1.7",
+    jar = "opentracing-tracerresolver-0.1.7.jar",
+    srcjar = "opentracing-tracerresolver-0.1.7-sources.jar",
     deps = [
         "//third_party/java/opentracing:opentracing-api",
         "//third_party/java/opentracing:opentracing-util",

diff --git a/third_party/java/opentracing/BUILD.bazel b/third_party/java/opentracing/BUILD.bazel
@@ -6,26 +6,26 @@ package(default_visibility = ["//visibility:public"])
 
 maven_java_import(
     name = "opentracing-api",
-    coords = "io.opentracing:opentracing-api:jar:0.31.0",
-    jar = "opentracing-api-0.31.0.jar",
-    srcjar = "opentracing-api-0.31.0-sources.jar",
+    coords = "io.opentracing:opentracing-api:jar:0.33.0",
+    jar = "opentracing-api-0.33.0.jar",
+    srcjar = "opentracing-api-0.33.0-sources.jar",
 )
 
 maven_java_import(
     name = "opentracing-noop",
-    coords = "io.opentracing:opentracing-noop:jar:0.31.0",
-    jar = "opentracing-noop-0.31.0.jar",
-    srcjar = "opentracing-noop-0.31.0-sources.jar",
+    coords = "io.opentracing:opentracing-noop:jar:0.33.0",
+    jar = "opentracing-noop-0.33.0.jar",
+    srcjar = "opentracing-noop-0.33.0-sources.jar",
     deps = [
         ":opentracing-api",
     ],
 )
 
 maven_java_import(
     name = "opentracing-util",
-    coords = "io.opentracing:opentracing-util:jar:0.31.0",
-    jar = "opentracing-util-0.31.0.jar",
-    srcjar = "opentracing-util-0.31.0-sources.jar",
+    coords = "io.opentracing:opentracing-util:jar:0.33.0",
+    jar = "opentracing-util-0.33.0.jar",
+    srcjar = "opentracing-util-0.33.0-sources.jar",
     deps = [
         ":opentracing-api",
         ":opentracing-noop",