Add deps to gerrit-acceptance-framework to support httpd plugin IT tests

These added dependencies include a new pgm http-jetty java_library that
shall eliminate any unnecessary transitive pgm deps from the IT lib.
This new java_library makes the 'jetty' sub-directory of pgm's 'http'
directory explicit, as the latter contains only the former. That new
java_library tries to follow the sibling 'util'/'util-nodep' example,
leading to this 'http'/'http-jetty' pair.

Introduce BASE_JETTY_DEPS to remove some duplication brought by
requiring those deps in both DEPS and http-jetty. Introduce JETTY_DEPS
as well for similar purposes, in http and http-jetty.

Exercised (required) by cookbook-plugin change id I3a1973.

Change-Id: I78bda72ee8c42cbd1e1d64fde849d2f2d43914cd

gerrit-acceptance-framework/BUCK

@@ -2,13 +2,18 @@ SRCS = glob(['src/test/java/com/google/gerrit/acceptance/*.java'])
 
 DEPS = [
   '//gerrit-gpg:gpg',
+  '//gerrit-launcher:launcher',
+  '//gerrit-openid:openid',
   '//gerrit-pgm:daemon',
+  '//gerrit-pgm:http-jetty',
   '//gerrit-pgm:util-nodep',
+  '//gerrit-server/src/main/prolog:common',
   '//gerrit-server:testutil',
   '//lib/auto:auto-value',
   '//lib/httpcomponents:fluent-hc',
   '//lib/httpcomponents:httpclient',
   '//lib/httpcomponents:httpcore',
+  '//lib/jetty:servlet',
   '//lib/jgit:junit',
   '//lib/log:impl_log4j',
   '//lib/log:log4j',

gerrit-launcher/BUCK

@@ -4,6 +4,7 @@ java_library(
   name = 'launcher',
   srcs = ['src/main/java/com/google/gerrit/launcher/GerritLauncher.java'],
   visibility = [
+    '//gerrit-acceptance-framework/...',
     '//gerrit-acceptance-tests/...',
     '//gerrit-httpd:',
     '//gerrit-main:main_lib',

gerrit-pgm/BUCK

@@ -3,23 +3,26 @@ RSRCS = 'src/main/resources/com/google/gerrit/pgm/'
 
 INIT_API_SRCS = glob([SRCS + 'init/api/*.java'])
 
-DEPS = [
+BASE_JETTY_DEPS = [
-    '//gerrit-common:server',
+  '//gerrit-common:server',
-    '//gerrit-extension-api:api',
+  '//gerrit-extension-api:api',
-    '//gerrit-gwtexpui:linker_server',
+  '//gerrit-gwtexpui:linker_server',
-    '//gerrit-gwtexpui:server',
+  '//gerrit-gwtexpui:server',
-    '//gerrit-httpd:httpd',
+  '//gerrit-httpd:httpd',
-    '//gerrit-server:server',
+  '//gerrit-server:server',
-    '//gerrit-sshd:sshd',
+  '//gerrit-sshd:sshd',
-    '//gerrit-reviewdb:server',
+  '//lib:guava',
-    '//lib:guava',
+  '//lib/guice:guice',
-    '//lib/guice:guice',
+  '//lib/guice:guice-assistedinject',
-    '//lib/guice:guice-assistedinject',
+  '//lib/guice:guice-servlet',
-    '//lib/guice:guice-servlet',
+  '//lib/jgit:jgit',
-    '//lib/jgit:jgit',
+  '//lib/log:api',
-    '//lib/log:api',
+  '//lib/log:log4j',
-    '//lib/log:jsonevent-layout',
+]
-    '//lib/log:log4j'
+
+DEPS = BASE_JETTY_DEPS + [
+  '//gerrit-reviewdb:server',
+  '//lib/log:jsonevent-layout',
 ]
 
 java_library(
@@ -83,24 +86,31 @@ java_library(
   name = 'util-nodep',
   srcs = glob([SRCS + 'util/*.java']),
   provided_deps = DEPS + REST_UTIL_DEPS,
-  visibility = [
+  visibility = ['//gerrit-acceptance-framework/...'],
-    '//gerrit-acceptance-framework/...',
-  ],
 )
 
+JETTY_DEPS = [
+  '//lib/jetty:jmx',
+  '//lib/jetty:server',
+  '//lib/jetty:servlet',
+]
+
 java_library(
   name = 'http',
-  srcs = glob([SRCS + 'http/**/*.java']),
+  deps = DEPS + JETTY_DEPS,
-  deps = DEPS + [
+  exported_deps = [':http-jetty'],
-    '//lib/jetty:jmx',
+  visibility = ['//gerrit-war:'],
-    '//lib/jetty:server',
+)
-    '//lib/jetty:servlet',
+
-  ],
+java_library(
-  provided_deps = [
+  name = 'http-jetty',
+  srcs = glob([SRCS + 'http/jetty/*.java']),
+  provided_deps = JETTY_DEPS + BASE_JETTY_DEPS + [
     '//gerrit-launcher:launcher',
+    '//gerrit-reviewdb:client',
     '//lib:servlet-api-3_1',
   ],
-  visibility = ['//gerrit-war:'],
+  visibility = ['//gerrit-acceptance-framework/...'],
 )
 
 REST_PGM_DEPS = [