Bump args4j version to 2.0.29
There is pending upgrade for review for years now to version 2.33: [1], that appears to be too introusive change. There are two issues: * Collision with rules_closure's and closure-templates's args4j version * Non trivial changes in gerrit core to adapt to newer args4j version Dismantle those issues, by upgrading to intermediate version: 2.0.29. Re-fetch args4j twice: one for rules_closure to work properly with ancient args4j version, while renaming the internal one to the more recent version: args4j-intern. Needless to say, that we have uploaded these PRs to both projects: rules_closure and closure-templates that were more or less rejected, so that we don't hope that args4j is going to be upgraded upstream, thus keeping this status quo of double fetching: [2],[3]. The reason we need this change is dependency of gitblit-plugin on more recent version so that we are getting classpath collision. Another alternative that was considered (but abandoned) is to downgrade args4j version in gitblit to the same ancient version used by gerrit core. [1] https://gerrit-review.googlesource.com/c/gerrit/+/67793 [2] https://github.com/bazelbuild/rules_closure/pull/262 [3] https://github.com/google/closure-templates/pull/155 Change-Id: I5ec6645b92d54fccc03a723b7b50c50a99393d57
This commit is contained in:
committed by
Han-Wen Nienhuys
parent
5d094c10fc
commit
e27a404a3e
10
WORKSPACE
10
WORKSPACE
@@ -35,9 +35,11 @@ versions.check(minimum_bazel_version = "0.14.0")
|
||||
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
|
||||
|
||||
# Prevent redundant loading of dependencies.
|
||||
# TODO(davido): Omit re-fetching ancient args4j version when these PRs are merged:
|
||||
# https://github.com/bazelbuild/rules_closure/pull/262
|
||||
# https://github.com/google/closure-templates/pull/155
|
||||
closure_repositories(
|
||||
omit_aopalliance = True,
|
||||
omit_args4j = True,
|
||||
omit_javax_inject = True,
|
||||
)
|
||||
|
||||
@@ -289,9 +291,9 @@ maven_jar(
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "args4j",
|
||||
artifact = "args4j:args4j:2.0.26",
|
||||
sha1 = "01ebb18ebb3b379a74207d5af4ea7c8338ebd78b",
|
||||
name = "args4j-intern",
|
||||
artifact = "args4j:args4j:2.0.29",
|
||||
sha1 = "55ca4ddc4e906ffbaec043113b36bb410a3d909e",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
||||
Reference in New Issue
Block a user