Dissolve gerrit-patch-jgit top-level directory

Change-Id: If6f09473e9621912e7eb769a92c17545db2716f6

gerrit-common/BUILD

@@ -43,10 +43,10 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         ":annotations",
-        "//gerrit-patch-jgit:server",
         "//gerrit-prettify:server",
         "//gerrit-reviewdb:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/org/eclipse/jgit:server",
         "//lib:guava",
         "//lib:gwtjsonrpc",
         "//lib:gwtorm",

gerrit-httpd/BUILD

@@ -22,7 +22,6 @@ java_library(
         "//gerrit-gwtexpui:server",
         "//gerrit-index:query_exception",
         "//gerrit-launcher:launcher",
-        "//gerrit-patch-jgit:server",
         "//gerrit-prettify:server",
         "//gerrit-reviewdb:server",
         "//gerrit-server:metrics",
@@ -31,6 +30,7 @@ java_library(
         "//gerrit-util-cli:cli",
         "//gerrit-util-http:http",
         "//java/com/google/gerrit/extensions:api",
+        "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:gson",
         "//lib:guava",

gerrit-plugin-gwtui/BUILD

@@ -23,14 +23,14 @@ java_library2(
     deps = DEPS + [
         "//gerrit-common:libclient-src.jar",
         "//java/com/google/gerrit/extensions:libclient-src.jar",
+        "//java/org/eclipse/jgit:libclient-src.jar",
+        "//java/org/eclipse/jgit:libEdit-src.jar",
         "//gerrit-gwtexpui:libClippy-src.jar",
         "//gerrit-gwtexpui:libGlobalKey-src.jar",
         "//gerrit-gwtexpui:libProgress-src.jar",
         "//gerrit-gwtexpui:libSafeHtml-src.jar",
         "//gerrit-gwtexpui:libUserAgent-src.jar",
         "//gerrit-gwtui-common:libclient-src.jar",
-        "//gerrit-patch-jgit:libclient-src.jar",
-        "//gerrit-patch-jgit:libEdit-src.jar",
         "//gerrit-prettify:libclient-src.jar",
         "//gerrit-reviewdb:libclient-src.jar",
         "//lib/gwt:dev-neverlink",

gerrit-prettify/BUILD

@@ -9,10 +9,10 @@ gwt_module(
     ]),
     exported_deps = [
         "//gerrit-gwtexpui:SafeHtml",
-        "//gerrit-patch-jgit:Edit",
-        "//gerrit-patch-jgit:client",
         "//gerrit-reviewdb:client",
         "//java/com/google/gerrit/extensions:client",
+        "//java/org/eclipse/jgit:Edit",
+        "//java/org/eclipse/jgit:client",
         "//lib:gwtjsonrpc",
         "//lib:gwtjsonrpc_src",
     ],
@@ -26,8 +26,8 @@ java_library(
     srcs = glob([SRC + "common/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-patch-jgit:server",
         "//gerrit-reviewdb:server",
+        "//java/org/eclipse/jgit:server",
         "//lib:guava",
         "//lib:gwtjsonrpc",
         "//lib/jgit/org.eclipse.jgit:jgit",

gerrit-server/BUILD

@@ -45,12 +45,12 @@ java_library(
         "//gerrit-index:index",
         "//gerrit-index:query_exception",
         "//gerrit-patch-commonsnet:commons-net",
-        "//gerrit-patch-jgit:server",
         "//gerrit-prettify:server",
         "//gerrit-reviewdb:server",
         "//gerrit-util-cli:cli",
         "//gerrit-util-ssl:ssl",
         "//java/com/google/gerrit/extensions:api",
+        "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:automaton",
         "//lib:blame-cache",
@@ -298,7 +298,7 @@ junit_tests(
         ":custom-truth-subjects",
         ":testutil",
         "//gerrit-index:query_exception",
-        "//gerrit-patch-jgit:server",
+        "//java/org/eclipse/jgit:server",
         "//java/com/google/gerrit/extensions/common/testing:common-test-util",
         "//lib:args4j",
         "//lib:grappa",

gerrit-sshd/BUILD

@@ -11,13 +11,13 @@ java_library(
         "//gerrit-common:annotations",
         "//gerrit-common:server",
         "//gerrit-lucene:lucene",
-        "//gerrit-patch-jgit:server",
         "//gerrit-reviewdb:server",
         "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-util-cli:cli",
         "//java/com/google/gerrit/extensions:api",
+        "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:gson",
         "//lib:guava",

java/org/eclipse/jgit/BUILD

@@ -1,15 +1,13 @@
 load("//tools/bzl:genrule2.bzl", "genrule2")
 load("//tools/bzl:gwt.bzl", "gwt_module")
 
-SRC = "src/main/java/org/eclipse/jgit/"
-
 gwt_module(
     name = "client",
     srcs = [
-        SRC + "diff/Edit_JsonSerializer.java",
+        "diff/Edit_JsonSerializer.java",
-        SRC + "diff/ReplaceEdit.java",
+        "diff/ReplaceEdit.java",
     ],
-    gwt_xml = SRC + "JGit.gwt.xml",
+    gwt_xml = "JGit.gwt.xml",
     visibility = ["//visibility:public"],
     deps = [
         ":Edit",
@@ -39,13 +37,10 @@ genrule2(
 java_library(
     name = "server",
     srcs = [
-        SRC + x
+        "diff/EditDeserializer.java",
-        for x in [
+        "diff/ReplaceEdit.java",
-            "diff/EditDeserializer.java",
+        "internal/storage/file/WindowCacheStatAccessor.java",
-            "diff/ReplaceEdit.java",
+        "lib/ObjectIdSerialization.java",
-            "internal/storage/file/WindowCacheStatAccessor.java",
-            "lib/ObjectIdSerialization.java",
-        ]
     ],
     visibility = ["//visibility:public"],
     deps = [
@@ -53,15 +48,3 @@ java_library(
         "//lib/jgit/org.eclipse.jgit:jgit",
     ],
 )
-
-java_test(
-    name = "jgit_patch_tests",
-    srcs = glob(["src/test/java/**/*.java"]),
-    test_class = "org.eclipse.jgit.diff.EditDeserializerTest",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":server",
-        "//lib:junit",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-    ],
-)

javatests/org/eclipse/jgit/BUILD

@@ -0,0 +1,11 @@
+java_test(
+    name = "jgit_patch_tests",
+    srcs = glob(["**/*.java"]),
+    test_class = "org.eclipse.jgit.diff.EditDeserializerTest",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//java/org/eclipse/jgit:server",
+        "//lib:junit",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
+)

tools/eclipse/BUILD

@@ -12,7 +12,6 @@ TEST_DEPS = [
     "//gerrit-gwtui:ui_tests",
     "//gerrit-httpd:httpd_tests",
     "//gerrit-index:index_tests",
-    "//gerrit-patch-jgit:jgit_patch_tests",
     "//gerrit-reviewdb:client_tests",
     "//gerrit-server:server_tests",
 ]

tools/eclipse/project.py

@@ -276,7 +276,7 @@ try:
     makedirs(path.join(ROOT, gwt_working_dir))
 
   try:
-    check_call(['bazel', 'build', MAIN, GWT, '//gerrit-patch-jgit:libEdit-src.jar'])
+    check_call(['bazel', 'build', MAIN, GWT, '//java/org/eclipse/jgit:libEdit-src.jar'])
   except CalledProcessError:
     exit(1)
 except KeyboardInterrupt: