opendev/gerrit
Code Issues Proposed changes

Link to JGit source as git submodule

Browse Source 
This is the second attempt to build JGit from the source using git
submodule approach. The first attempt that was abandoned is here: [1].

Using a submodule to bring in the source files vastly simplifies
updating JGit. Gerrit developers can bump the SHA-1 of the submodule
and not deal with the Maven rebuild process for JGit.

This change updates JGit dependency from 5.4.3.201909031940-r to commit
009e07882fee2b0ad2ebe7ba44e2ff52c101f858, and Javadoc version from:
5.4.3.201909031940-r to 5.5.0.201909110433-r.

To bump to new Javadoc API _DOC_VERS should be updated in
java/com/google/gerrit/extensions/BUILD to point to the desired JGit
Javadoc release.

JGit sources are imported in Eclipse as source folders. One side effect
of this change is that the source code warnings for JGit project are now
shown.

[1] https://gerrit-review.googlesource.com/c/gerrit/+/61892

Feature: Issue 11737
Change-Id: I16370e57f27e26b2382243ca448484f53dfa96bb
This commit is contained in:
David Ostrovsky 2019-06-19 01:07:43 +02:00
parent 87cfca3f37
commit 8bec85501e
84 changed files with 190 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitmodules vendored
View File

@ -1,3 +1,8 @@
[submodule "modules/jgit"]
path = modules/jgit
url = ../jgit
branch = .
[submodule "plugins/codemirror-editor"]
path = plugins/codemirror-editor
url = ../plugins/codemirror-editor

6
Documentation/dev-bazel.txt
View File

@ -442,12 +442,6 @@ To build against SNAPSHOT Maven JARs, the complete SNAPSHOT version must be used
)
----
[[consume-jgit-from-development-tree]]
To consume the JGit dependency from the development tree, edit
`lib/jgit/jgit.bzl` setting LOCAL_JGIT_REPO to a directory holding a
JGit repository.
[[bazel-local-caches]]
To accelerate builds, several caches are activated per default:

8
Documentation/licenses.txt
View File

@ -73,7 +73,6 @@ Apache2.0
* jetty:server
* jetty:servlet
* jetty:util
* jgit/org.eclipse.jgit:javaewah
* log:json-smart
* log:jsonevent-layout
* log:log4j
@ -96,6 +95,7 @@ Apache2.0
* guava-retrying
* html-types
* j2objc
* javaewah
* jsr305
* mime-util
* servlet-api
@ -2438,9 +2438,9 @@ Database section 7.
[[jgit]]
jgit
* jgit/org.eclipse.jgit.archive:jgit-archive
* jgit/org.eclipse.jgit.http.server:jgit-servlet
* jgit/org.eclipse.jgit:jgit
* jgit
* jgit-archive
* jgit-servlet
[[jgit_license]]
----

19
WORKSPACE
View File

