Dissolve gerrit-sshd top-level directory

Change-Id: Ie907bcd88fc30030883c0aa0705f8791cf2c3f6b

gerrit-acceptance-tests/BUILD

@@ -16,7 +16,6 @@ java_library(
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-server:testutil",
-        "//gerrit-sshd:sshd",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
@@ -26,6 +25,7 @@ java_library(
         "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/sshd",
         "//lib:args4j",
         "//lib:gson",
         "//lib:guava-retrying",

gerrit-pgm/BUILD

@@ -13,11 +13,11 @@ BASE_JETTY_DEPS = [
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
     "//java/com/google/gerrit/lifecycle",
+    "//java/com/google/gerrit/sshd",
     "//java/com/google/gwtexpui/linker:server",
     "//java/com/google/gwtexpui/server",
     "//gerrit-httpd:httpd",
     "//gerrit-server:server",
-    "//gerrit-sshd:sshd",
     "//lib:guava",
     "//lib/guice:guice",
     "//lib/guice:guice-assistedinject",

gerrit-plugin-api/BUILD

@@ -2,7 +2,7 @@ PLUGIN_API = [
     "//gerrit-httpd:httpd",
     "//gerrit-pgm:init-api",
     "//gerrit-server:server",
-    "//gerrit-sshd:sshd",
+    "//java/com/google/gerrit/sshd",
 ]
 
 EXPORTS = [
@@ -80,7 +80,6 @@ java_binary(
         "//gerrit-httpd:libhttpd-src.jar",
         "//gerrit-pgm:libinit-api-src.jar",
         "//gerrit-server:libserver-src.jar",
-        "//gerrit-sshd:libsshd-src.jar",
         "//java/com/google/gerrit/common:libannotations-src.jar",
         "//java/com/google/gerrit/common:libserver-src.jar",
         "//java/com/google/gerrit/extensions:libapi-src.jar",
@@ -88,6 +87,7 @@ java_binary(
         "//java/com/google/gerrit/index:libquery_exception-src.jar",
         "//java/com/google/gerrit/index:libquery_parser-src.jar",
         "//java/com/google/gerrit/reviewdb:libserver-src.jar",
+        "//java/com/google/gerrit/sshd:libsshd-src.jar",
         "//java/com/google/gwtexpui/server:libserver-src.jar",
     ],
 )

gerrit-war/BUILD

@@ -15,7 +15,6 @@ java_library(
         "//gerrit-server:module",
         "//gerrit-server:receive",
         "//gerrit-server:server",
-        "//gerrit-sshd:sshd",
         "//java/com/google/gerrit/elasticsearch",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/gpg",
@@ -24,6 +23,7 @@ java_library(
         "//java/com/google/gerrit/metrics/dropwizard",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",
+        "//java/com/google/gerrit/sshd",
         "//lib:guava",
         "//lib:gwtorm",
         "//lib:servlet-api-3_1",

java/com/google/gerrit/sshd/BUILD

@@ -1,10 +1,6 @@
-load("//tools/bzl:junit.bzl", "junit_tests")
-
-SRCS = glob(["src/main/java/**/*.java"])
-
 java_library(
     name = "sshd",
-    srcs = SRCS,
+    srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
         "//gerrit-server:receive",
@@ -40,17 +36,3 @@ java_library(
         "//lib/mina:sshd",
     ],
 )
-
-junit_tests(
-    name = "sshd_tests",
-    srcs = glob(
-        ["src/test/java/**/*.java"],
-    ),
-    deps = [
-        ":sshd",
-        "//gerrit-server:server",
-        "//java/com/google/gerrit/extensions:api",
-        "//lib:truth",
-        "//lib/mina:sshd",
-    ],
-)