summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2020-01-25 15:50:10 +0100
committerDavid Ostrovsky <david@ostrovsky.org>2020-01-25 15:50:10 +0100
commit3ffceaa5aa6e9f0a77631c4c2c6a1bf3d3403d25 (patch)
tree585936f552821b3e0021983993a017b1edeb96de
parent551d1ef6fb27a90f6ae3838a52946ed36cadd59d (diff)
Bazel: Remove intermediate pgm/http:http rule
This rule only exports the pgm/http/jetty rule and is not actually needed. Remove it and use pgm/http/jetty rule directly. Change-Id: Ib15d4dd7d101f3d8e1b2d14f405cb23a74644817
-rw-r--r--java/com/google/gerrit/pgm/BUILD2
-rw-r--r--java/com/google/gerrit/pgm/http/BUILD7
-rw-r--r--javatests/com/google/gerrit/pgm/BUILD2
3 files changed, 2 insertions, 9 deletions
diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD
index 11dcfd5be4..e022e86475 100644
--- a/java/com/google/gerrit/pgm/BUILD
+++ b/java/com/google/gerrit/pgm/BUILD
@@ -31,7 +31,7 @@ java_library(
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/lucene",
"//java/com/google/gerrit/metrics/dropwizard",
- "//java/com/google/gerrit/pgm/http",
+ "//java/com/google/gerrit/pgm/http/jetty",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/pgm/util",
diff --git a/java/com/google/gerrit/pgm/http/BUILD b/java/com/google/gerrit/pgm/http/BUILD
deleted file mode 100644
index 34115ae811..0000000000
--- a/java/com/google/gerrit/pgm/http/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-load("@rules_java//java:defs.bzl", "java_library")
-
-java_library(
- name = "http",
- visibility = ["//visibility:public"],
- exports = ["//java/com/google/gerrit/pgm/http/jetty"],
-)
diff --git a/javatests/com/google/gerrit/pgm/BUILD b/javatests/com/google/gerrit/pgm/BUILD
index e4afae2699..f01fa1396d 100644
--- a/javatests/com/google/gerrit/pgm/BUILD
+++ b/javatests/com/google/gerrit/pgm/BUILD
@@ -7,7 +7,7 @@ junit_tests(
deps = [
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/pgm",
- "//java/com/google/gerrit/pgm/http",
+ "//java/com/google/gerrit/pgm/http/jetty",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/server",