opendev/gerrit
Code Issues Proposed changes

Update JGit dependencies to fix building from source

Browse Source 
Depends on [1] which harmonizes JGit's dependency names to align with
the names used in Gerrit since change I1e75690fe. Without [2], the
build will fail with errors like:

  "no such package '@commons_compress//jar'"

Also move the 'hamcrest-library' dependency out of WORKSPACE into the
jgit rules where it will be added conditionally.

[1] https://git.eclipse.org/r/#/c/128354/

Change-Id: I33be13e7f36ec2bcacbb9eb0983c88c6f3082097
This commit is contained in:
Gert van Dijk 2018-08-29 13:06:52 +02:00 committed by David Pursehouse
parent a59c39a152
commit 9932a88865
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WORKSPACE
View File

@ -671,13 +671,6 @@ maven_jar(
sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0", sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
) )
# Only needed when jgit is built from the development tree
maven_jar(
name = "hamcrest-library",
artifact = "org.hamcrest:hamcrest-library:1.3",
sha1 = "4785a3c21320980282f9f33d0d1264a69040538f",
)
TRUTH_VERS = "0.32" TRUTH_VERS = "0.32"
maven_jar( maven_jar(

9
lib/jgit/jgit.bzl
View File

@ -18,9 +18,18 @@ def jgit_repos():
name = "jgit", name = "jgit",
path = LOCAL_JGIT_REPO, path = LOCAL_JGIT_REPO,
) )
jgit_maven_repos_dev()
else: else:
jgit_maven_repos() jgit_maven_repos()
def jgit_maven_repos_dev():
# Transitive dependencies from JGit's WORKSPACE.
maven_jar(
name = "hamcrest-library",
artifact = "org.hamcrest:hamcrest-library:1.3",
sha1 = "4785a3c21320980282f9f33d0d1264a69040538f",
)
def jgit_maven_repos(): def jgit_maven_repos():
maven_jar( maven_jar(
name = "jgit-lib", name = "jgit-lib",