From 463e92c7127ce22d4748b28ec8a5f1f205195cba Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Mon, 21 Aug 2017 08:07:53 +0200
Subject: [PATCH] Dissolve gerrit-util-ssl top-level directory

Change-Id: I87e4379066b0ae04991a944f14eb2081e87b4399
---
 gerrit-patch-commonsnet/BUILD                                   | 2 +-
 gerrit-server/BUILD                                             | 2 +-
 {gerrit-util-ssl => java/com/google/gerrit/util/ssl}/BUILD      | 2 +-
 .../com/google/gerrit/util/ssl/BlindSSLSocketFactory.java       | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {gerrit-util-ssl => java/com/google/gerrit/util/ssl}/BUILD (62%)
 rename {gerrit-util-ssl/src/main/java => java}/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java (100%)

diff --git a/gerrit-patch-commonsnet/BUILD b/gerrit-patch-commonsnet/BUILD
index 7524bfe6cb..248670f096 100644
--- a/gerrit-patch-commonsnet/BUILD
+++ b/gerrit-patch-commonsnet/BUILD
@@ -3,7 +3,7 @@ java_library(
     srcs = glob(["src/main/java/org/apache/commons/net/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-util-ssl:ssl",
+        "//java/com/google/gerrit/util/ssl",
         "//lib/commons:codec",
         "//lib/commons:net",
         "//lib/log:api",
diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
index ebde6e3f1b..d004922eb0 100644
--- a/gerrit-server/BUILD
+++ b/gerrit-server/BUILD
@@ -43,13 +43,13 @@ java_library(
         "//gerrit-index:index",
         "//gerrit-index:query_exception",
         "//gerrit-patch-commonsnet:commons-net",
-        "//gerrit-util-ssl:ssl",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/util/cli",
+        "//java/com/google/gerrit/util/ssl",
         "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:automaton",
diff --git a/gerrit-util-ssl/BUILD b/java/com/google/gerrit/util/ssl/BUILD
similarity index 62%
rename from gerrit-util-ssl/BUILD
rename to java/com/google/gerrit/util/ssl/BUILD
index ce53a26c70..4f65b61b56 100644
--- a/gerrit-util-ssl/BUILD
+++ b/java/com/google/gerrit/util/ssl/BUILD
@@ -1,5 +1,5 @@
 java_library(
     name = "ssl",
-    srcs = glob(["src/main/java/**/*.java"]),
+    srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
 )
diff --git a/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java b/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java
similarity index 100%
rename from gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java
rename to java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java