Skip to content

Commit 0875c92

Browse files
regisdregisd
committed
Update jflex() bazel rule to v8
This is needed as v7 was using the deprecated native.maven_jar See jflex-de/bazel_rules#21
1 parent 66de1a3 commit 0875c92

File tree

2 files changed

+56
-23
lines changed

2 files changed

+56
-23
lines changed

‎WORKSPACE‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ RULES_JVM_EXTERNAL_SHA = "1bbf2e48d07686707dd85357e9a94da775e1dbd7c464272b366428
1010

1111
git_repository(
1212
name = "jflex_rules",
13-
commit = "49122dbb4b325af63af714b3006541f156b70c57",
13+
commit = "a50b452bafc7e3b1f8e1780c12fc8c1ab0d6e381", # v8
1414
remote = "https://github.com/jflex-de/bazel_rules.git",
1515
)
1616

17-
load("@jflex_rules//jflex:deps.bzl", "jflex_deps")
18-
19-
jflex_deps()
17+
load("@jflex_rules//jflex:deps.bzl", "JFLEX_ARTIFACTS")
2018

2119
# pandoc used to build the documentation
2220

@@ -55,7 +53,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
5553

5654
maven_install(
5755
name = "maven",
58-
artifacts = ARTIFACTS,
56+
artifacts = ARTIFACTS + JFLEX_ARTIFACTS,
5957
maven_install_json = "//third_party:maven_install.json",
6058
repositories = [
6159
"https://jcenter.bintray.com/",

‎third_party/maven_install.json‎

Lines changed: 53 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"dependency_tree": {
3-
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 1430077768,
4-
"conflict_resolution": {},
3+
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -869446969,
4+
"conflict_resolution": {
5+
"org.apache.ant:ant:1.7.0": "org.apache.ant:ant:1.9.7"
6+
},
57
"dependencies": [
68
{
79
"coord": "com.google.auto.value:auto-value-annotations:1.7",
@@ -236,6 +238,39 @@
236238
"sha256": "2c73b940c91250bc98346926270f13a6a10bb6e29d2c9316a70d134e382c873e",
237239
"url": "https://jcenter.bintray.com/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"
238240
},
241+
{
242+
"coord": "de.jflex:cup_runtime:11b",
243+
"dependencies": [],
244+
"directDependencies": [],
245+
"file": "v1/https/jcenter.bintray.com/de/jflex/cup_runtime/11b/cup_runtime-11b.jar",
246+
"mirror_urls": [
247+
"https://jcenter.bintray.com/de/jflex/cup_runtime/11b/cup_runtime-11b.jar",
248+
"https://maven.google.comde/jflex/cup_runtime/11b/cup_runtime-11b.jar",
249+
"https://repo1.maven.org/maven2de/jflex/cup_runtime/11b/cup_runtime-11b.jar"
250+
],
251+
"sha256": "9c0b5c93fe0c0e239d5f92affb672cb7c45122c3e3de8cda9513fa8e39dbbc3c",
252+
"url": "https://jcenter.bintray.com/de/jflex/cup_runtime/11b/cup_runtime-11b.jar"
253+
},
254+
{
255+
"coord": "de.jflex:jflex:1.7.0",
256+
"dependencies": [
257+
"de.jflex:cup_runtime:11b",
258+
"org.apache.ant:ant:1.9.7",
259+
"org.apache.ant:ant-launcher:1.9.7"
260+
],
261+
"directDependencies": [
262+
"de.jflex:cup_runtime:11b",
263+
"org.apache.ant:ant:1.9.7"
264+
],
265+
"file": "v1/https/jcenter.bintray.com/de/jflex/jflex/1.7.0/jflex-1.7.0.jar",
266+
"mirror_urls": [
267+
"https://jcenter.bintray.com/de/jflex/jflex/1.7.0/jflex-1.7.0.jar",
268+
"https://maven.google.comde/jflex/jflex/1.7.0/jflex-1.7.0.jar",
269+
"https://repo1.maven.org/maven2de/jflex/jflex/1.7.0/jflex-1.7.0.jar"
270+
],
271+
"sha256": "c40e64600f7d29e1618a1c1d5cd697c926ff8495e166ea9416cae19644e37ae6",
272+
"url": "https://jcenter.bintray.com/de/jflex/jflex/1.7.0/jflex-1.7.0.jar"
273+
},
239274
{
240275
"coord": "junit:junit:4.12",
241276
"dependencies": [
@@ -287,34 +322,34 @@
287322
"url": "https://jcenter.bintray.com/org/antlr/antlr-runtime/3.1.2/antlr-runtime-3.1.2.jar"
288323
},
289324
{
290-
"coord": "org.apache.ant:ant-launcher:1.7.0",
325+
"coord": "org.apache.ant:ant-launcher:1.9.7",
291326
"dependencies": [],
292327
"directDependencies": [],
293-
"file": "v1/https/jcenter.bintray.com/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar",
328+
"file": "v1/https/jcenter.bintray.com/org/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar",
294329
"mirror_urls": [
295-
"https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar",
296-
"https://maven.google.comorg/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar",
297-
"https://repo1.maven.org/maven2org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"
330+
"https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar",
331+
"https://maven.google.comorg/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar",
332+
"https://repo1.maven.org/maven2org/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar"
298333
],
299-
"sha256": "72b3d03e0d7d86a56513ec38dd4cd6abe3da6620189be222ab255352cb6eba4a",
300-
"url": "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"
334+
"sha256": "bc376f6d6cb586229f451ac459faf1443b144c26d6647618ec9cba60e54c2b79",
335+
"url": "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar"
301336
},
302337
{
303-
"coord": "org.apache.ant:ant:1.7.0",
338+
"coord": "org.apache.ant:ant:1.9.7",
304339
"dependencies": [
305-
"org.apache.ant:ant-launcher:1.7.0"
340+
"org.apache.ant:ant-launcher:1.9.7"
306341
],
307342
"directDependencies": [
308-
"org.apache.ant:ant-launcher:1.7.0"
343+
"org.apache.ant:ant-launcher:1.9.7"
309344
],
310-
"file": "v1/https/jcenter.bintray.com/org/apache/ant/ant/1.7.0/ant-1.7.0.jar",
345+
"file": "v1/https/jcenter.bintray.com/org/apache/ant/ant/1.9.7/ant-1.9.7.jar",
311346
"mirror_urls": [
312-
"https://jcenter.bintray.com/org/apache/ant/ant/1.7.0/ant-1.7.0.jar",
313-
"https://maven.google.comorg/apache/ant/ant/1.7.0/ant-1.7.0.jar",
314-
"https://repo1.maven.org/maven2org/apache/ant/ant/1.7.0/ant-1.7.0.jar"
347+
"https://jcenter.bintray.com/org/apache/ant/ant/1.9.7/ant-1.9.7.jar",
348+
"https://maven.google.comorg/apache/ant/ant/1.9.7/ant-1.9.7.jar",
349+
"https://repo1.maven.org/maven2org/apache/ant/ant/1.9.7/ant-1.9.7.jar"
315350
],
316-
"sha256": "92f72307e7440f1e352c916f2438d2bbab3ffd2cf730c71316117ad04abadea8",
317-
"url": "https://jcenter.bintray.com/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"
351+
"sha256": "9a5dbe3f5f2cb91854c8682cab80178afa412ab35a5ab718bf39ce01b3435d93",
352+
"url": "https://jcenter.bintray.com/org/apache/ant/ant/1.9.7/ant-1.9.7.jar"
318353
},
319354
{
320355
"coord": "org.apache.velocity:velocity:1.7",

0 commit comments

Comments
 (0)