[cdp] Include supported CDP versions in the Grid

SeleniumHQ · Feb 7, 2021 · b0b8382 · b0b8382
1 parent d1b21d0
commit b0b8382
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/java/client/src/org/openqa/selenium/BUILD.bazel b/java/client/src/org/openqa/selenium/BUILD.bazel
@@ -1,12 +1,6 @@
 load("//java:version.bzl", "SE_VERSION")
 load("//java:defs.bzl", "java_dist_zip", "java_export", "java_import", "java_library", "javadoc")
-
-CDP_VERSIONS = [
-    "v86",
-    "v87",
-    "v88",
-    "v89",
-]
+load("//java/client/src/org/openqa/selenium/devtools:versions.bzl", "CDP_DEPS")
 
 filegroup(
     name = "template-pom",
@@ -31,10 +25,10 @@ java_export(
         "org.openqa.selenium.interactions.internal",
         "org.openqa.selenium.internal",
     ],
+    maven_coordinates = "org.seleniumhq.selenium:selenium-api:%s" % SE_VERSION,
     opens_to = [
         "org.openqa.selenium.json",
     ],
-    maven_coordinates = "org.seleniumhq.selenium:selenium-api:%s" % SE_VERSION,
     pom_template = ":template-pom",
     visibility = ["//visibility:public"],
     deps = [
@@ -43,8 +37,6 @@ java_export(
     ],
 )
 
-CDP_DEPS = ["//java/client/src/org/openqa/selenium/devtools/%s" % v for v in CDP_VERSIONS]
-
 java_export(
     name = "client-combined",
     maven_coordinates = "org.seleniumhq.selenium:selenium-java:" + SE_VERSION,

diff --git a/java/client/src/org/openqa/selenium/devtools/versions.bzl b/java/client/src/org/openqa/selenium/devtools/versions.bzl
@@ -0,0 +1,8 @@
+CDP_VERSIONS = [
+    "v86",
+    "v87",
+    "v88",
+    "v89",
+]
+
+CDP_DEPS = ["//java/client/src/org/openqa/selenium/devtools/%s" % v for v in CDP_VERSIONS]
diff --git a/java/server/src/org/openqa/selenium/grid/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/BUILD.bazel
@@ -2,6 +2,7 @@ load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//common:defs.bzl", "copy_file")
 load("//java:defs.bzl", "java_binary", "java_dist_zip", "java_export", "java_library", "javadoc")
 load("//java:version.bzl", "SE_VERSION")
+load("//java/client/src/org/openqa/selenium/devtools:versions.bzl", "CDP_DEPS")
 
 genrule(
     name = "executable-grid",
@@ -49,6 +50,9 @@ java_export(
         exclude = BASE_COMMAND_SRCS,
     ),
     maven_coordinates = "org.seleniumhq.selenium:selenium-grid:%s" % SE_VERSION,
+    opens_to = [
+        "org.openqa.selenium.json",
+    ],
     pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     resource_jars = [
         "//javascript/grid-ui:react_jar",
@@ -60,9 +64,6 @@ java_export(
         "org.openqa.selenium.remote.locators.CustomLocator",
         "org.openqa.selenium.remote.service.DriverService$Builder",
     ],
-    opens_to = [
-        "org.openqa.selenium.json",
-    ],
     visibility = [
         "//visibility:public",
     ],
@@ -81,7 +82,7 @@ java_export(
         "//java/server/src/org/openqa/selenium/grid/router/httpd",
         "//java/server/src/org/openqa/selenium/grid/sessionmap/httpd",
         "//java/server/src/org/openqa/selenium/grid/sessionqueue/httpd",
-    ],
+    ] + CDP_DEPS,
     deps = [
         ":base-command",
         "//java/server/src/org/openqa/selenium/cli",