Move prolog:common rule to gerrit-server root build file
Change-Id: Iacbff16b71d8464ccea6d2b631868e24a0605ec4
diff --git a/gerrit-acceptance-framework/BUILD b/gerrit-acceptance-framework/BUILD
index ca8ffbd..b351c27 100644
--- a/gerrit-acceptance-framework/BUILD
+++ b/gerrit-acceptance-framework/BUILD
@@ -38,8 +38,8 @@
"//gerrit-pgm:daemon",
"//gerrit-pgm:http-jetty",
"//gerrit-pgm:util-nodep",
+ "//gerrit-server:prolog-common",
"//gerrit-server:testutil",
- "//gerrit-server/src/main/prolog:common",
"//lib:jimfs",
"//lib:truth",
"//lib:truth-java8-extension",
diff --git a/gerrit-acceptance-tests/BUILD b/gerrit-acceptance-tests/BUILD
index c593783..0ad9002 100644
--- a/gerrit-acceptance-tests/BUILD
+++ b/gerrit-acceptance-tests/BUILD
@@ -19,9 +19,9 @@
"//gerrit-pgm:pgm",
"//gerrit-pgm:util",
"//gerrit-reviewdb:server",
+ "//gerrit-server:prolog-common",
"//gerrit-server:server",
"//gerrit-server:testutil",
- "//gerrit-server/src/main/prolog:common",
"//gerrit-sshd:sshd",
"//gerrit-test-util:test_util",
"//lib:args4j",
diff --git a/gerrit-plugin-api/BUILD b/gerrit-plugin-api/BUILD
index 2e768ee..d17bda6 100644
--- a/gerrit-plugin-api/BUILD
+++ b/gerrit-plugin-api/BUILD
@@ -19,7 +19,7 @@
"//gerrit-extension-api:api",
"//gerrit-gwtexpui:server",
"//gerrit-reviewdb:server",
- "//gerrit-server/src/main/prolog:common",
+ "//gerrit-server:prolog-common",
"//lib/commons:lang",
"//lib/commons:lang3",
"//lib/dropwizard:dropwizard-core",
diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
index e5ca05e..5c870ac 100644
--- a/gerrit-server/BUILD
+++ b/gerrit-server/BUILD
@@ -1,3 +1,4 @@
+load("//lib/prolog:prolog.bzl", "prolog_cafe_library")
load("//tools/bzl:junit.bzl", "junit_tests")
CONSTANTS_SRC = [
@@ -17,6 +18,13 @@
visibility = ["//visibility:public"],
)
+prolog_cafe_library(
+ name = "prolog-common",
+ srcs = ["src/main/prolog/gerrit_common.pl"],
+ visibility = ["//visibility:public"],
+ deps = [":server"],
+)
+
java_library(
name = "server",
srcs = SRCS,
@@ -185,9 +193,9 @@
srcs = PROLOG_TESTS,
resources = glob(["src/test/resources/com/google/gerrit/rules/**/*"]),
deps = TESTUTIL_DEPS + [
+ ":prolog-common",
":prolog_test_case",
":testutil",
- "//gerrit-server/src/main/prolog:common",
"//lib/prolog:runtime",
],
)
@@ -202,10 +210,10 @@
srcs = QUERY_TESTS,
visibility = ["//visibility:public"],
deps = TESTUTIL_DEPS + [
+ ":prolog-common",
":testutil",
"//gerrit-antlr:query_exception",
"//gerrit-antlr:query_parser",
- "//gerrit-server/src/main/prolog:common",
"//lib/antlr:java_runtime",
],
)
@@ -216,10 +224,10 @@
srcs = QUERY_TESTS,
visibility = ["//visibility:public"],
deps = TESTUTIL_DEPS + [
+ ":prolog-common",
":testutil",
"//gerrit-antlr:query_exception",
"//gerrit-antlr:query_parser",
- "//gerrit-server/src/main/prolog:common",
"//lib/antlr:java_runtime",
],
)
@@ -235,10 +243,10 @@
visibility = ["//visibility:public"],
deps = TESTUTIL_DEPS + [
":custom-truth-subjects",
+ ":prolog-common",
":testutil",
"//gerrit-antlr:query_exception",
"//gerrit-patch-jgit:server",
- "//gerrit-server/src/main/prolog:common",
"//gerrit-test-util:test_util",
"//lib:args4j",
"//lib:grappa",
diff --git a/gerrit-server/src/main/prolog/BUILD b/gerrit-server/src/main/prolog/BUILD
deleted file mode 100644
index 603a0bf..0000000
--- a/gerrit-server/src/main/prolog/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-load("//lib/prolog:prolog.bzl", "prolog_cafe_library")
-
-prolog_cafe_library(
- name = "common",
- srcs = ["gerrit_common.pl"],
- visibility = ["//visibility:public"],
- deps = ["//gerrit-server:server"],
-)
diff --git a/gerrit-war/BUILD b/gerrit-war/BUILD
index 66a0a47..865f940 100644
--- a/gerrit-war/BUILD
+++ b/gerrit-war/BUILD
@@ -18,8 +18,8 @@
"//gerrit-pgm:init-api",
"//gerrit-pgm:util",
"//gerrit-reviewdb:server",
+ "//gerrit-server:prolog-common",
"//gerrit-server:server",
- "//gerrit-server/src/main/prolog:common",
"//gerrit-sshd:sshd",
"//lib:guava",
"//lib:gwtorm",
