Dissolve gerrit-gpg top-level directory

Change-Id: Ib102fce79dc9041fc9f091def4eacaaaddd71bcf

gerrit-acceptance-framework/BUILD

@@ -40,13 +40,13 @@ java_library2(
     testonly = 1,
     srcs = SRCS,
     exported_deps = [
-        "//gerrit-gpg:gpg",
         "//gerrit-launcher:launcher",
         "//gerrit-openid:openid",
         "//gerrit-pgm:daemon",
         "//gerrit-pgm:http-jetty",
         "//gerrit-pgm:util-nodep",
         "//gerrit-server:testutil",
+        "//java/com/google/gerrit/gpg",
         "//java/com/google/gerrit/index:query_exception",
         "//java/com/google/gerrit/lifecycle",
         "//lib:jimfs",

gerrit-acceptance-tests/BUILD

@@ -8,7 +8,6 @@ java_library(
     visibility = ["//visibility:public"],
     exports = [
         "//gerrit-acceptance-framework:lib",
-        "//gerrit-gpg:testutil",
         "//gerrit-httpd:httpd",
         "//gerrit-launcher:launcher",
         "//gerrit-lucene:lucene",
@@ -26,6 +25,7 @@ java_library(
         "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util",
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/reviewdb:server",
+        "//javatests/com/google/gerrit/gpg/testutil",
         "//lib:args4j",
         "//lib:gson",
         "//lib:guava-retrying",

gerrit-gpg/BUILD

@@ -1,60 +0,0 @@
-load("//tools/bzl:junit.bzl", "junit_tests")
-
-DEPS = [
-    "//java/com/google/gerrit/common:server",
-    "//java/com/google/gerrit/extensions:api",
-    "//java/com/google/gerrit/reviewdb:server",
-    "//gerrit-server:server",
-    "//lib:guava",
-    "//lib:gwtorm",
-    "//lib/guice:guice",
-    "//lib/guice:guice-assistedinject",
-    "//lib/guice:guice-servlet",
-    "//lib/jgit/org.eclipse.jgit:jgit",
-    "//lib/log:api",
-]
-
-java_library(
-    name = "gpg",
-    srcs = glob(["src/main/java/**/*.java"]),
-    visibility = ["//visibility:public"],
-    deps = DEPS + [
-        "//lib/bouncycastle:bcpg-neverlink",
-        "//lib/bouncycastle:bcprov-neverlink",
-    ],
-)
-
-TESTUTIL_SRCS = glob(["src/test/**/testutil/**/*.java"])
-
-java_library(
-    name = "testutil",
-    testonly = 1,
-    srcs = TESTUTIL_SRCS,
-    visibility = ["//visibility:public"],
-    deps = DEPS + [
-        "//lib/bouncycastle:bcpg-neverlink",
-        "//lib/bouncycastle:bcprov-neverlink",
-        ":gpg",
-    ],
-)
-
-junit_tests(
-    name = "gpg_tests",
-    srcs = glob(
-        ["src/test/java/**/*.java"],
-        exclude = TESTUTIL_SRCS,
-    ),
-    visibility = ["//visibility:public"],
-    deps = DEPS + [
-        ":gpg",
-        ":testutil",
-        "//java/com/google/gerrit/lifecycle",
-        "//java/com/google/gerrit/server/cache/h2",
-        "//gerrit-lucene:lucene",
-        "//gerrit-server:testutil",
-        "//lib:truth",
-        "//lib/jgit/org.eclipse.jgit.junit:junit",
-        "//lib/bouncycastle:bcpg",
-        "//lib/bouncycastle:bcprov",
-    ],
-)

gerrit-pgm/BUILD

@@ -116,9 +116,9 @@ REST_PGM_DEPS = [
     ":init",
     ":init-api",
     ":util",
+    "//java/com/google/gerrit/gpg",
     "//java/com/google/gerrit/server/cache/h2",
     "//gerrit-elasticsearch:elasticsearch",
-    "//gerrit-gpg:gpg",
     "//java/com/google/gerrit/index",
     "//gerrit-lucene:lucene",
     "//gerrit-oauth:oauth",

gerrit-server/BUILD

@@ -142,11 +142,11 @@ TESTUTIL_DEPS = [
     "//java/com/google/gerrit/common:annotations",
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
+    "//java/com/google/gerrit/gpg",
     "//java/com/google/gerrit/lifecycle",
     "//java/com/google/gerrit/metrics",
     "//java/com/google/gerrit/reviewdb:server",
     "//java/com/google/gerrit/server/cache/h2",
-    "//gerrit-gpg:gpg",
     "//java/com/google/gerrit/index",
     "//gerrit-lucene:lucene",
     "//lib:gwtorm",

gerrit-war/BUILD

@@ -6,7 +6,6 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//gerrit-elasticsearch:elasticsearch",
-        "//gerrit-gpg:gpg",
         "//gerrit-httpd:httpd",
         "//gerrit-lucene:lucene",
         "//gerrit-oauth:oauth",
@@ -20,6 +19,7 @@ java_library(
         "//gerrit-server:server",
         "//gerrit-sshd:sshd",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/gpg",
         "//java/com/google/gerrit/lifecycle",
         "//java/com/google/gerrit/metrics/dropwizard",
         "//java/com/google/gerrit/reviewdb:server",

java/com/google/gerrit/gpg/BUILD

@@ -0,0 +1,19 @@
+java_library(
+    name = "gpg",
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-server:server",
+        "//java/com/google/gerrit/common:server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib/bouncycastle:bcpg-neverlink",
+        "//lib/bouncycastle:bcprov-neverlink",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+    ],
+)

javatests/com/google/gerrit/gpg/BUILD

@@ -0,0 +1,31 @@
+load("//tools/bzl:junit.bzl", "junit_tests")
+
+junit_tests(
+    name = "gpg_tests",
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-lucene:lucene",
+        "//gerrit-server:server",
+        "//gerrit-server:testutil",
+        "//java/com/google/gerrit/common:server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/gpg",
+        "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/server/cache/h2",
+        "//javatests/com/google/gerrit/gpg/testutil",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib:truth",
+        "//lib/bouncycastle:bcpg",
+        "//lib/bouncycastle:bcpg-neverlink",
+        "//lib/bouncycastle:bcprov",
+        "//lib/bouncycastle:bcprov-neverlink",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/log:api",
+    ],
+)

javatests/com/google/gerrit/gpg/testutil/BUILD

@@ -0,0 +1,12 @@
+java_library(
+    name = "testutil",
+    testonly = 1,
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//java/com/google/gerrit/gpg",
+        "//lib:guava",
+        "//lib/bouncycastle:bcpg-neverlink",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
+)

tools/eclipse/BUILD

@@ -8,7 +8,6 @@ load(
 )
 
 TEST_DEPS = [
-    "//gerrit-gpg:gpg_tests",
     "//gerrit-gwtui:ui_tests",
     "//gerrit-httpd:httpd_tests",
     "//gerrit-server:server_tests",