[cdp] Update maven coordinates for CDP implementations

This allows us to version them sensibly, with the specific selenium releases _and_ the chromium releases too.
SeleniumHQ · Sep 7, 2020 · f61b113 · f61b113
1 parent 4cfb967
commit f61b113
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 64 deletions.
diff --git a/java/client/src/org/openqa/selenium/chromium/ChromiumDriver.java b/java/client/src/org/openqa/selenium/chromium/ChromiumDriver.java
@@ -18,7 +18,7 @@
 package org.openqa.selenium.chromium;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
+import org.openqa.selenium.BuildInfo;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;
@@ -50,7 +50,6 @@
 
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.logging.Logger;
 
 /**
@@ -99,10 +98,12 @@ protected ChromiumDriver(CommandExecutor commandExecutor, Capabilities capabilit
               "Unable to find version of CDP to use for %s. You may need to " +
                 "include a dependency on a specific version of the CDP using " +
                 "something similar to " +
-                "`org.seleniumhq.selenium:selenium-devtools:86` where the " +
-                "version matches the version of the chromium-based browser " +
-                "you're using.",
-              capabilities.getVersion()));
+                "`org.seleniumhq.selenium:selenium-devtools-v86:%s` where the " +
+                "version (\"v86\") matches the version of the chromium-based browser " +
+                "you're using and the version number of the artifact is the same " +
+                "as Selenium's.",
+              capabilities.getVersion(),
+              new BuildInfo().getReleaseLabel()));
           return new NoOpCdpInfo();
         });
 

diff --git a/java/client/src/org/openqa/selenium/devtools/ChromiumVersionDetector.java b/java/client/src/org/openqa/selenium/devtools/ChromiumVersionDetector.java
diff --git a/java/client/src/org/openqa/selenium/devtools/v84/BUILD.bazel b/java/client/src/org/openqa/selenium/devtools/v84/BUILD.bazel
@@ -1,11 +1,12 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//:copy_file.bzl", "copy_file")
+load("//java:version.bzl", "SE_VERSION")
 load("//java:defs.bzl", "java_export")
 
 java_export(
     name = "v84",
     srcs = glob(["*.java"]),
-    maven_coordinates = "org.seleniumhq.selenium:selenium-devtools:84",
+    maven_coordinates = "org.seleniumhq.selenium:selenium-devtools-v84:%s" % SE_VERSION,
     pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",

diff --git a/java/client/src/org/openqa/selenium/devtools/v85/BUILD.bazel b/java/client/src/org/openqa/selenium/devtools/v85/BUILD.bazel
@@ -1,11 +1,12 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//:copy_file.bzl", "copy_file")
 load("//java:defs.bzl", "java_export")
+load("//java:version.bzl", "SE_VERSION")
 
 java_export(
     name = "v85",
     srcs = glob(["*.java"]),
-    maven_coordinates = "org.seleniumhq.selenium:selenium-devtools:85",
+    maven_coordinates = "org.seleniumhq.selenium:selenium-devtools-v85:%s" % SE_VERSION,
     pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",

diff --git a/java/client/src/org/openqa/selenium/devtools/v86/BUILD.bazel b/java/client/src/org/openqa/selenium/devtools/v86/BUILD.bazel
@@ -1,11 +1,12 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//:copy_file.bzl", "copy_file")
 load("//java:defs.bzl", "java_export")
+load("//java:version.bzl", "SE_VERSION")
 
 java_export(
     name = "v86",
     srcs = glob(["*.java"]),
-    maven_coordinates = "org.seleniumhq.selenium:selenium-devtools:86",
+    maven_coordinates = "org.seleniumhq.selenium:selenium-devtools-v86:%s" % SE_VERSION,
     pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = [
         "//visibility:public",