Update build files

Author: shs96c

BUILD.bazel

@@ -3,10 +3,9 @@ load("@buildifier_prebuilt//:rules.bzl", "buildifier")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 load("@package_metadata//licenses/rules:license.bzl", "license")
 load("@package_metadata//rules:package_metadata.bzl", "package_metadata")
-load("@rules_java//java:java_binary.bzl", "java_binary")
 load("//common:browsers.bzl", "chrome_data", "firefox_data")
 load("//java:browsers.bzl", "chrome_jvm_flags", "firefox_jvm_flags")
-load("//java:defs.bzl", "artifact")
+load("//java:defs.bzl", "artifact", "java_binary")
 
 exports_files([
     "package.json",

java/BUILD.bazel

@@ -1,8 +1,7 @@
 load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
 load("@contrib_rules_jvm//java:defs.bzl", "spotbugs_binary", "spotbugs_config")
-load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_java//java:java_plugin.bzl", "java_plugin")
-load(":defs.bzl", "artifact")
+load(":defs.bzl", "artifact", "java_library")
 
 exports_files(
     srcs = [

java/private/BUILD.bazel

@@ -1,5 +1,5 @@
-load("@rules_java//java:java_binary.bzl", "java_binary")
 load("@rules_jvm_external//:defs.bzl", "artifact")
+load("//java:defs.bzl", "java_binary")
 
 exports_files(
     srcs = [

java/test/org/openqa/selenium/firefox/BUILD.bazel

@@ -1,7 +1,6 @@
-load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//common:defs.bzl", "copy_file")
-load("//java:defs.bzl", "JUNIT5_DEPS", "java_selenium_test_suite", "java_test_suite")
+load("//java:defs.bzl", "JUNIT5_DEPS", "java_library", "java_selenium_test_suite", "java_test_suite")
 
 LARGE_TESTS = [
     "ExtensionsTest.java",

java/test/org/openqa/selenium/grid/router/BUILD.bazel

@@ -1,6 +1,5 @@
-load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
-load("//java:defs.bzl", "BIDI_BROWSERS", "JUNIT5_DEPS", "SINGLE_BROWSER", "java_selenium_test_suite", "java_test_suite")
+load("//java:defs.bzl", "BIDI_BROWSERS", "JUNIT5_DEPS", "SINGLE_BROWSER", "java_library", "java_selenium_test_suite", "java_test_suite")
 load("//java:version.bzl", "TOOLS_JAVA_VERSION")
 load("//java/src/org/openqa/selenium/devtools:versions.bzl", "CDP_DEPS")
 

java/test/org/openqa/selenium/netty/server/BUILD.bazel

@@ -1,6 +1,5 @@
-load("@rules_java//java:java_library.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "artifact")
-load("//java:defs.bzl", "JUNIT5_DEPS", "java_test_suite")
+load("//java:defs.bzl", "JUNIT5_DEPS", "java_library", "java_test_suite")
 
 SMALL_TEST_SRCS = [
     "RequestConverterTest.java",

scripts/BUILD.bazel

@@ -1,7 +1,6 @@
 load("@py_dev_requirements//:requirements.bzl", "requirement")
-load("@rules_java//java:java_binary.bzl", "java_binary")
 load("@rules_python//python:defs.bzl", "py_binary")
-load("//java:defs.bzl", "artifact")
+load("//java:defs.bzl", "artifact", "java_binary")
 
 py_binary(
     name = "pinned_browsers",