Skip to content

Commit 06bcc2d

Browse files
committed
Use separate maven namespace for our deps
1 parent 70347d4 commit 06bcc2d

15 files changed

Lines changed: 1205 additions & 26 deletions

File tree

MODULE.bazel

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,19 @@ archive_override(
4545
patch_strip = 1,
4646
)
4747

48-
# Commit: e515ecaa7cc38498e371d1b776bff8d42028fd81
49-
# Date: 2025-10-09 04:14:16 +0000 UTC
50-
# URL: https://github.com/stackb/rules_proto/commit/e515ecaa7cc38498e371d1b776bff8d42028fd81
48+
# Commit: 04fc63fb40bf30d2e5e0b3786028eb41218de979
49+
# Date: 2025-10-09 04:43:15 +0000 UTC
50+
# URL: https://github.com/stackb/rules_proto/commit/04fc63fb40bf30d2e5e0b3786028eb41218de979
5151
#
52-
# Cleanup maven lock_file references (#405)
53-
# Size: 4095126 (4.1 MB)
52+
# Remove lock file for @maven
53+
#
54+
# It is shared by multiple workspaces and seems to cause problems when locked
55+
# Size: 4088796 (4.1 MB)
5456
archive_override(
5557
module_name = "build_stack_rules_proto",
56-
sha256 = "f2c470eee7b4a7c06c89dd39611f8bdd9e0c2c80b088451ee0abce7f570d7d23",
57-
strip_prefix = "rules_proto-e515ecaa7cc38498e371d1b776bff8d42028fd81",
58-
urls = ["https://github.com/stackb/rules_proto/archive/e515ecaa7cc38498e371d1b776bff8d42028fd81.tar.gz"],
58+
sha256 = "aff21579deef91316c726582bec71c621dde2ae2ec74099a55b637bda8997333",
59+
strip_prefix = "rules_proto-04fc63fb40bf30d2e5e0b3786028eb41218de979",
60+
urls = ["https://github.com/stackb/rules_proto/archive/04fc63fb40bf30d2e5e0b3786028eb41218de979.tar.gz"],
5961
)
6062

6163
# -------------------------------------------------------------------
@@ -140,6 +142,7 @@ platform_http_file(
140142

141143
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
142144
maven.install(
145+
name = "maven_rules_closure",
143146
artifacts = [
144147
"args4j:args4j:2.33",
145148
"com.google.closure-stylesheets:closure-stylesheets:1.5.0",
@@ -153,12 +156,14 @@ maven.install(
153156
],
154157
)
155158
maven.artifact(
159+
name = "maven_rules_closure",
156160
artifact = "closure-compiler",
157161
group = "com.google.javascript",
158162
version = "v20250402", # Using maven.artifact here because the version number vxxxxx cannot parsed correctly.
159163
)
160164
maven.override(
165+
name = "maven_rules_closure",
161166
coordinates = "javacc:javacc",
162-
target = "@maven//:net_java_dev_javacc_javacc", # javacc:javacc was not updated since 2008 and relocated to net.java.dev.javacc
167+
target = "@maven_rules_closure//:net_java_dev_javacc_javacc", # javacc:javacc was not updated since 2008 and relocated to net.java.dev.javacc
163168
)
164-
use_repo(maven, "maven")
169+
use_repo(maven, "maven_rules_closure")

closure/compiler/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ licenses(["notice"])
2121

2222
java_library(
2323
name = "compiler",
24-
exports = ["@maven//:com_google_javascript_closure_compiler"],
24+
exports = ["@maven_rules_closure//:com_google_javascript_closure_compiler"],
2525
)
2626

2727
bzl_library(

closure/stylesheets/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ java_binary(
4040
main_class = "com.google.common.css.compiler.commandline.ClosureCommandLineCompiler",
4141
visibility = ["//:__subpackages__"],
4242
runtime_deps = [
43-
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
43+
"@maven_rules_closure//:com_google_closure_stylesheets_closure_stylesheets",
4444
],
4545
)

java/com/google/javascript/jscomp/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ java_library(
4747
"@google_bazel_common//third_party/java/dagger",
4848
"@google_bazel_common//third_party/java/guava",
4949
"@google_bazel_common//third_party/java/jsr330_inject",
50-
"@maven//:args4j_args4j",
50+
"@maven_rules_closure//:args4j_args4j",
5151
],
5252
)

java/io/bazel/rules/closure/testing/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ java_binary(
2828
deps = [
2929
"//java/io/bazel/rules/closure/webfiles/server",
3030
"@google_bazel_common//third_party/java/guava",
31-
"@maven//:org_seleniumhq_selenium_selenium_api",
32-
"@maven//:org_seleniumhq_selenium_selenium_remote_driver",
33-
"@maven//:org_seleniumhq_selenium_selenium_support",
31+
"@maven_rules_closure//:org_seleniumhq_selenium_selenium_api",
32+
"@maven_rules_closure//:org_seleniumhq_selenium_selenium_remote_driver",
33+
"@maven_rules_closure//:org_seleniumhq_selenium_selenium_support",
3434
"@rules_web_testing_java//java/com/google/testing/web",
3535
],
3636
)

java/io/bazel/rules/closure/webfiles/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ java_library(
3434
"@google_bazel_common//third_party/java/guava",
3535
"@google_bazel_common//third_party/java/jsr305_annotations",
3636
"@google_bazel_common//third_party/java/jsr330_inject",
37-
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
38-
"@maven//:org_jsoup_jsoup",
37+
"@maven_rules_closure//:com_google_closure_stylesheets_closure_stylesheets",
38+
"@maven_rules_closure//:org_jsoup_jsoup",
3939
],
4040
)
4141

java/io/bazel/rules/closure/webfiles/compiler/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ java_library(
2424
"@google_bazel_common//third_party/java/dagger",
2525
"@google_bazel_common//third_party/java/guava",
2626
"@google_bazel_common//third_party/java/jsr330_inject",
27-
"@maven//:com_google_closure_stylesheets_closure_stylesheets",
27+
"@maven_rules_closure//:com_google_closure_stylesheets_closure_stylesheets",
2828
],
2929
)

java/org/jsoup/nodes/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ java_library(
2222
visibility = ["//visibility:public"],
2323
deps = [
2424
"@google_bazel_common//third_party/java/guava",
25-
"@maven//:org_jsoup_jsoup",
25+
"@maven_rules_closure//:org_jsoup_jsoup",
2626
],
2727
)

javatests/io/bazel/rules/closure/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ java_test(
3838
"@google_bazel_common//third_party/java/guava:testlib",
3939
"@google_bazel_common//third_party/java/junit",
4040
"@google_bazel_common//third_party/java/truth",
41-
"@maven//:com_google_jimfs_jimfs",
41+
"@maven_rules_closure//:com_google_jimfs_jimfs",
4242
],
4343
)

javatests/io/bazel/rules/closure/http/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ java_test(
3131
"@google_bazel_common//third_party/java/jsr330_inject",
3232
"@google_bazel_common//third_party/java/junit",
3333
"@google_bazel_common//third_party/java/truth",
34-
"@maven//:com_google_dagger_dagger_producers",
34+
"@maven_rules_closure//:com_google_dagger_dagger_producers",
3535
],
3636
)

0 commit comments

Comments
 (0)