From f905e10e00ac9c185f5ff7ab068063b995bfb54d Mon Sep 17 00:00:00 2001 From: Alex Popov Date: Wed, 26 Nov 2025 04:14:24 +0700 Subject: [PATCH 1/4] Replace Maven dependency references with artifact() for org.jspecify:jspecify in multiple BUILD.bazel files Update BUILD.bazel to load artifact() alongside java_export Update BUILD.bazel to load artifact() for java_library and java_export --- java/src/org/openqa/selenium/chrome/BUILD.bazel | 3 ++- java/src/org/openqa/selenium/concurrent/BUILD.bazel | 4 ++-- java/src/org/openqa/selenium/devtools/BUILD.bazel | 4 ++-- java/src/org/openqa/selenium/edge/BUILD.bazel | 3 ++- java/src/org/openqa/selenium/firefox/BUILD.bazel | 3 ++- java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel | 2 +- java/src/org/openqa/selenium/ie/BUILD.bazel | 3 ++- java/src/org/openqa/selenium/json/BUILD.bazel | 3 ++- java/src/org/openqa/selenium/remote/http/BUILD.bazel | 4 ++-- java/src/org/openqa/selenium/safari/BUILD.bazel | 3 ++- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/java/src/org/openqa/selenium/chrome/BUILD.bazel b/java/src/org/openqa/selenium/chrome/BUILD.bazel index 27b34f123f956..99bfe50c20346 100644 --- a/java/src/org/openqa/selenium/chrome/BUILD.bazel +++ b/java/src/org/openqa/selenium/chrome/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_jvm_external//:defs.bzl", "artifact") load("//java:defs.bzl", "java_export") load("//java:version.bzl", "SE_VERSION") @@ -20,6 +21,6 @@ java_export( "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/manager", "//java/src/org/openqa/selenium/remote", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), ], ) diff --git a/java/src/org/openqa/selenium/concurrent/BUILD.bazel b/java/src/org/openqa/selenium/concurrent/BUILD.bazel index 9ff6fa7716c25..46a7a9e178c7b 100644 --- a/java/src/org/openqa/selenium/concurrent/BUILD.bazel +++ b/java/src/org/openqa/selenium/concurrent/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:defs.bzl", "java_library") +load("//java:defs.bzl", "artifact", "java_library") java_library( name = "concurrent", @@ -13,6 +13,6 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), ], ) diff --git a/java/src/org/openqa/selenium/devtools/BUILD.bazel b/java/src/org/openqa/selenium/devtools/BUILD.bazel index 965175059e13c..d27392e8000de 100644 --- a/java/src/org/openqa/selenium/devtools/BUILD.bazel +++ b/java/src/org/openqa/selenium/devtools/BUILD.bazel @@ -22,7 +22,7 @@ java_library( deps = [ "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/json", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), ], ) @@ -77,7 +77,7 @@ java_library( "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote/http", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), ], ) diff --git a/java/src/org/openqa/selenium/edge/BUILD.bazel b/java/src/org/openqa/selenium/edge/BUILD.bazel index b8e8addb9c0cd..7d54b392e40cb 100644 --- a/java/src/org/openqa/selenium/edge/BUILD.bazel +++ b/java/src/org/openqa/selenium/edge/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_jvm_external//:defs.bzl", "artifact") load("//java:defs.bzl", "java_export") load("//java:version.bzl", "SE_VERSION") @@ -21,6 +22,6 @@ java_export( "//java/src/org/openqa/selenium/chromium", "//java/src/org/openqa/selenium/manager", "//java/src/org/openqa/selenium/remote", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), ], ) diff --git a/java/src/org/openqa/selenium/firefox/BUILD.bazel b/java/src/org/openqa/selenium/firefox/BUILD.bazel index 24106ab3859d9..8c0c22354890a 100644 --- a/java/src/org/openqa/selenium/firefox/BUILD.bazel +++ b/java/src/org/openqa/selenium/firefox/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_jvm_external//:defs.bzl", "artifact") load("//java:defs.bzl", "java_export") load("//java:version.bzl", "SE_VERSION") @@ -16,6 +17,6 @@ java_export( "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/manager", "//java/src/org/openqa/selenium/remote", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), ], ) diff --git a/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel index 821a4e5d9b64e..7c8595e6a28a5 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel @@ -21,7 +21,7 @@ java_export( "//java/src/org/openqa/selenium/grid", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/ie/BUILD.bazel b/java/src/org/openqa/selenium/ie/BUILD.bazel index 6fcef4dea869a..309cf0ee60cca 100644 --- a/java/src/org/openqa/selenium/ie/BUILD.bazel +++ b/java/src/org/openqa/selenium/ie/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_jvm_external//:defs.bzl", "artifact") load("//java:defs.bzl", "java_export") load("//java:version.bzl", "SE_VERSION") @@ -15,6 +16,6 @@ java_export( "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/manager", "//java/src/org/openqa/selenium/remote", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), ], ) diff --git a/java/src/org/openqa/selenium/json/BUILD.bazel b/java/src/org/openqa/selenium/json/BUILD.bazel index eff66b1b9aa0f..d50892bbee983 100644 --- a/java/src/org/openqa/selenium/json/BUILD.bazel +++ b/java/src/org/openqa/selenium/json/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:defs.bzl", "java_export") +load("//java:defs.bzl", "artifact", "java_export") load("//java:version.bzl", "SE_VERSION") java_export( @@ -14,5 +14,6 @@ java_export( ], deps = [ "//java/src/org/openqa/selenium:core", + artifact("org.jspecify:jspecify"), ], ) diff --git a/java/src/org/openqa/selenium/remote/http/BUILD.bazel b/java/src/org/openqa/selenium/remote/http/BUILD.bazel index 128a2e2262988..dff128ef6bffa 100644 --- a/java/src/org/openqa/selenium/remote/http/BUILD.bazel +++ b/java/src/org/openqa/selenium/remote/http/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:defs.bzl", "java_export") +load("//java:defs.bzl", "artifact", "java_export") load("//java:version.bzl", "SE_VERSION") java_export( @@ -19,6 +19,6 @@ java_export( "//java:auto-service", "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/json", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), ], ) diff --git a/java/src/org/openqa/selenium/safari/BUILD.bazel b/java/src/org/openqa/selenium/safari/BUILD.bazel index cc1d258de355b..07b39b2392884 100644 --- a/java/src/org/openqa/selenium/safari/BUILD.bazel +++ b/java/src/org/openqa/selenium/safari/BUILD.bazel @@ -1,3 +1,4 @@ +load("@rules_jvm_external//:defs.bzl", "artifact") load("//java:defs.bzl", "java_export") load("//java:version.bzl", "SE_VERSION") @@ -14,6 +15,6 @@ java_export( "//java:auto-service", "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/remote", - "@maven//:org_jspecify_jspecify", + artifact("org.jspecify:jspecify"), ], ) From 197d5a9e98bac65e57ec5b32152a7cf863c1932d Mon Sep 17 00:00:00 2001 From: Alex Popov Date: Wed, 26 Nov 2025 04:36:49 +0700 Subject: [PATCH 2/4] Refactor BUILD.bazel files to consolidate artifact loading in multiple modules --- java/src/org/openqa/selenium/chrome/BUILD.bazel | 3 +-- java/src/org/openqa/selenium/devtools/BUILD.bazel | 3 +-- java/src/org/openqa/selenium/edge/BUILD.bazel | 3 +-- java/src/org/openqa/selenium/firefox/BUILD.bazel | 3 +-- java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel | 3 +-- java/src/org/openqa/selenium/ie/BUILD.bazel | 3 +-- java/src/org/openqa/selenium/remote/BUILD.bazel | 3 +-- java/src/org/openqa/selenium/safari/BUILD.bazel | 3 +-- java/src/org/openqa/selenium/support/ui/BUILD.bazel | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/java/src/org/openqa/selenium/chrome/BUILD.bazel b/java/src/org/openqa/selenium/chrome/BUILD.bazel index 99bfe50c20346..cdb054b8d2795 100644 --- a/java/src/org/openqa/selenium/chrome/BUILD.bazel +++ b/java/src/org/openqa/selenium/chrome/BUILD.bazel @@ -1,5 +1,4 @@ -load("@rules_jvm_external//:defs.bzl", "artifact") -load("//java:defs.bzl", "java_export") +load("//java:defs.bzl", "java_export", "artifact") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/devtools/BUILD.bazel b/java/src/org/openqa/selenium/devtools/BUILD.bazel index d27392e8000de..5bf3fca256488 100644 --- a/java/src/org/openqa/selenium/devtools/BUILD.bazel +++ b/java/src/org/openqa/selenium/devtools/BUILD.bazel @@ -1,6 +1,5 @@ -load("@rules_jvm_external//:defs.bzl", "artifact") load("//common:defs.bzl", "copy_file") -load("//java:defs.bzl", "java_binary", "java_library") +load("//java:defs.bzl", "java_binary", "java_library", "artifact") GENERATOR_SOURCES = [ "CdpClientGenerator.java", diff --git a/java/src/org/openqa/selenium/edge/BUILD.bazel b/java/src/org/openqa/selenium/edge/BUILD.bazel index 7d54b392e40cb..0f09518603b1b 100644 --- a/java/src/org/openqa/selenium/edge/BUILD.bazel +++ b/java/src/org/openqa/selenium/edge/BUILD.bazel @@ -1,5 +1,4 @@ -load("@rules_jvm_external//:defs.bzl", "artifact") -load("//java:defs.bzl", "java_export") +load("//java:defs.bzl", "artifact","java_export") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/firefox/BUILD.bazel b/java/src/org/openqa/selenium/firefox/BUILD.bazel index 8c0c22354890a..71fcbefb60ac0 100644 --- a/java/src/org/openqa/selenium/firefox/BUILD.bazel +++ b/java/src/org/openqa/selenium/firefox/BUILD.bazel @@ -1,5 +1,4 @@ -load("@rules_jvm_external//:defs.bzl", "artifact") -load("//java:defs.bzl", "java_export") +load("//java:defs.bzl","artifact", "java_export") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel index 7c8595e6a28a5..32b0382b58b4f 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel @@ -1,5 +1,4 @@ -load("@rules_jvm_external//:defs.bzl", "artifact") -load("//java:defs.bzl", "java_export") +load("//java:defs.bzl", "artifact","java_export") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/ie/BUILD.bazel b/java/src/org/openqa/selenium/ie/BUILD.bazel index 309cf0ee60cca..57998c0aacd44 100644 --- a/java/src/org/openqa/selenium/ie/BUILD.bazel +++ b/java/src/org/openqa/selenium/ie/BUILD.bazel @@ -1,5 +1,4 @@ -load("@rules_jvm_external//:defs.bzl", "artifact") -load("//java:defs.bzl", "java_export") +load("//java:defs.bzl", "artifact", "java_export") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/remote/BUILD.bazel b/java/src/org/openqa/selenium/remote/BUILD.bazel index 0da07320601c2..0c9dfad36e01a 100644 --- a/java/src/org/openqa/selenium/remote/BUILD.bazel +++ b/java/src/org/openqa/selenium/remote/BUILD.bazel @@ -1,6 +1,5 @@ -load("@rules_jvm_external//:defs.bzl", "artifact") load("//common:defs.bzl", "copy_file") -load("//java:defs.bzl", "java_export", "java_library") +load("//java:defs.bzl", "artifact","java_export", "java_library") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/safari/BUILD.bazel b/java/src/org/openqa/selenium/safari/BUILD.bazel index 07b39b2392884..64c9ed5374741 100644 --- a/java/src/org/openqa/selenium/safari/BUILD.bazel +++ b/java/src/org/openqa/selenium/safari/BUILD.bazel @@ -1,5 +1,4 @@ -load("@rules_jvm_external//:defs.bzl", "artifact") -load("//java:defs.bzl", "java_export") +load("//java:defs.bzl", "artifact", "java_export") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/support/ui/BUILD.bazel b/java/src/org/openqa/selenium/support/ui/BUILD.bazel index 83dec8728a0fc..23a231d3a7739 100644 --- a/java/src/org/openqa/selenium/support/ui/BUILD.bazel +++ b/java/src/org/openqa/selenium/support/ui/BUILD.bazel @@ -1,5 +1,4 @@ -load("@rules_jvm_external//:defs.bzl", "artifact") -load("//java:defs.bzl", "java_library") +load("//java:defs.bzl", "java_library", "artifact") java_library( name = "clock", From 60a15969373ffb9328781c58c46c548b1d52fc11 Mon Sep 17 00:00:00 2001 From: Alex Popov Date: Thu, 27 Nov 2025 23:59:35 +0700 Subject: [PATCH 3/4] applied formatting for build files --- java/src/org/openqa/selenium/chrome/BUILD.bazel | 2 +- java/src/org/openqa/selenium/devtools/BUILD.bazel | 2 +- java/src/org/openqa/selenium/edge/BUILD.bazel | 2 +- java/src/org/openqa/selenium/firefox/BUILD.bazel | 2 +- java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel | 2 +- java/src/org/openqa/selenium/remote/BUILD.bazel | 2 +- java/src/org/openqa/selenium/support/ui/BUILD.bazel | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/src/org/openqa/selenium/chrome/BUILD.bazel b/java/src/org/openqa/selenium/chrome/BUILD.bazel index cdb054b8d2795..a38d3678e2aea 100644 --- a/java/src/org/openqa/selenium/chrome/BUILD.bazel +++ b/java/src/org/openqa/selenium/chrome/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:defs.bzl", "java_export", "artifact") +load("//java:defs.bzl", "artifact", "java_export") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/devtools/BUILD.bazel b/java/src/org/openqa/selenium/devtools/BUILD.bazel index 5bf3fca256488..45e02b743040e 100644 --- a/java/src/org/openqa/selenium/devtools/BUILD.bazel +++ b/java/src/org/openqa/selenium/devtools/BUILD.bazel @@ -1,5 +1,5 @@ load("//common:defs.bzl", "copy_file") -load("//java:defs.bzl", "java_binary", "java_library", "artifact") +load("//java:defs.bzl", "artifact", "java_binary", "java_library") GENERATOR_SOURCES = [ "CdpClientGenerator.java", diff --git a/java/src/org/openqa/selenium/edge/BUILD.bazel b/java/src/org/openqa/selenium/edge/BUILD.bazel index 0f09518603b1b..dc98616366355 100644 --- a/java/src/org/openqa/selenium/edge/BUILD.bazel +++ b/java/src/org/openqa/selenium/edge/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:defs.bzl", "artifact","java_export") +load("//java:defs.bzl", "artifact", "java_export") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/firefox/BUILD.bazel b/java/src/org/openqa/selenium/firefox/BUILD.bazel index 71fcbefb60ac0..fcea8af0158df 100644 --- a/java/src/org/openqa/selenium/firefox/BUILD.bazel +++ b/java/src/org/openqa/selenium/firefox/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:defs.bzl","artifact", "java_export") +load("//java:defs.bzl", "artifact", "java_export") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel index 32b0382b58b4f..ac17cc580e7e1 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:defs.bzl", "artifact","java_export") +load("//java:defs.bzl", "artifact", "java_export") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/remote/BUILD.bazel b/java/src/org/openqa/selenium/remote/BUILD.bazel index 0c9dfad36e01a..71bfde2e5d0b5 100644 --- a/java/src/org/openqa/selenium/remote/BUILD.bazel +++ b/java/src/org/openqa/selenium/remote/BUILD.bazel @@ -1,5 +1,5 @@ load("//common:defs.bzl", "copy_file") -load("//java:defs.bzl", "artifact","java_export", "java_library") +load("//java:defs.bzl", "artifact", "java_export", "java_library") load("//java:version.bzl", "SE_VERSION") java_export( diff --git a/java/src/org/openqa/selenium/support/ui/BUILD.bazel b/java/src/org/openqa/selenium/support/ui/BUILD.bazel index 23a231d3a7739..027a1e9a5310e 100644 --- a/java/src/org/openqa/selenium/support/ui/BUILD.bazel +++ b/java/src/org/openqa/selenium/support/ui/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:defs.bzl", "java_library", "artifact") +load("//java:defs.bzl", "artifact", "java_library") java_library( name = "clock", From a7d766fefa9751f78b939d76f3909918b8f0e832 Mon Sep 17 00:00:00 2001 From: Alex Popov Date: Fri, 28 Nov 2025 00:27:11 +0700 Subject: [PATCH 4/4] applied formatting for build files for building files leftover --- java/src/org/openqa/selenium/json/BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/org/openqa/selenium/json/BUILD.bazel b/java/src/org/openqa/selenium/json/BUILD.bazel index 24aeaeeb1a87e..d50892bbee983 100644 --- a/java/src/org/openqa/selenium/json/BUILD.bazel +++ b/java/src/org/openqa/selenium/json/BUILD.bazel @@ -14,6 +14,6 @@ java_export( ], deps = [ "//java/src/org/openqa/selenium:core", - artifact("org.jspecify:jspecify") + artifact("org.jspecify:jspecify"), ], )