Link to JGit source as git submodule
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
diff --git a/.gitmodules b/.gitmodules
index 6844f6a..1bf9ba8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt
index e973924..ae8f3db 100644
--- a/Documentation/dev-bazel.txt
+++ b/Documentation/dev-bazel.txt
@@ -442,12 +442,6 @@
)
----
-[[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:
diff --git a/Documentation/licenses.txt b/Documentation/licenses.txt
index 45faecb..ac25816 100644
--- a/Documentation/licenses.txt
+++ b/Documentation/licenses.txt
@@ -73,7 +73,6 @@
* jetty:server
* jetty:servlet
* jetty:util
-* jgit/org.eclipse.jgit:javaewah
* log:json-smart
* log:jsonevent-layout
* log:log4j
@@ -96,6 +95,7 @@
* guava-retrying
* html-types
* j2objc
+* javaewah
* jsr305
* mime-util
* servlet-api
@@ -2438,9 +2438,9 @@
[[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]]
----
diff --git a/WORKSPACE b/WORKSPACE
index 8c9d313..00c905c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -104,6 +104,12 @@
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 @@
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",
diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD
index 9b57282..f857d66 100644
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@@ -46,6 +46,7 @@
"//lib:gson",
"//lib:guava-retrying",
"//lib:h2",
+ "//lib:jgit",
"//lib:jimfs",
"//lib:jsch",
"//lib:servlet-api-without-neverlink",
@@ -56,7 +57,6 @@
"//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/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 @@
"//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 @@
"//lib:args4j",
"//lib:gson",
"//lib:guava-retrying",
+ "//lib:jgit",
"//lib:jsch",
"//lib:servlet-api",
"//lib/commons:lang",
@@ -140,7 +141,6 @@
"//lib/guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
- "//lib/jgit/org.eclipse.jgit:jgit",
"//lib/mail",
"//lib/mina:sshd",
],
diff --git a/java/com/google/gerrit/acceptance/testsuite/project/BUILD b/java/com/google/gerrit/acceptance/testsuite/project/BUILD
index a0f09b0..8e482e0 100644
--- a/java/com/google/gerrit/acceptance/testsuite/project/BUILD
+++ b/java/com/google/gerrit/acceptance/testsuite/project/BUILD
@@ -13,10 +13,10 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/common/BUILD b/java/com/google/gerrit/common/BUILD
index 07bc0c3..8cf3d54 100644
--- a/java/com/google/gerrit/common/BUILD
+++ b/java/com/google/gerrit/common/BUILD
@@ -25,11 +25,11 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/elasticsearch/BUILD b/java/com/google/gerrit/elasticsearch/BUILD
index a9b145b..83ac779 100644
--- a/java/com/google/gerrit/elasticsearch/BUILD
+++ b/java/com/google/gerrit/elasticsearch/BUILD
@@ -17,6 +17,7 @@
"//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
+ "//lib:jgit",
"//lib:protobuf",
"//lib/commons:codec",
"//lib/commons:lang",
@@ -29,6 +30,5 @@
"//lib/httpcomponents:httpcore",
"//lib/httpcomponents:httpcore-nio",
"//lib/jackson:jackson-core",
- "//lib/jgit/org.eclipse.jgit:jgit",
],
)
diff --git a/java/com/google/gerrit/extensions/BUILD b/java/com/google/gerrit/extensions/BUILD
index b5e5863..3683449 100644
--- a/java/com/google/gerrit/extensions/BUILD
+++ b/java/com/google/gerrit/extensions/BUILD
@@ -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",
diff --git a/java/com/google/gerrit/extensions/common/testing/BUILD b/java/com/google/gerrit/extensions/common/testing/BUILD
index 9cecb66..c976de0 100644
--- a/java/com/google/gerrit/extensions/common/testing/BUILD
+++ b/java/com/google/gerrit/extensions/common/testing/BUILD
@@ -9,7 +9,7 @@
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/truth",
"//lib:guava",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
"//lib/truth",
],
)
diff --git a/java/com/google/gerrit/git/BUILD b/java/com/google/gerrit/git/BUILD
index 1edba38..0574716 100644
--- a/java/com/google/gerrit/git/BUILD
+++ b/java/com/google/gerrit/git/BUILD
@@ -7,8 +7,8 @@
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",
],
)
diff --git a/java/com/google/gerrit/git/testing/BUILD b/java/com/google/gerrit/git/testing/BUILD
index 13fddc1..fda9aff 100644
--- a/java/com/google/gerrit/git/testing/BUILD
+++ b/java/com/google/gerrit/git/testing/BUILD
@@ -9,7 +9,7 @@
deps = [
"//java/com/google/gerrit/common:annotations",
"//lib:guava",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
"//lib/truth",
"//lib/truth:truth-java8-extension",
],
diff --git a/java/com/google/gerrit/gpg/BUILD b/java/com/google/gerrit/gpg/BUILD
index a9854fc..5258d3f 100644
--- a/java/com/google/gerrit/gpg/BUILD
+++ b/java/com/google/gerrit/gpg/BUILD
@@ -12,11 +12,11 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/gpg/testing/BUILD b/java/com/google/gerrit/gpg/testing/BUILD
index b227dd5..dc39071 100644
--- a/java/com/google/gerrit/gpg/testing/BUILD
+++ b/java/com/google/gerrit/gpg/testing/BUILD
@@ -8,7 +8,7 @@
deps = [
"//java/com/google/gerrit/gpg",
"//lib:guava",
+ "//lib:jgit",
"//lib/bouncycastle:bcpg-neverlink",
- "//lib/jgit/org.eclipse.jgit:jgit",
],
)
diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD
index c0b207f..a52bf02 100644
--- a/java/com/google/gerrit/httpd/BUILD
+++ b/java/com/google/gerrit/httpd/BUILD
@@ -31,6 +31,8 @@
"//lib:args4j",
"//lib:gson",
"//lib:guava",
+ "//lib:jgit",
+ "//lib:jgit-servlet",
"//lib:jsch",
"//lib:servlet-api",
"//lib:soy",
@@ -42,7 +44,5 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/httpd/auth/oauth/BUILD b/java/com/google/gerrit/httpd/auth/oauth/BUILD
index 74c6776..0b76444 100644
--- a/java/com/google/gerrit/httpd/auth/oauth/BUILD
+++ b/java/com/google/gerrit/httpd/auth/oauth/BUILD
@@ -14,11 +14,11 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/httpd/auth/openid/BUILD b/java/com/google/gerrit/httpd/auth/openid/BUILD
index c044788..31a5edc 100644
--- a/java/com/google/gerrit/httpd/auth/openid/BUILD
+++ b/java/com/google/gerrit/httpd/auth/openid/BUILD
@@ -21,7 +21,7 @@
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-servlet",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
"//lib/openid:consumer",
],
)
diff --git a/java/com/google/gerrit/httpd/init/BUILD b/java/com/google/gerrit/httpd/init/BUILD
index 4175672..222041a 100644
--- a/java/com/google/gerrit/httpd/init/BUILD
+++ b/java/com/google/gerrit/httpd/init/BUILD
@@ -27,10 +27,10 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/index/BUILD b/java/com/google/gerrit/index/BUILD
index 5b6aae5..7011f1c 100644
--- a/java/com/google/gerrit/index/BUILD
+++ b/java/com/google/gerrit/index/BUILD
@@ -30,10 +30,10 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/jgit/BUILD b/java/com/google/gerrit/jgit/BUILD
index e67ebfe..1041f1f 100644
--- a/java/com/google/gerrit/jgit/BUILD
+++ b/java/com/google/gerrit/jgit/BUILD
@@ -8,6 +8,6 @@
visibility = ["//visibility:public"],
deps = [
"//lib:gson",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
],
)
diff --git a/java/com/google/gerrit/lucene/BUILD b/java/com/google/gerrit/lucene/BUILD
index 28586a3..39626e9 100644
--- a/java/com/google/gerrit/lucene/BUILD
+++ b/java/com/google/gerrit/lucene/BUILD
@@ -33,11 +33,11 @@
"//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",
diff --git a/java/com/google/gerrit/metrics/BUILD b/java/com/google/gerrit/metrics/BUILD
index 9cc7654..3cc056b 100644
--- a/java/com/google/gerrit/metrics/BUILD
+++ b/java/com/google/gerrit/metrics/BUILD
@@ -10,10 +10,10 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD
index a116f4a..a146ba7 100644
--- a/java/com/google/gerrit/pgm/BUILD
+++ b/java/com/google/gerrit/pgm/BUILD
@@ -50,6 +50,7 @@
"//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 @@
"//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",
diff --git a/java/com/google/gerrit/pgm/http/jetty/BUILD b/java/com/google/gerrit/pgm/http/jetty/BUILD
index 3b89644..7b1c3eb 100644
--- a/java/com/google/gerrit/pgm/http/jetty/BUILD
+++ b/java/com/google/gerrit/pgm/http/jetty/BUILD
@@ -13,6 +13,7 @@
"//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 @@
"//lib/jetty:jmx",
"//lib/jetty:server",
"//lib/jetty:servlet",
- "//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:log4j",
],
)
diff --git a/java/com/google/gerrit/pgm/init/BUILD b/java/com/google/gerrit/pgm/init/BUILD
index eb0d49e..a98ad23 100644
--- a/java/com/google/gerrit/pgm/init/BUILD
+++ b/java/com/google/gerrit/pgm/init/BUILD
@@ -25,10 +25,10 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/pgm/init/api/BUILD b/java/com/google/gerrit/pgm/init/api/BUILD
index 0a11c83..11694c3 100644
--- a/java/com/google/gerrit/pgm/init/api/BUILD
+++ b/java/com/google/gerrit/pgm/init/api/BUILD
@@ -10,9 +10,9 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/pgm/util/BUILD b/java/com/google/gerrit/pgm/util/BUILD
index 60fb5e4..11e1d8e 100644
--- a/java/com/google/gerrit/pgm/util/BUILD
+++ b/java/com/google/gerrit/pgm/util/BUILD
@@ -19,9 +19,9 @@
"//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",
],
diff --git a/java/com/google/gerrit/prettify/BUILD b/java/com/google/gerrit/prettify/BUILD
index 7440032..7c1241a 100644
--- a/java/com/google/gerrit/prettify/BUILD
+++ b/java/com/google/gerrit/prettify/BUILD
@@ -6,6 +6,6 @@
visibility = ["//visibility:public"],
deps = [
"//lib:guava",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
],
)
diff --git a/java/com/google/gerrit/reviewdb/BUILD b/java/com/google/gerrit/reviewdb/BUILD
index 4028448..2486e29 100644
--- a/java/com/google/gerrit/reviewdb/BUILD
+++ b/java/com/google/gerrit/reviewdb/BUILD
@@ -11,11 +11,11 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/server/BUILD b/java/com/google/gerrit/server/BUILD
index 88e2d1c..30b47e0 100644
--- a/java/com/google/gerrit/server/BUILD
+++ b/java/com/google/gerrit/server/BUILD
@@ -93,6 +93,8 @@
"//lib:gson",
"//lib:guava",
"//lib:guava-retrying",
+ "//lib:jgit",
+ "//lib:jgit-archive",
"//lib:jsch",
"//lib:juniversalchardet",
"//lib:mime-util",
@@ -114,8 +116,6 @@
"//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/com/google/gerrit/server/restapi",
"//lib:blame-cache",
"//lib:guava",
+ "//lib:jgit",
"//lib:soy",
"//lib/guice",
- "//lib/jgit/org.eclipse.jgit:jgit",
],
)
diff --git a/java/com/google/gerrit/server/account/externalids/testing/BUILD b/java/com/google/gerrit/server/account/externalids/testing/BUILD
index 6e59d22..b056e66 100644
--- a/java/com/google/gerrit/server/account/externalids/testing/BUILD
+++ b/java/com/google/gerrit/server/account/externalids/testing/BUILD
@@ -8,6 +8,6 @@
deps = [
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
],
)
diff --git a/java/com/google/gerrit/server/api/BUILD b/java/com/google/gerrit/server/api/BUILD
index 37e04bb..b03f4ea 100644
--- a/java/com/google/gerrit/server/api/BUILD
+++ b/java/com/google/gerrit/server/api/BUILD
@@ -17,9 +17,9 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/server/audit/BUILD b/java/com/google/gerrit/server/audit/BUILD
index 7693ca1..cc89bb1 100644
--- a/java/com/google/gerrit/server/audit/BUILD
+++ b/java/com/google/gerrit/server/audit/BUILD
@@ -44,6 +44,8 @@
"//lib:gson",
"//lib:guava",
"//lib:guava-retrying",
+ "//lib:jgit",
+ "//lib:jgit-archive",
"//lib:jsch",
"//lib:juniversalchardet",
"//lib:mime-util",
@@ -65,8 +67,6 @@
"//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",
diff --git a/java/com/google/gerrit/server/cache/h2/BUILD b/java/com/google/gerrit/server/cache/h2/BUILD
index a191f75..5e64aa7 100644
--- a/java/com/google/gerrit/server/cache/h2/BUILD
+++ b/java/com/google/gerrit/server/cache/h2/BUILD
@@ -14,8 +14,8 @@
"//java/com/google/gerrit/server/util/time",
"//lib:guava",
"//lib:h2",
+ "//lib:jgit",
"//lib/flogger:api",
"//lib/guice",
- "//lib/jgit/org.eclipse.jgit:jgit",
],
)
diff --git a/java/com/google/gerrit/server/cache/mem/BUILD b/java/com/google/gerrit/server/cache/mem/BUILD
index eb0695e..d805e1f 100644
--- a/java/com/google/gerrit/server/cache/mem/BUILD
+++ b/java/com/google/gerrit/server/cache/mem/BUILD
@@ -9,7 +9,7 @@
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/server",
"//lib:guava",
+ "//lib:jgit",
"//lib/guice",
- "//lib/jgit/org.eclipse.jgit:jgit",
],
)
diff --git a/java/com/google/gerrit/server/cache/serialize/BUILD b/java/com/google/gerrit/server/cache/serialize/BUILD
index 3547605..aa9106b 100644
--- a/java/com/google/gerrit/server/cache/serialize/BUILD
+++ b/java/com/google/gerrit/server/cache/serialize/BUILD
@@ -9,7 +9,7 @@
"//java/com/google/gerrit/git",
"//java/com/google/gerrit/proto",
"//lib:guava",
+ "//lib:jgit",
"//lib:protobuf",
- "//lib/jgit/org.eclipse.jgit:jgit",
],
)
diff --git a/java/com/google/gerrit/server/git/receive/BUILD b/java/com/google/gerrit/server/git/receive/BUILD
index 3f7d864..23ba115 100644
--- a/java/com/google/gerrit/server/git/receive/BUILD
+++ b/java/com/google/gerrit/server/git/receive/BUILD
@@ -18,11 +18,11 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/server/git/receive/testing/BUILD b/java/com/google/gerrit/server/git/receive/testing/BUILD
index a5e7998..06407ae 100644
--- a/java/com/google/gerrit/server/git/receive/testing/BUILD
+++ b/java/com/google/gerrit/server/git/receive/testing/BUILD
@@ -7,8 +7,8 @@
visibility = ["//visibility:public"],
deps = [
"//lib:guava",
+ "//lib:jgit",
"//lib/auto:auto-value",
"//lib/auto:auto-value-annotations",
- "//lib/jgit/org.eclipse.jgit:jgit",
],
)
diff --git a/java/com/google/gerrit/server/group/db/testing/BUILD b/java/com/google/gerrit/server/group/db/testing/BUILD
index 0cc45fd..8f33f98 100644
--- a/java/com/google/gerrit/server/group/db/testing/BUILD
+++ b/java/com/google/gerrit/server/group/db/testing/BUILD
@@ -9,7 +9,7 @@
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",
],
)
diff --git a/java/com/google/gerrit/server/group/testing/BUILD b/java/com/google/gerrit/server/group/testing/BUILD
index 9b6d8de..abd12c1 100644
--- a/java/com/google/gerrit/server/group/testing/BUILD
+++ b/java/com/google/gerrit/server/group/testing/BUILD
@@ -11,7 +11,7 @@
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
"//lib/truth",
],
)
diff --git a/java/com/google/gerrit/server/ioutil/BUILD b/java/com/google/gerrit/server/ioutil/BUILD
index ed58d5b..ef4ae96 100644
--- a/java/com/google/gerrit/server/ioutil/BUILD
+++ b/java/com/google/gerrit/server/ioutil/BUILD
@@ -8,7 +8,7 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/server/logging/BUILD b/java/com/google/gerrit/server/logging/BUILD
index c214d69..2c2341f 100644
--- a/java/com/google/gerrit/server/logging/BUILD
+++ b/java/com/google/gerrit/server/logging/BUILD
@@ -11,10 +11,10 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/server/restapi/BUILD b/java/com/google/gerrit/server/restapi/BUILD
index c5d366f..8bcd69c 100644
--- a/java/com/google/gerrit/server/restapi/BUILD
+++ b/java/com/google/gerrit/server/restapi/BUILD
@@ -30,6 +30,7 @@
"//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 @@
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
- "//lib/jgit/org.eclipse.jgit:jgit",
],
)
diff --git a/java/com/google/gerrit/server/schema/BUILD b/java/com/google/gerrit/server/schema/BUILD
index e12b0fb..f0ea7ca 100644
--- a/java/com/google/gerrit/server/schema/BUILD
+++ b/java/com/google/gerrit/server/schema/BUILD
@@ -19,13 +19,13 @@
"//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",
],
diff --git a/java/com/google/gerrit/server/schema/testing/BUILD b/java/com/google/gerrit/server/schema/testing/BUILD
index d641c47..82808aa 100644
--- a/java/com/google/gerrit/server/schema/testing/BUILD
+++ b/java/com/google/gerrit/server/schema/testing/BUILD
@@ -10,7 +10,7 @@
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
"//lib/truth",
],
)
diff --git a/java/com/google/gerrit/server/securestore/testing/BUILD b/java/com/google/gerrit/server/securestore/testing/BUILD
index c2582b9..9afc44a 100644
--- a/java/com/google/gerrit/server/securestore/testing/BUILD
+++ b/java/com/google/gerrit/server/securestore/testing/BUILD
@@ -8,6 +8,6 @@
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit/server",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
],
)
diff --git a/java/com/google/gerrit/server/util/git/BUILD b/java/com/google/gerrit/server/util/git/BUILD
index a8ae918..b8fa603 100644
--- a/java/com/google/gerrit/server/util/git/BUILD
+++ b/java/com/google/gerrit/server/util/git/BUILD
@@ -6,6 +6,6 @@
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit/reviewdb:server",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
],
)
diff --git a/java/com/google/gerrit/server/util/time/BUILD b/java/com/google/gerrit/server/util/time/BUILD
index d00b42d..b1126f0 100644
--- a/java/com/google/gerrit/server/util/time/BUILD
+++ b/java/com/google/gerrit/server/util/time/BUILD
@@ -8,6 +8,6 @@
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/server/util/git",
"//lib:guava",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
],
)
diff --git a/java/com/google/gerrit/sshd/BUILD b/java/com/google/gerrit/sshd/BUILD
index 370bfdb..3f59736 100644
--- a/java/com/google/gerrit/sshd/BUILD
+++ b/java/com/google/gerrit/sshd/BUILD
@@ -25,6 +25,8 @@
"//lib:args4j",
"//lib:gson",
"//lib:guava",
+ "//lib:jgit",
+ "//lib:jgit-archive",
"//lib:jsch",
"//lib:servlet-api",
"//lib/auto:auto-value",
@@ -36,8 +38,6 @@
"//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",
diff --git a/java/com/google/gerrit/testing/BUILD b/java/com/google/gerrit/testing/BUILD
index a26b060..fa6f6f6 100644
--- a/java/com/google/gerrit/testing/BUILD
+++ b/java/com/google/gerrit/testing/BUILD
@@ -36,14 +36,14 @@
"//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",
],
)
diff --git a/java/com/google/gerrit/truth/BUILD b/java/com/google/gerrit/truth/BUILD
index 7c0e743..b0dfef0 100644
--- a/java/com/google/gerrit/truth/BUILD
+++ b/java/com/google/gerrit/truth/BUILD
@@ -8,7 +8,7 @@
deps = [
"//java/com/google/gerrit/common:annotations",
"//lib:guava",
- "//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib:jgit",
"//lib/truth",
],
)
diff --git a/java/gerrit/BUILD b/java/gerrit/BUILD
index 69b6951..babecd4 100644
--- a/java/gerrit/BUILD
+++ b/java/gerrit/BUILD
@@ -9,8 +9,8 @@
"//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",
],
diff --git a/javatests/com/google/gerrit/acceptance/BUILD b/javatests/com/google/gerrit/acceptance/BUILD
index 405610b..75c90f2 100644
--- a/javatests/com/google/gerrit/acceptance/BUILD
+++ b/javatests/com/google/gerrit/acceptance/BUILD
@@ -9,7 +9,7 @@
"//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",
],
)
diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD
index cae7ebd..955930b 100644
--- a/javatests/com/google/gerrit/elasticsearch/BUILD
+++ b/javatests/com/google/gerrit/elasticsearch/BUILD
@@ -13,10 +13,10 @@
"//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 @@
"//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 @@
"//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",
],
)
diff --git a/javatests/com/google/gerrit/git/BUILD b/javatests/com/google/gerrit/git/BUILD
index 4ac13af..c2c9cce 100644
--- a/javatests/com/google/gerrit/git/BUILD
+++ b/javatests/com/google/gerrit/git/BUILD
@@ -11,9 +11,9 @@
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 @@
"//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",
],
)
diff --git a/javatests/com/google/gerrit/gpg/BUILD b/javatests/com/google/gerrit/gpg/BUILD
index f6926d3..9875ddb 100644
--- a/javatests/com/google/gerrit/gpg/BUILD
+++ b/javatests/com/google/gerrit/gpg/BUILD
@@ -16,6 +16,8 @@
"//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 @@
"//lib/flogger:api",
"//lib/guice",
"//lib/guice:guice-assistedinject",
- "//lib/jgit/org.eclipse.jgit:jgit",
- "//lib/jgit/org.eclipse.jgit.junit:junit",
"//lib/truth",
],
)
diff --git a/javatests/com/google/gerrit/httpd/BUILD b/javatests/com/google/gerrit/httpd/BUILD
index f1d0f2a..d751890 100644
--- a/javatests/com/google/gerrit/httpd/BUILD
+++ b/javatests/com/google/gerrit/httpd/BUILD
@@ -11,14 +11,14 @@
"//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",
diff --git a/javatests/com/google/gerrit/index/BUILD b/javatests/com/google/gerrit/index/BUILD
index a77525e..861e768 100644
--- a/javatests/com/google/gerrit/index/BUILD
+++ b/javatests/com/google/gerrit/index/BUILD
@@ -13,9 +13,9 @@
"//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",
],
)
diff --git a/javatests/com/google/gerrit/mail/BUILD b/javatests/com/google/gerrit/mail/BUILD
index b1c9712..a7e3b0a 100644
--- a/javatests/com/google/gerrit/mail/BUILD
+++ b/javatests/com/google/gerrit/mail/BUILD
@@ -13,10 +13,10 @@
"//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",
],
diff --git a/javatests/com/google/gerrit/pgm/BUILD b/javatests/com/google/gerrit/pgm/BUILD
index d2e8b2f..eb0bf25 100644
--- a/javatests/com/google/gerrit/pgm/BUILD
+++ b/javatests/com/google/gerrit/pgm/BUILD
@@ -12,10 +12,10 @@
"//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",
],
diff --git a/javatests/com/google/gerrit/reviewdb/client/BUILD b/javatests/com/google/gerrit/reviewdb/client/BUILD
index 8d3ce48..247b5b9 100644
--- a/javatests/com/google/gerrit/reviewdb/client/BUILD
+++ b/javatests/com/google/gerrit/reviewdb/client/BUILD
@@ -7,7 +7,7 @@
"//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",
],
)
diff --git a/javatests/com/google/gerrit/reviewdb/converter/BUILD b/javatests/com/google/gerrit/reviewdb/converter/BUILD
index e745344..9907c0e 100644
--- a/javatests/com/google/gerrit/reviewdb/converter/BUILD
+++ b/javatests/com/google/gerrit/reviewdb/converter/BUILD
@@ -7,9 +7,9 @@
"//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",
diff --git a/javatests/com/google/gerrit/server/BUILD b/javatests/com/google/gerrit/server/BUILD
index 9445a8f..92ddfdb 100644
--- a/javatests/com/google/gerrit/server/BUILD
+++ b/javatests/com/google/gerrit/server/BUILD
@@ -68,14 +68,14 @@
"//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",
diff --git a/javatests/com/google/gerrit/server/cache/serialize/BUILD b/javatests/com/google/gerrit/server/cache/serialize/BUILD
index 271c27d..81f577e 100644
--- a/javatests/com/google/gerrit/server/cache/serialize/BUILD
+++ b/javatests/com/google/gerrit/server/cache/serialize/BUILD
@@ -8,11 +8,11 @@
"//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",
diff --git a/javatests/com/google/gerrit/server/group/db/BUILD b/javatests/com/google/gerrit/server/group/db/BUILD
index b4652c9..1e67109 100644
--- a/javatests/com/google/gerrit/server/group/db/BUILD
+++ b/javatests/com/google/gerrit/server/group/db/BUILD
@@ -20,8 +20,8 @@
"//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",
],
)
diff --git a/javatests/com/google/gerrit/server/query/account/BUILD b/javatests/com/google/gerrit/server/query/account/BUILD
index 99c6bd9..c10ff9d 100644
--- a/javatests/com/google/gerrit/server/query/account/BUILD
+++ b/javatests/com/google/gerrit/server/query/account/BUILD
@@ -21,8 +21,8 @@
"//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 @@
":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",
],
)
diff --git a/javatests/com/google/gerrit/server/query/change/BUILD b/javatests/com/google/gerrit/server/query/change/BUILD
index ba31271..f83ae36 100644
--- a/javatests/com/google/gerrit/server/query/change/BUILD
+++ b/javatests/com/google/gerrit/server/query/change/BUILD
@@ -29,9 +29,9 @@
"//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 @@
"//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 @@
"//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",
diff --git a/javatests/com/google/gerrit/server/query/group/BUILD b/javatests/com/google/gerrit/server/query/group/BUILD
index 528bd1e..194a129 100644
--- a/javatests/com/google/gerrit/server/query/group/BUILD
+++ b/javatests/com/google/gerrit/server/query/group/BUILD
@@ -18,8 +18,8 @@
"//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 @@
":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",
],
)
diff --git a/javatests/com/google/gerrit/server/query/project/BUILD b/javatests/com/google/gerrit/server/query/project/BUILD
index dc38a33..2ab1093 100644
--- a/javatests/com/google/gerrit/server/query/project/BUILD
+++ b/javatests/com/google/gerrit/server/query/project/BUILD
@@ -19,8 +19,8 @@
"//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 @@
":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",
],
)
diff --git a/javatests/com/google/gerrit/server/rules/BUILD b/javatests/com/google/gerrit/server/rules/BUILD
index 10bf54f..7da3088 100644
--- a/javatests/com/google/gerrit/server/rules/BUILD
+++ b/javatests/com/google/gerrit/server/rules/BUILD
@@ -14,8 +14,8 @@
"//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",
diff --git a/javatests/com/google/gerrit/server/update/BUILD b/javatests/com/google/gerrit/server/update/BUILD
index e613981..73b4369 100644
--- a/javatests/com/google/gerrit/server/update/BUILD
+++ b/javatests/com/google/gerrit/server/update/BUILD
@@ -18,9 +18,9 @@
"//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",
],
diff --git a/javatests/com/google/gerrit/server/util/git/BUILD b/javatests/com/google/gerrit/server/util/git/BUILD
index 1cf8890..1d5c30e 100644
--- a/javatests/com/google/gerrit/server/util/git/BUILD
+++ b/javatests/com/google/gerrit/server/util/git/BUILD
@@ -13,13 +13,13 @@
"//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",
diff --git a/javatests/com/google/gerrit/util/http/testutil/BUILD b/javatests/com/google/gerrit/util/http/testutil/BUILD
index d7ac5bd..3a67d45 100644
--- a/javatests/com/google/gerrit/util/http/testutil/BUILD
+++ b/javatests/com/google/gerrit/util/http/testutil/BUILD
@@ -7,8 +7,8 @@
visibility = ["//visibility:public"],
deps = [
"//lib:guava",
+ "//lib:jgit",
"//lib:servlet-api",
"//lib/httpcomponents:httpclient",
- "//lib/jgit/org.eclipse.jgit:jgit",
],
)
diff --git a/lib/BUILD b/lib/BUILD
index ce9c72b..13580b1 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -36,6 +36,49 @@
)
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"],
visibility = ["//visibility:public"],
diff --git a/lib/jgit/BUILD b/lib/jgit/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/lib/jgit/BUILD
+++ /dev/null
diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl
deleted file mode 100644
index b3d026d..0000000
--- a/lib/jgit/jgit.bzl
+++ /dev/null
@@ -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
diff --git a/lib/jgit/org.eclipse.jgit.archive/BUILD b/lib/jgit/org.eclipse.jgit.archive/BUILD
deleted file mode 100644
index 151cd71..0000000
--- a/lib/jgit/org.eclipse.jgit.archive/BUILD
+++ /dev/null
@@ -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"],
-)
diff --git a/lib/jgit/org.eclipse.jgit.http.server/BUILD b/lib/jgit/org.eclipse.jgit.http.server/BUILD
deleted file mode 100644
index fd634a5..0000000
--- a/lib/jgit/org.eclipse.jgit.http.server/BUILD
+++ /dev/null
@@ -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"],
-)
diff --git a/lib/jgit/org.eclipse.jgit.junit/BUILD b/lib/jgit/org.eclipse.jgit.junit/BUILD
deleted file mode 100644
index abc522b..0000000
--- a/lib/jgit/org.eclipse.jgit.junit/BUILD
+++ /dev/null
@@ -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"],
-)
diff --git a/lib/jgit/org.eclipse.jgit/BUILD b/lib/jgit/org.eclipse.jgit/BUILD
deleted file mode 100644
index c1f2607..0000000
--- a/lib/jgit/org.eclipse.jgit/BUILD
+++ /dev/null
@@ -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"],
-)
diff --git a/lib/log/BUILD b/lib/log/BUILD
index 128e8ba..e768d9a 100644
--- a/lib/log/BUILD
+++ b/lib/log/BUILD
@@ -4,7 +4,7 @@
name = "api",
data = ["//lib:LICENSE-slf4j"],
visibility = [
- "//lib/jgit/org.eclipse.jgit:__pkg__",
+ "//lib:__pkg__",
"//plugins:__pkg__",
],
exports = ["@log-api//jar"],
diff --git a/modules/jgit b/modules/jgit
new file mode 160000
index 0000000..009e078
--- /dev/null
+++ b/modules/jgit
@@ -0,0 +1 @@
+Subproject commit 009e07882fee2b0ad2ebe7ba44e2ff52c101f858
diff --git a/plugins/BUILD b/plugins/BUILD
index 9f95c8b..86c254c 100644
--- a/plugins/BUILD
+++ b/plugins/BUILD
@@ -68,8 +68,8 @@
"//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",
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index 2448c15..0bc41fc 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -172,13 +172,23 @@
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 @@
# 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 @@
classpathentry('src', 'java')
classpathentry('src', 'javatests', out='eclipse-out/test')
classpathentry('src', 'resources')
+ import_jgit_sources()
for s in sorted(src):
out = None
