Skip to content

Commit 5aef9ec

Browse files
guwguw
authored
Move dependencies to WORKSPACE (#12)
All dependencies should be development time only because we publish a deploy jar. Therefore any consumer for JDT toolchain should not need any of these.
1 parent 5bd3b7e commit 5aef9ec

File tree

2 files changed

+104
-96
lines changed

2 files changed

+104
-96
lines changed

‎WORKSPACE

+103-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,108 @@ experimental_find_system_git(
5555
load("//jdt:repositories.bzl", "rules_jdt_dependencies")
5656
rules_jdt_dependencies()
5757

58-
# note: use rules_jvm_external and maven_install below for test-only dependencies
58+
#
59+
# note: use jvm_maven_import_external below for dev/test-only dependencies
60+
# public dependencies must go into jdt/repositories.bzl
61+
#
5962

63+
load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
64+
_DEFAULT_REPOSITORIES = [
65+
"https://repo1.maven.org/maven2",
66+
"https://maven.google.com",
67+
]
6068

69+
jvm_maven_import_external(
70+
name = "rules_jdt_guava",
71+
artifact = "com.google.guava:guava:31.0.1-jre",
72+
artifact_sha256 = "d5be94d65e87bd219fb3193ad1517baa55a3b88fc91d21cf735826ab5af087b9",
73+
licenses = ["notice"],
74+
server_urls = _DEFAULT_REPOSITORIES,
75+
)
76+
77+
jvm_maven_import_external(
78+
name = "rules_jdt_autovalue",
79+
artifact = "com.google.auto.value:auto-value:1.9",
80+
artifact_sha256 = "fd39087fa111da2b12b14675fee740043f0e78e4bfc7055cf3443bfffa3f572b",
81+
licenses = ["notice"],
82+
server_urls = _DEFAULT_REPOSITORIES,
83+
)
84+
85+
jvm_maven_import_external(
86+
name = "rules_jdt_autovalue_annotations",
87+
artifact = "com.google.auto.value:auto-value-annotations:1.9",
88+
artifact_sha256 = "fa5469f4c44ee598a2d8f033ab0a9dcbc6498a0c5e0c998dfa0c2adf51358044",
89+
licenses = ["notice"],
90+
server_urls = _DEFAULT_REPOSITORIES,
91+
)
92+
93+
jvm_maven_import_external(
94+
name = "rules_jdt_jsr305",
95+
artifact = "com.google.code.findbugs:jsr305:3.0.2",
96+
artifact_sha256 = "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
97+
licenses = ["notice"],
98+
server_urls = _DEFAULT_REPOSITORIES,
99+
)
100+
101+
jvm_maven_import_external(
102+
name = "rules_jdt_caffeine",
103+
artifact = "com.github.ben-manes.caffeine:caffeine:3.0.5",
104+
artifact_sha256 = "8a9b54d3506a3b92ee46b217bcee79196b21ca6d52dc2967c686a205fb2f9c15",
105+
licenses = ["notice"],
106+
server_urls = _DEFAULT_REPOSITORIES,
107+
)
108+
109+
jvm_maven_import_external(
110+
name = "rules_jdt_jacoco_core",
111+
artifact = "org.jacoco:org.jacoco.core:0.8.7",
112+
artifact_sha256 = "ad7739b5fb5969aa1a8aead3d74ed54dc82ed012f1f10f336bd1b96e71c1a13c",
113+
licenses = ["notice"],
114+
server_urls = _DEFAULT_REPOSITORIES,
115+
)
116+
117+
jvm_maven_import_external(
118+
name = "rules_jdt_org_ow2_asm_asm",
119+
artifact = "org.ow2.asm:asm:jar:9.3",
120+
artifact_sha256 = "1263369b59e29c943918de11d6d6152e2ec6085ce63e5710516f8c67d368e4bc",
121+
licenses = ["notice"],
122+
server_urls = _DEFAULT_REPOSITORIES,
123+
)
124+
125+
jvm_maven_import_external(
126+
name = "rules_jdt_org_ow2_asm_asm_analysis",
127+
artifact = "org.ow2.asm:asm-analysis:jar:9.3",
128+
artifact_sha256 = "37fd5392bb2cf4c15f202ffefd46d0e92bb34ff848c549f30d426a60d6b29495",
129+
deps = ["@rules_jdt_org_ow2_asm_asm_tree"],
130+
server_urls = _DEFAULT_REPOSITORIES,
131+
)
132+
133+
jvm_maven_import_external(
134+
name = "rules_jdt_org_ow2_asm_asm_commons",
135+
artifact = "org.ow2.asm:asm-commons:jar:9.3",
136+
artifact_sha256 = "a347c24732db2aead106b6e5996a015b06a3ef86e790a4f75b61761f0d2f7f39",
137+
deps = [
138+
"@rules_jdt_org_ow2_asm_asm",
139+
"@rules_jdt_org_ow2_asm_asm_analysis",
140+
"@rules_jdt_org_ow2_asm_asm_tree",
141+
],
142+
server_urls = _DEFAULT_REPOSITORIES,
143+
)
144+
jvm_maven_import_external(
145+
name = "rules_jdt_org_ow2_asm_asm_tree",
146+
artifact = "org.ow2.asm:asm-tree:jar:9.3",
147+
artifact_sha256 = "ae629c2609f39681ef8d140a42a23800464a94f2d23e36d8f25cd10d5e4caff4",
148+
deps = ["@rules_jdt_org_ow2_asm_asm"],
149+
server_urls = _DEFAULT_REPOSITORIES,
150+
)
151+
jvm_maven_import_external(
152+
name = "rules_jdt_org_ow2_asm_asm_util",
153+
artifact = "org.ow2.asm:asm-util:jar:9.3",
154+
artifact_sha256 = "70f78f291ca0298afdb567fa85c5667869bc3da3914784816413853994962192",
155+
deps = [
156+
"@rules_jdt_org_ow2_asm_asm",
157+
"@rules_jdt_org_ow2_asm_asm_analysis",
158+
"@rules_jdt_org_ow2_asm_asm_tree",
159+
],
160+
server_urls = _DEFAULT_REPOSITORIES,
161+
)
162+

‎jdt/repositories.bzl

+1-95
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
2-
31
_DEFAULT_REPOSITORIES = [
42
"https://repo1.maven.org/maven2",
53
"https://maven.google.com",
@@ -12,99 +10,7 @@ def rules_jdt_dependencies(repositories = _DEFAULT_REPOSITORIES):
1210
repositories (array): list of Maven repos
1311
1412
"""
15-
jvm_maven_import_external(
16-
name = "rules_jdt_guava",
17-
artifact = "com.google.guava:guava:31.0.1-jre",
18-
artifact_sha256 = "d5be94d65e87bd219fb3193ad1517baa55a3b88fc91d21cf735826ab5af087b9",
19-
licenses = ["notice"],
20-
server_urls = _DEFAULT_REPOSITORIES,
21-
)
22-
23-
jvm_maven_import_external(
24-
name = "rules_jdt_autovalue",
25-
artifact = "com.google.auto.value:auto-value:1.9",
26-
artifact_sha256 = "fd39087fa111da2b12b14675fee740043f0e78e4bfc7055cf3443bfffa3f572b",
27-
licenses = ["notice"],
28-
server_urls = _DEFAULT_REPOSITORIES,
29-
)
30-
31-
jvm_maven_import_external(
32-
name = "rules_jdt_autovalue_annotations",
33-
artifact = "com.google.auto.value:auto-value-annotations:1.9",
34-
artifact_sha256 = "fa5469f4c44ee598a2d8f033ab0a9dcbc6498a0c5e0c998dfa0c2adf51358044",
35-
licenses = ["notice"],
36-
server_urls = _DEFAULT_REPOSITORIES,
37-
)
38-
39-
jvm_maven_import_external(
40-
name = "rules_jdt_jsr305",
41-
artifact = "com.google.code.findbugs:jsr305:3.0.2",
42-
artifact_sha256 = "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
43-
licenses = ["notice"],
44-
server_urls = _DEFAULT_REPOSITORIES,
45-
)
46-
47-
jvm_maven_import_external(
48-
name = "rules_jdt_caffeine",
49-
artifact = "com.github.ben-manes.caffeine:caffeine:3.0.5",
50-
artifact_sha256 = "8a9b54d3506a3b92ee46b217bcee79196b21ca6d52dc2967c686a205fb2f9c15",
51-
licenses = ["notice"],
52-
server_urls = _DEFAULT_REPOSITORIES,
53-
)
54-
55-
jvm_maven_import_external(
56-
name = "rules_jdt_jacoco_core",
57-
artifact = "org.jacoco:org.jacoco.core:0.8.7",
58-
artifact_sha256 = "ad7739b5fb5969aa1a8aead3d74ed54dc82ed012f1f10f336bd1b96e71c1a13c",
59-
licenses = ["notice"],
60-
server_urls = _DEFAULT_REPOSITORIES,
61-
)
62-
63-
jvm_maven_import_external(
64-
name = "rules_jdt_org_ow2_asm_asm",
65-
artifact = "org.ow2.asm:asm:jar:9.3",
66-
artifact_sha256 = "1263369b59e29c943918de11d6d6152e2ec6085ce63e5710516f8c67d368e4bc",
67-
licenses = ["notice"],
68-
server_urls = _DEFAULT_REPOSITORIES,
69-
)
70-
71-
jvm_maven_import_external(
72-
name = "rules_jdt_org_ow2_asm_asm_analysis",
73-
artifact = "org.ow2.asm:asm-analysis:jar:9.3",
74-
artifact_sha256 = "37fd5392bb2cf4c15f202ffefd46d0e92bb34ff848c549f30d426a60d6b29495",
75-
deps = ["@rules_jdt_org_ow2_asm_asm_tree"],
76-
server_urls = _DEFAULT_REPOSITORIES,
77-
)
78-
79-
jvm_maven_import_external(
80-
name = "rules_jdt_org_ow2_asm_asm_commons",
81-
artifact = "org.ow2.asm:asm-commons:jar:9.3",
82-
artifact_sha256 = "a347c24732db2aead106b6e5996a015b06a3ef86e790a4f75b61761f0d2f7f39",
83-
deps = [
84-
"@rules_jdt_org_ow2_asm_asm",
85-
"@rules_jdt_org_ow2_asm_asm_analysis",
86-
"@rules_jdt_org_ow2_asm_asm_tree",
87-
],
88-
server_urls = _DEFAULT_REPOSITORIES,
89-
)
90-
jvm_maven_import_external(
91-
name = "rules_jdt_org_ow2_asm_asm_tree",
92-
artifact = "org.ow2.asm:asm-tree:jar:9.3",
93-
artifact_sha256 = "ae629c2609f39681ef8d140a42a23800464a94f2d23e36d8f25cd10d5e4caff4",
94-
deps = ["@rules_jdt_org_ow2_asm_asm"],
95-
server_urls = _DEFAULT_REPOSITORIES,
96-
)
97-
jvm_maven_import_external(
98-
name = "rules_jdt_org_ow2_asm_asm_util",
99-
artifact = "org.ow2.asm:asm-util:jar:9.3",
100-
artifact_sha256 = "70f78f291ca0298afdb567fa85c5667869bc3da3914784816413853994962192",
101-
deps = [
102-
"@rules_jdt_org_ow2_asm_asm",
103-
"@rules_jdt_org_ow2_asm_asm_analysis",
104-
"@rules_jdt_org_ow2_asm_asm_tree",
105-
],
106-
server_urls = _DEFAULT_REPOSITORIES,
107-
)
13+
# because JDT Toolchain is provided as deploy jar, there shouldn't be any public external dependencies
10814

10915
def rules_jdt_toolchains():
11016
"""An utility method to load all Java toolchains.

0 commit comments

Comments
 (0)