From d7bd932488e4467ee5bab454a70c4709bc94e58c Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Tue, 8 Nov 2016 23:08:34 +0100
Subject: [PATCH] Bazel: Fix build

Ifec05b2f marked gerrit-server:testutil as test only, but missed to mark
as test only the targets that transitively depend on it.

Change-Id: Ia43ce915b3f98ba8231d316899118b849f1c4ad9
---
 gerrit-acceptance-framework/BUILD                           | 3 +++
 gerrit-acceptance-tests/BUILD                               | 1 +
 .../src/test/java/com/google/gerrit/acceptance/git/BUILD    | 6 ++++--
 .../java/com/google/gerrit/acceptance/rest/account/BUILD    | 1 +
 .../java/com/google/gerrit/acceptance/rest/change/BUILD     | 1 +
 tools/maven/package.bzl                                     | 2 ++
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gerrit-acceptance-framework/BUILD b/gerrit-acceptance-framework/BUILD
index d01534a39b..7f06cd3c32 100644
--- a/gerrit-acceptance-framework/BUILD
+++ b/gerrit-acceptance-framework/BUILD
@@ -23,6 +23,7 @@ java_binary(
   main_class = 'Dummy',
   runtime_deps = [':lib'],
   visibility = ['//visibility:public'],
+  testonly = 1,
 )
 
 java_library2(
@@ -57,6 +58,7 @@ java_library2(
     '//lib/mail:mail',
   ],
   visibility = ['//visibility:public'],
+  testonly = 1,
 )
 
 load('//tools/bzl:javadoc.bzl', 'java_doc')
@@ -67,4 +69,5 @@ java_doc(
   libs = [':lib'],
   pkgs = ['com.google.gerrit.acceptance'],
   visibility = ['//visibility:public'],
+  testonly = 1,
 )
diff --git a/gerrit-acceptance-tests/BUILD b/gerrit-acceptance-tests/BUILD
index 2ec7a0591e..71b1b4568f 100644
--- a/gerrit-acceptance-tests/BUILD
+++ b/gerrit-acceptance-tests/BUILD
@@ -39,4 +39,5 @@ java_library2(
     '//lib/mina:sshd',
   ],
   visibility = ['//visibility:public'],
+  testonly = 1,
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/BUILD
index db0d8e931a..3b7d2f2bfd 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/BUILD
@@ -17,10 +17,12 @@ java_library(
     '//gerrit-acceptance-tests:lib',
     '//lib/joda:joda-time',
   ],
+  testonly = 1,
 )
 
 java_library(
   name = 'submodule_util',
-  srcs = ['AbstractSubmoduleSubscription.java',],
-  deps = ['//gerrit-acceptance-tests:lib',]
+  srcs = ['AbstractSubmoduleSubscription.java'],
+  deps = ['//gerrit-acceptance-tests:lib'],
+  testonly = 1,
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/BUILD
index 558d0a91a5..d0339dfb91 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/BUILD
@@ -20,4 +20,5 @@ java_library(
     '//lib:junit',
   ],
   visibility = ['//visibility:public'],
+  testonly = 1,
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUILD
index 6fbf9c556d..d4d54b68bf 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUILD
@@ -29,4 +29,5 @@ java_library(
   deps = [
     '//gerrit-acceptance-tests:lib',
   ],
+  testonly = 1,
 )
diff --git a/tools/maven/package.bzl b/tools/maven/package.bzl
index fbd08c66b9..66ea237bb0 100644
--- a/tools/maven/package.bzl
+++ b/tools/maven/package.bzl
@@ -48,6 +48,7 @@ def maven_package(
     srcs = api_targets,
     outs = ['api_install.sh'],
     executable = True,
+    testonly = 1,
   )
 
   if repository and url:
@@ -61,6 +62,7 @@ def maven_package(
       srcs = api_targets,
       outs = ['api_deploy.sh'],
       executable = True,
+      testonly = 1,
     )
 
   war_cmd = mvn_cmd[:]