Merge branch 'stable-2.14'
* stable-2.14: Eclipse project generation: Support jgit from external repository Change-Id: I4ff13ab85cbec8f8826325497c0d2f590240b601
This commit is contained in:
@@ -149,7 +149,6 @@ def gen_classpath(ext):
|
||||
gwt_lib.add(p)
|
||||
continue
|
||||
|
||||
|
||||
m = java_library.match(p)
|
||||
if m:
|
||||
src.add(m.group(1))
|
||||
@@ -157,6 +156,9 @@ def gen_classpath(ext):
|
||||
if p.endswith('libquery_parser.jar') or \
|
||||
p.endswith('prolog/libcommon.jar'):
|
||||
lib.add(p)
|
||||
# JGit dependency from external repository
|
||||
if 'gerrit-' not in p and 'jgit' in p:
|
||||
lib.add(p)
|
||||
else:
|
||||
# Don't mess up with Bazel internal test runner dependencies.
|
||||
# When we use Eclipse we rely on it for running the tests
|
||||
|
||||
Reference in New Issue
Block a user