@ -104,6 +104,12 @@ go_repository(
importpath = "github.com/howeyc/fsnotify",
)
# JGit external repository consumed from git submodule
local_repository(
name = "jgit",
path = "modules/jgit",
)
ANTLR_VERS = "3.5.2"
# TODO(davido): Remove this upgrade, when new Bazel version is released
@ -200,9 +206,18 @@ maven_jar(
sha1 = "021a212688ec94fe77aff74ab34cc74f6f940e60",
)
load("//lib/jgit:jgit.bzl", "jgit_repos")
# JGit's transitive dependencies
maven_jar(
name = "hamcrest-library",
artifact = "org.hamcrest:hamcrest-library:1.3",
sha1 = "4785a3c21320980282f9f33d0d1264a69040538f",
)
jgit_repos()
maven_jar(
name = "jzlib",
artifact = "com.jcraft:jzlib:1.1.1",
sha1 = "a1551373315ffc2f96130a0e5704f74e151777ba",
)
maven_jar(
name = "javaewah",

6
java/com/google/gerrit/acceptance/BUILD
View File

@ -46,6 +46,7 @@ java_library(
"//lib:gson",
"//lib:guava-retrying",
"//lib:h2",
"//lib:jgit",
"//lib:jimfs",
"//lib:jsch",
"//lib:servlet-api-without-neverlink",
@ -56,7 +57,6 @@ java_library(
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/mina:sshd",
"//prolog:gerrit-prolog-common",
],
@ -93,6 +93,7 @@ java_library2(
"//java/com/google/gerrit/server/project/testing:project-test-util",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit-junit",
"//lib:jimfs",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
@ -100,7 +101,6 @@ java_library2(
"//lib/httpcomponents:httpclient",
"//lib/httpcomponents:httpcore",
"//lib/jetty:servlet",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/log:impl-log4j",
"//lib/log:log4j",
"//lib/mockito",
@ -133,6 +133,7 @@ java_library2(
"//lib:args4j",
"//lib:gson",
"//lib:guava-retrying",
"//lib:jgit",
"//lib:jsch",
"//lib:servlet-api",
"//lib/commons:lang",
@ -140,7 +141,6 @@ java_library2(
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/mail",
"//lib/mina:sshd",
],

2
java/com/google/gerrit/acceptance/testsuite/project/BUILD
View File

@ -13,10 +13,10 @@ java_library(
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:jgit",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/commons:lang",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/common/BUILD
View File

@ -25,11 +25,11 @@ java_library(
"//java/com/google/gerrit/prettify:server",
"//java/com/google/gerrit/reviewdb:server",
"//lib:guava",
"//lib:jgit",
"//lib:servlet-api",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/flogger:api",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/elasticsearch/BUILD
View File

@ -17,6 +17,7 @@ java_library(
"//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
"//lib:jgit",
"//lib:protobuf",
"//lib/commons:codec",
"//lib/commons:lang",
@ -29,6 +30,5 @@ java_library(
"//lib/httpcomponents:httpcore",
"//lib/httpcomponents:httpcore-nio",
"//lib/jackson:jackson-core",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

5
java/com/google/gerrit/extensions/BUILD
View File

@ -1,8 +1,11 @@
load("@rules_java//java:defs.bzl", "java_binary", "java_library")
load("//lib:guava.bzl", "GUAVA_DOC_URL")
load("//lib/jgit:jgit.bzl", "JGIT_DOC_URL")
load("//tools/bzl:javadoc.bzl", "java_doc")
_DOC_VERS = "5.5.0.201909110433-r"
JGIT_DOC_URL = "https://download.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs"
java_binary(
name = "extension-api",
main_class = "Dummy",

2
java/com/google/gerrit/extensions/common/testing/BUILD
View File

@ -9,7 +9,7 @@ java_library(
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/truth",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib/truth",
],
)

2
java/com/google/gerrit/git/BUILD
View File

@ -7,8 +7,8 @@ java_library(
deps = [
"//java/com/google/gerrit/common:annotations",
"//lib:guava",
"//lib:jgit",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/git/testing/BUILD
View File

@ -9,7 +9,7 @@ java_library(
deps = [
"//java/com/google/gerrit/common:annotations",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib/truth",
"//lib/truth:truth-java8-extension",
],

2
java/com/google/gerrit/gpg/BUILD
View File

@ -12,11 +12,11 @@ java_library(
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/api",
"//lib:guava",
"//lib:jgit",
"//lib/bouncycastle:bcpg-neverlink",
"//lib/bouncycastle:bcprov-neverlink",
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/gpg/testing/BUILD
View File

@ -8,7 +8,7 @@ java_library(
deps = [
"//java/com/google/gerrit/gpg",
"//lib:guava",
"//lib:jgit",
"//lib/bouncycastle:bcpg-neverlink",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

4
java/com/google/gerrit/httpd/BUILD
View File

@ -31,6 +31,8 @@ java_library(
"//lib:args4j",
"//lib:gson",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-servlet",
"//lib:jsch",
"//lib:servlet-api",
"//lib:soy",
@ -42,7 +44,5 @@ java_library(
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/httpd/auth/oauth/BUILD
View File

@ -14,11 +14,11 @@ java_library(
"//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
"//lib:jgit",
"//lib:servlet-api",
"//lib/commons:codec",
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/httpd/auth/openid/BUILD
View File

@ -21,7 +21,7 @@ java_library(
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib/openid:consumer",
],
)

2
java/com/google/gerrit/httpd/init/BUILD
View File

@ -27,10 +27,10 @@ java_library(
"//java/com/google/gerrit/server/schema",
"//java/com/google/gerrit/sshd",
"//lib:guava",
"//lib:jgit",
"//lib:servlet-api",
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/index/BUILD
View File

@ -30,10 +30,10 @@ java_library(
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server/logging",
"//lib:guava",
"//lib:jgit",
"//lib/antlr:java-runtime",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/flogger:api",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/jgit/BUILD
View File

@ -8,6 +8,6 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"//lib:gson",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
],
)

2
java/com/google/gerrit/lucene/BUILD
View File

@ -33,11 +33,11 @@ java_library(
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/logging",
"//lib:guava",
"//lib:jgit",
"//lib:protobuf",
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/lucene:lucene-analyzers-common",
"//lib/lucene:lucene-core-and-backward-codecs",
"//lib/lucene:lucene-misc",

2
java/com/google/gerrit/metrics/BUILD
View File

@ -10,10 +10,10 @@ java_library(
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/server/logging",
"//lib:guava",
"//lib:jgit",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/flogger:api",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/pgm/BUILD
View File

@ -50,6 +50,7 @@ java_library(
"//java/com/google/gerrit/sshd",
"//lib:args4j",
"//lib:guava",
"//lib:jgit",
"//lib:protobuf",
"//lib:servlet-api-without-neverlink",
"//lib/auto:auto-value",
@ -58,7 +59,6 @@ java_library(
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:jsonevent-layout",
"//lib/log:log4j",
"//lib/prolog:cafeteria",

2
java/com/google/gerrit/pgm/http/jetty/BUILD
View File

@ -13,6 +13,7 @@ java_library(
"//java/com/google/gerrit/sshd",
"//java/com/google/gerrit/util/http",
"//lib:guava",
"//lib:jgit",
"//lib:servlet-api",
"//lib/flogger:api",
"//lib/guice",
@ -21,7 +22,6 @@ java_library(
"//lib/jetty:jmx",
"//lib/jetty:server",
"//lib/jetty:servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:log4j",
],
)

2
java/com/google/gerrit/pgm/init/BUILD
View File

@ -25,10 +25,10 @@ java_library(
"//java/com/google/gerrit/server/util/time",
"//lib:guava",
"//lib:h2",
"//lib:jgit",
"//lib/commons:validator",
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/pgm/init/api/BUILD
View File

@ -10,9 +10,9 @@ java_library(
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:jgit",
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/pgm/util/BUILD
View File

@ -19,9 +19,9 @@ java_library(
"//java/com/google/gerrit/util/cli",
"//lib:args4j",
"//lib:guava",
"//lib:jgit",
"//lib/flogger:api",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:jsonevent-layout",
"//lib/log:log4j",
],

2
java/com/google/gerrit/prettify/BUILD
View File

@ -6,6 +6,6 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
],
)

2
java/com/google/gerrit/reviewdb/BUILD
View File

@ -11,11 +11,11 @@ java_library(
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/extensions:api",
"//lib:guava",
"//lib:jgit",
"//lib:protobuf",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/errorprone:annotations",
"//lib/jgit/org.eclipse.jgit:jgit",
"//proto:entities_java_proto",
],
)

6
java/com/google/gerrit/server/BUILD
View File

@ -93,6 +93,8 @@ java_library(
"//lib:gson",
"//lib:guava",
"//lib:guava-retrying",
"//lib:jgit",
"//lib:jgit-archive",
"//lib:jsch",
"//lib:juniversalchardet",
"//lib:mime-util",
@ -114,8 +116,6 @@ java_library(
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jsoup",
"//lib/log:jsonevent-layout",
"//lib/log:log4j",
@ -146,9 +146,9 @@ java_library(
"//java/com/google/gerrit/server/restapi",
"//lib:blame-cache",
"//lib:guava",
"//lib:jgit",
"//lib:soy",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/server/account/externalids/testing/BUILD
View File

@ -8,6 +8,6 @@ java_library(
deps = [
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
],
)

2
java/com/google/gerrit/server/api/BUILD
View File

@ -17,9 +17,9 @@ java_library(
"//java/com/google/gerrit/util/cli",
"//lib:args4j",
"//lib:guava",
"//lib:jgit",
"//lib:servlet-api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

4
java/com/google/gerrit/server/audit/BUILD
View File

@ -44,6 +44,8 @@ java_library(
"//lib:gson",
"//lib:guava",
"//lib:guava-retrying",
"//lib:jgit",
"//lib:jgit-archive",
"//lib:jsch",
"//lib:juniversalchardet",
"//lib:mime-util",
@ -65,8 +67,6 @@ java_library(
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jsoup",
"//lib/log:jsonevent-layout",
"//lib/log:log4j",

2
java/com/google/gerrit/server/cache/h2/BUILD vendored
View File

@ -14,8 +14,8 @@ java_library(
"//java/com/google/gerrit/server/util/time",
"//lib:guava",
"//lib:h2",
"//lib:jgit",
"//lib/flogger:api",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/server/cache/mem/BUILD vendored
View File

@ -9,7 +9,7 @@ java_library(
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:jgit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/server/cache/serialize/BUILD vendored
View File

@ -9,7 +9,7 @@ java_library(
"//java/com/google/gerrit/git",
"//java/com/google/gerrit/proto",
"//lib:guava",
"//lib:jgit",
"//lib:protobuf",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/server/git/receive/BUILD
View File

@ -18,11 +18,11 @@ java_library(
"//java/com/google/gerrit/util/cli",
"//lib:args4j",
"//lib:guava",
"//lib:jgit",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/server/git/receive/testing/BUILD
View File

@ -7,8 +7,8 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"//lib:guava",
"//lib:jgit",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

4
java/com/google/gerrit/server/group/db/testing/BUILD
View File

@ -9,7 +9,7 @@ java_library(
deps = [
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib:jgit",
"//lib:jgit-junit",
],
)

2
java/com/google/gerrit/server/group/testing/BUILD
View File

@ -11,7 +11,7 @@ java_library(
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib/truth",
],
)

4
java/com/google/gerrit/server/ioutil/BUILD
View File

@ -8,7 +8,7 @@ java_library(
"//java/com/google/gerrit/reviewdb:server",
"//lib:automaton",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib:jgit-archive",
],
)

2
java/com/google/gerrit/server/logging/BUILD
View File

@ -11,10 +11,10 @@ java_library(
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/server/util/time",
"//lib:guava",
"//lib:jgit",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/flogger:api",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
java/com/google/gerrit/server/restapi/BUILD
View File

@ -30,6 +30,7 @@ java_library(
"//lib:blame-cache",
"//lib:gson",
"//lib:guava",
"//lib:jgit",
"//lib:servlet-api",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
@ -39,6 +40,5 @@ java_library(
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

4
java/com/google/gerrit/server/schema/BUILD
View File

@ -19,13 +19,13 @@ java_library(
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/logging",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-archive",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/commons:dbcp",
"//lib/flogger:api",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:jsonevent-layout",
"//lib/log:log4j",
],

2
java/com/google/gerrit/server/schema/testing/BUILD
View File

@ -10,7 +10,7 @@ java_library(
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib/truth",
],
)

2
java/com/google/gerrit/server/securestore/testing/BUILD
View File

@ -8,6 +8,6 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit/server",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
],
)

2
java/com/google/gerrit/server/util/git/BUILD
View File

@ -6,6 +6,6 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit/reviewdb:server",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
],
)

2
java/com/google/gerrit/server/util/time/BUILD
View File

@ -8,6 +8,6 @@ java_library(
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/server/util/git",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
],
)

4
java/com/google/gerrit/sshd/BUILD
View File

@ -25,6 +25,8 @@ java_library(
"//lib:args4j",
"//lib:gson",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-archive",
"//lib:jsch",
"//lib:servlet-api",
"//lib/auto:auto-value",
@ -36,8 +38,6 @@ java_library(
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet", # SSH should not depend on servlet
"//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:log4j",
"//lib/mina:core",
"//lib/mina:sshd",

4
java/com/google/gerrit/testing/BUILD
View File

@ -36,14 +36,14 @@ java_library(
"//java/com/google/gerrit/server/util/time",
"//lib:guava",
"//lib:h2",
"//lib:jgit",
"//lib:jgit-junit",
"//lib:junit",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/truth",
],
)

2
java/com/google/gerrit/truth/BUILD
View File

@ -8,7 +8,7 @@ java_library(
deps = [
"//java/com/google/gerrit/common:annotations",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib/truth",
],
)

2
java/gerrit/BUILD
View File

@ -9,8 +9,8 @@ java_library(
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:jgit",
"//lib/flogger:api",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/prolog:runtime",
"@guava//jar",
],

2
javatests/com/google/gerrit/acceptance/BUILD
View File

@ -9,7 +9,7 @@ junit_tests(
"//java/com/google/gerrit/testing:gerrit-test-util",
"//java/com/google/gerrit/truth",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib/truth",
],
)

6
javatests/com/google/gerrit/elasticsearch/BUILD
View File

@ -13,10 +13,10 @@ java_library(
"//java/com/google/gerrit/elasticsearch",
"//java/com/google/gerrit/index",
"//lib:guava",
"//lib:jgit",
"//lib:junit",
"//lib/guice",
"//lib/httpcomponents:httpcore",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/testcontainers",
"//lib/testcontainers:testcontainers-elasticsearch",
],
@ -27,7 +27,7 @@ ELASTICSEARCH_DEPS = [
"//java/com/google/gerrit/elasticsearch",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
]
QUERY_TESTS_DEP = "//javatests/com/google/gerrit/server/query/%s:abstract_query_tests"
@ -92,9 +92,9 @@ junit_tests(
"//java/com/google/gerrit/elasticsearch",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib/guice",
"//lib/httpcomponents:httpcore",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/truth",
],
)

8
javatests/com/google/gerrit/git/BUILD
View File

@ -11,9 +11,9 @@ junit_tests(
deps = [
"//java/com/google/gerrit/git",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-junit",
"//lib:junit",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/truth",
],
)
@ -29,8 +29,8 @@ junit_tests(
"//java/com/google/gerrit/git",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib:jgit",
"//lib:jgit-junit",
"//lib/truth",
],
)

4
javatests/com/google/gerrit/gpg/BUILD
View File

@ -16,6 +16,8 @@ junit_tests(
"//java/com/google/gerrit/server/schema",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-junit",
"//lib/bouncycastle:bcpg",
"//lib/bouncycastle:bcpg-neverlink",
"//lib/bouncycastle:bcprov",
@ -23,8 +25,6 @@ junit_tests(
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/truth",
],
)

4
javatests/com/google/gerrit/httpd/BUILD
View File

@ -11,14 +11,14 @@ junit_tests(
"//javatests/com/google/gerrit/util/http/testutil",
"//lib:gson",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-junit",
"//lib:jimfs",
"//lib:junit",
"//lib:servlet-api-without-neverlink",
"//lib:soy",
"//lib/guice",
"//lib/guice:guice-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/mockito",
"//lib/truth",
"//lib/truth:truth-java8-extension",

2
javatests/com/google/gerrit/index/BUILD
View File

@ -13,9 +13,9 @@ junit_tests(
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib:junit",
"//lib/antlr:java-runtime",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/truth",
],
)

4
javatests/com/google/gerrit/mail/BUILD
View File

@ -13,10 +13,10 @@ junit_tests(
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:gson",
"//lib:guava-retrying",
"//lib:jgit",
"//lib:jgit-junit",
"//lib/commons:codec",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/truth",
"//lib/truth:truth-java8-extension",
],

4
javatests/com/google/gerrit/pgm/BUILD
View File

@ -12,10 +12,10 @@ junit_tests(
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/securestore/testing",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-junit",
"//lib:junit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/mockito",
"//lib/truth",
],

2
javatests/com/google/gerrit/reviewdb/client/BUILD
View File

@ -7,7 +7,7 @@ junit_tests(
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib/truth",
],
)

2
javatests/com/google/gerrit/reviewdb/converter/BUILD
View File

@ -7,9 +7,9 @@ junit_tests(
"//java/com/google/gerrit/proto/testing",
"//java/com/google/gerrit/reviewdb:server",
"//lib:guava",
"//lib:jgit",
"//lib:protobuf",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/truth",
"//lib/truth:truth-proto-extension",
"//proto:entities_java_proto",

4
javatests/com/google/gerrit/server/BUILD
View File

@ -68,14 +68,14 @@ junit_tests(
"//lib:gson",
"//lib:guava",
"//lib:guava-retrying",
"//lib:jgit",
"//lib:jgit-junit",
"//lib:protobuf",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/commons:codec",
"//lib/flogger:api",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/mockito",
"//lib/truth",
"//lib/truth:truth-java8-extension",

2
javatests/com/google/gerrit/server/cache/serialize/BUILD vendored
View File

@ -8,11 +8,11 @@ junit_tests(
"//java/com/google/gerrit/server/cache/testing",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib:junit",
"//lib:protobuf",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/truth",
"//lib/truth:truth-proto-extension",
"//proto:cache_java_proto",

4
javatests/com/google/gerrit/server/group/db/BUILD
View File

@ -20,8 +20,8 @@ junit_tests(
"//java/com/google/gerrit/testing:gerrit-test-util",
"//java/com/google/gerrit/truth",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib:jgit",
"//lib:jgit-junit",
"//lib/truth",
],
)

4
javatests/com/google/gerrit/server/query/account/BUILD
View File

@ -21,8 +21,8 @@ java_library(
"//java/com/google/gerrit/server/schema",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/truth",
"//lib/truth:truth-java8-extension",
],
@ -40,7 +40,7 @@ junit_tests(
":abstract_query_tests",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:jgit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

10
javatests/com/google/gerrit/server/query/change/BUILD
View File

@ -29,9 +29,9 @@ java_library(
"//java/com/google/gerrit/server/util/time",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-junit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/truth",
],
)
@ -53,9 +53,9 @@ LUCENE_QUERY_TEST = [
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-junit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/truth",
],
) for f in LUCENE_QUERY_TEST]
@ -77,7 +77,7 @@ junit_tests(
"//java/com/google/gerrit/server/util/time",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit",
"//lib/truth",
"//lib/truth:truth-proto-extension",
"//proto:cache_java_proto",

4
javatests/com/google/gerrit/server/query/group/BUILD
View File

@ -18,8 +18,8 @@ java_library(
"//java/com/google/gerrit/server/schema",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/truth",
"//lib/truth:truth-java8-extension",
],
@ -37,7 +37,7 @@ junit_tests(
":abstract_query_tests",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:jgit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

4
javatests/com/google/gerrit/server/query/project/BUILD
View File

@ -19,8 +19,8 @@ java_library(
"//java/com/google/gerrit/server/schema",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/truth",
],
)
@ -37,7 +37,7 @@ junit_tests(
":abstract_query_tests",
"//java/com/google/gerrit/index/project",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:jgit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
javatests/com/google/gerrit/server/rules/BUILD
View File

@ -14,8 +14,8 @@ junit_tests(
"//java/com/google/gerrit/server/util/time",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/mockito",
"//lib/prolog:runtime",
"//lib/truth",

4
javatests/com/google/gerrit/server/update/BUILD
View File

@ -18,9 +18,9 @@ junit_tests(
"//java/com/google/gerrit/server/util/time",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:jgit",
"//lib:jgit-junit",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/truth",
"//lib/truth:truth-java8-extension",
],

4
javatests/com/google/gerrit/server/util/git/BUILD
View File

@ -13,13 +13,13 @@ junit_tests(
"//lib:gson",
"//lib:guava",
"//lib:guava-retrying",
"//lib:jgit",
"//lib:jgit-junit",
"//lib:protobuf",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
"//lib/commons:codec",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/truth",
"//lib/truth:truth-java8-extension",
"//lib/truth:truth-proto-extension",

2
javatests/com/google/gerrit/util/http/testutil/BUILD
View File

@ -7,8 +7,8 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"//lib:guava",
"//lib:jgit",
"//lib:servlet-api",
"//lib/httpcomponents:httpclient",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

43
lib/BUILD
View File

@ -35,6 +35,49 @@ java_library(
exports = ["@gson//jar"],
)
java_library(
name = "jgit",
data = ["//lib:LICENSE-jgit"],
visibility = ["//visibility:public"],
exports = ["@jgit//org.eclipse.jgit:jgit"],
runtime_deps = [
":javaewah",
"//lib/log:api",
],
)
java_library(
name = "jgit-archive",
data = ["//lib:LICENSE-jgit"],
visibility = ["//visibility:public"],
exports = ["@jgit//org.eclipse.jgit.archive:jgit-archive"],
runtime_deps = [":jgit"],
)
java_library(
name = "jgit-junit",
testonly = True,
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = ["@jgit//org.eclipse.jgit.junit:junit"],
runtime_deps = [":jgit"],
)
java_library(
name = "jgit-servlet",
data = ["//lib:LICENSE-jgit"],
visibility = ["//visibility:public"],
exports = ["@jgit//org.eclipse.jgit.http.server:jgit-servlet"],
runtime_deps = [":jgit"],
)
java_library(
name = "javaewah",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@javaewah//jar"],
)
java_library(
name = "protobuf",
data = ["//lib:LICENSE-protobuf"],

0
lib/jgit/BUILD
View File

75
lib/jgit/jgit.bzl
View File

@ -1,75 +0,0 @@
load("//tools/bzl:maven_jar.bzl", "MAVEN_CENTRAL", "maven_jar")
_JGIT_VERS = "5.4.3.201909031940-r"
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot
JGIT_DOC_URL = "https://download.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs"
_JGIT_REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL.
# set this to use a local version.
# "/home/<user>/projects/jgit"
LOCAL_JGIT_REPO = ""
def jgit_repos():
if LOCAL_JGIT_REPO:
native.local_repository(
name = "jgit",
path = LOCAL_JGIT_REPO,
)
jgit_maven_repos_dev()
else:
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",
)
maven_jar(
name = "jzlib",
artifact = "com.jcraft:jzlib:1.1.1",
sha1 = "a1551373315ffc2f96130a0e5704f74e151777ba",
)
def jgit_maven_repos():
maven_jar(
name = "jgit-lib",
artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "10322c4e103485f8b4873cbbf982342f9c3d7989",
)
maven_jar(
name = "jgit-servlet",
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "59d0c943343f30612e4e2a5a3bf1b95b56e00207",
)
maven_jar(
name = "jgit-archive",
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "21dc4a10882dc667c83bf82a563a6fc4d7719456",
)
maven_jar(
name = "jgit-junit",
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "71659fc1a1729b7c67846dac8cd6a762fa72002a",
)
def jgit_dep(name):
mapping = {
"@jgit-archive//jar": "@jgit//org.eclipse.jgit.archive:jgit-archive",
"@jgit-junit//jar": "@jgit//org.eclipse.jgit.junit:junit",
"@jgit-lib//jar": "@jgit//org.eclipse.jgit:jgit",
"@jgit-servlet//jar": "@jgit//org.eclipse.jgit.http.server:jgit-servlet",
}
if LOCAL_JGIT_REPO:
return mapping[name]
else:
return name

10
lib/jgit/org.eclipse.jgit.archive/BUILD
View File

@ -1,10 +0,0 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//lib/jgit:jgit.bzl", "jgit_dep")
java_library(
name = "jgit-archive",
data = ["//lib:LICENSE-jgit"],
visibility = ["//visibility:public"],
exports = [jgit_dep("@jgit-archive//jar")],
runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
)

10
lib/jgit/org.eclipse.jgit.http.server/BUILD
View File

@ -1,10 +0,0 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//lib/jgit:jgit.bzl", "jgit_dep")
java_library(
name = "jgit-servlet",
data = ["//lib:LICENSE-jgit"],
visibility = ["//visibility:public"],
exports = [jgit_dep("@jgit-servlet//jar")],
runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
)

11
lib/jgit/org.eclipse.jgit.junit/BUILD
View File

@ -1,11 +0,0 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//lib/jgit:jgit.bzl", "jgit_dep")
java_library(
name = "junit",
testonly = True,
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = [jgit_dep("@jgit-junit//jar")],
runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
)

20
lib/jgit/org.eclipse.jgit/BUILD
View File

@ -1,20 +0,0 @@
load("@rules_java//java:defs.bzl", "java_library")
load("//lib/jgit:jgit.bzl", "jgit_dep")
java_library(
name = "jgit",
data = ["//lib:LICENSE-jgit"],
visibility = ["//visibility:public"],
exports = [jgit_dep("@jgit-lib//jar")],
runtime_deps = [
":javaewah",
"//lib/log:api",
],
)
java_library(
name = "javaewah",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@javaewah//jar"],
)

2
lib/log/BUILD
View File

@ -4,7 +4,7 @@ java_library(
name = "api",
data = ["//lib:LICENSE-slf4j"],
visibility = [
"//lib/jgit/org.eclipse.jgit:__pkg__",
"//lib:__pkg__",
"//plugins:__pkg__",
],
exports = ["@log-api//jar"],

1
modules/jgit Submodule

@ -0,0 +1 @@
Subproject commit 009e07882fee2b0ad2ebe7ba44e2ff52c101f858

4
plugins/BUILD
View File

@ -68,8 +68,8 @@ EXPORTS = [
"//lib/httpcomponents:httpclient",
"//lib/httpcomponents:httpcore",
"//lib/jackson:jackson-core",
"//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib:jgit-servlet",
"//lib:jgit",
"//lib:jsr305",
"//lib/log:api",
"//lib/log:log4j",

20
tools/eclipse/project.py
View File

@ -172,13 +172,23 @@ def gen_classpath(ext):
impl = xml.dom.minidom.getDOMImplementation()
return impl.createDocument(None, 'classpath', None)
def classpathentry(kind, path, src=None, out=None, exported=None):
def import_jgit_sources():
classpathentry('src', 'modules/jgit/org.eclipse.jgit/src')
classpathentry('src', 'modules/jgit/org.eclipse.jgit/resources')
classpathentry('src', 'modules/jgit/org.eclipse.jgit.archive/src',
excluding='org/eclipse/jgit/archive/FormatActivator.java')
classpathentry('src', 'modules/jgit/org.eclipse.jgit.archive/resources')
classpathentry('src', 'modules/jgit/org.eclipse.jgit.http.server/src')
classpathentry('src', 'modules/jgit/org.eclipse.jgit.http.server/resources')
classpathentry('src', 'modules/jgit/org.eclipse.jgit.junit/src')
def classpathentry(kind, path, src=None, out=None, exported=None, excluding=None):
e = doc.createElement('classpathentry')
e.setAttribute('kind', kind)
# Excluding the BUILD file, to avoid the Eclipse warnings:
# "The resource is a duplicate of ..."
if kind == 'src':
e.setAttribute('excluding', '**/BUILD')
e.setAttribute('excluding', '**/BUILD' if not excluding else excluding)
e.setAttribute('path', path)
if src:
e.setAttribute('sourcepath', src)
@ -228,12 +238,9 @@ def gen_classpath(ext):
# Exceptions: both source and lib
if p.endswith('libquery_parser.jar') or \
p.endswith('libgerrit-prolog-common.jar') or \
p.endswith('com_google_protobuf/libprotobuf_java.jar') or \
p.endswith('com_google_protobuf/libprotobuf_java.jar') or \
p.endswith('lucene-core-and-backward-codecs__merged.jar'):
lib.add(p)
# JGit dependency from external repository
if 'gerrit-' not in p and 'jgit' in p:
lib.add(p)
if proto_library.match(p) :
proto.add(p)
else:
@ -249,6 +256,7 @@ def gen_classpath(ext):
classpathentry('src', 'java')
classpathentry('src', 'javatests', out='eclipse-out/test')
classpathentry('src', 'resources')
import_jgit_sources()
for s in sorted(src):
out = None