Skip to content

Use a private namespace for the java dependencies #676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shs96c wants to merge 1 commit into
base: master
Choose a base branch
from
+1,199 −29
Open

Use a private namespace for the java dependencies #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ bazel_dep(
name = "bazel_skylib",
version = "1.7.1",
)

bazel_dep(
name = "platforms",
version = "0.0.5",
Expand All @@ -18,22 +17,18 @@ bazel_dep(
name = "rules_proto",
version = "7.0.2",
)

bazel_dep(
name = "protobuf",
version = "31.0",
)

bazel_dep(
name = "google_bazel_common",
version = "0.0.1",
)

bazel_dep(
name = "rules_webtesting",
version = "0.4.1",
)

bazel_dep(
name = "rules_web_testing_java",
version = "0.4.1",
Expand All @@ -44,15 +39,14 @@ bazel_dep(
name = "rules_java",
version = "8.6.1",
)

bazel_dep(
name = "rules_jvm_external",
version = "6.6",
)

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")

maven.install(
name = "rules_closure_deps",
artifacts = [
"args4j:args4j:2.33",
"com.google.closure-stylesheets:closure-stylesheets:1.5.0",
Expand All @@ -64,22 +58,24 @@ maven.install(
"org.seleniumhq.selenium:selenium-api:4.27.0",
"org.seleniumhq.selenium:selenium-support:4.27.0",
],
lock_file = "//:maven_install.json",
)

# Using maven.artifact here because the version number vxxxxx cannot parsed correctly.
maven.artifact(
name = "rules_closure_deps",
artifact = "closure-compiler",
group = "com.google.javascript",
version = "v20250402",
)

# javacc:javacc was not updated since 2008 and relocated to net.java.dev.javacc
maven.override(
name = "rules_closure_deps",
coordinates = "javacc:javacc",
target = "@maven//:net_java_dev_javacc_javacc",
target = "@rules_closure_deps//:net_java_dev_javacc_javacc",
)

use_repo(maven, "maven")
use_repo(maven, "rules_closure_deps")

##### Python dependencies #####
bazel_dep(
Expand Down
2 changes: 1 addition & 1 deletion closure/compiler/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ licenses(["notice"])

java_library(
name = "compiler",
exports = ["@maven//:com_google_javascript_closure_compiler"],
exports = ["@rules_closure_deps//:com_google_javascript_closure_compiler"],
)

bzl_library(
Expand Down
2 changes: 1 addition & 1 deletion closure/stylesheets/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ java_binary(
main_class = "com.google.common.css.compiler.commandline.ClosureCommandLineCompiler",
visibility = ["//:__subpackages__"],
runtime_deps = [
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
"@rules_closure_deps//:com_google_closure_stylesheets_closure_stylesheets",
],
)
4 changes: 2 additions & 2 deletions java/com/google/javascript/jscomp/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ java_library(
"//java/io/bazel/rules/closure:build_info_java_proto",
"//java/io/bazel/rules/closure:webpath",
"//java/io/bazel/rules/closure/worker",
"@protobuf//:protobuf_java",
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/jsr330_inject",
"@maven//:args4j_args4j",
"@protobuf//:protobuf_java",
"@rules_closure_deps//:args4j_args4j",
],
)
6 changes: 3 additions & 3 deletions java/io/bazel/rules/closure/testing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ java_binary(
deps = [
"//java/io/bazel/rules/closure/webfiles/server",
"@google_bazel_common//third_party/java/guava",
"@maven//:org_seleniumhq_selenium_selenium_api",
"@maven//:org_seleniumhq_selenium_selenium_remote_driver",
"@maven//:org_seleniumhq_selenium_selenium_support",
"@rules_closure_deps//:org_seleniumhq_selenium_selenium_api",
"@rules_closure_deps//:org_seleniumhq_selenium_selenium_remote_driver",
"@rules_closure_deps//:org_seleniumhq_selenium_selenium_support",
"@rules_web_testing_java//java/com/google/testing/web",
],
)
6 changes: 3 additions & 3 deletions java/io/bazel/rules/closure/webfiles/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ java_library(
"//java/io/bazel/rules/closure:webpath",
"//java/io/bazel/rules/closure/webfiles/compiler",
"//java/io/bazel/rules/closure/worker",
"@protobuf//:protobuf_java",
"@google_bazel_common//third_party/java/auto:value",
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/error_prone:annotations",
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/jsr305_annotations",
"@google_bazel_common//third_party/java/jsr330_inject",
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
"@maven//:org_jsoup_jsoup",
"@protobuf//:protobuf_java",
"@rules_closure_deps//:com_google_closure_stylesheets_closure_stylesheets",
"@rules_closure_deps//:org_jsoup_jsoup",
],
)

Expand Down
2 changes: 1 addition & 1 deletion java/io/bazel/rules/closure/webfiles/compiler/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ java_library(
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/jsr330_inject",
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
"@rules_closure_deps//:com_google_closure_stylesheets_closure_stylesheets",
],
)
2 changes: 1 addition & 1 deletion java/org/jsoup/nodes/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"@google_bazel_common//third_party/java/guava",
"@maven//:org_jsoup_jsoup",
"@rules_closure_deps//:org_jsoup_jsoup",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ java_test(
"@google_bazel_common//third_party/java/guava:testlib",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_jimfs_jimfs",
"@rules_closure_deps//:com_google_jimfs_jimfs",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/http/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ java_test(
"@google_bazel_common//third_party/java/jsr330_inject",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_dagger_dagger_producers",
"@rules_closure_deps//:com_google_dagger_dagger_producers",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/webfiles/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ java_test(
"@google_bazel_common//third_party/java/guava:testlib",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_jimfs_jimfs",
"@rules_closure_deps//:com_google_jimfs_jimfs",
],
)
2 changes: 1 addition & 1 deletion javatests/io/bazel/rules/closure/webfiles/server/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ java_test(
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/mockito",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_jimfs_jimfs",
"@rules_closure_deps//:com_google_jimfs_jimfs",
],
)
4 changes: 2 additions & 2 deletions javatests/io/bazel/rules/closure/worker/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ java_test(
deps = [
"//java/io/bazel/rules/closure/worker",
"//java/io/bazel/rules/closure/worker:worker_protocol_java_proto",
"@protobuf//:protobuf_java",
"@google_bazel_common//third_party/java/dagger",
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/jsr305_annotations",
"@google_bazel_common//third_party/java/jsr330_inject",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/mockito",
"@google_bazel_common//third_party/java/truth",
"@maven//:com_google_jimfs_jimfs",
"@protobuf//:protobuf_java",
"@rules_closure_deps//:com_google_jimfs_jimfs",
],
)
2 changes: 1 addition & 1 deletion javatests/org/jsoup/nodes/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ java_test(
"@google_bazel_common//third_party/java/guava",
"@google_bazel_common//third_party/java/junit",
"@google_bazel_common//third_party/java/truth",
"@maven//:org_jsoup_jsoup",
"@rules_closure_deps//:org_jsoup_jsoup",
],
)
Loading