opendev/gerrit
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Martin Fick 2015-11-30 15:41:26 +00:00 committed by Gerrit Code Review
commit 009787dbe2
3 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-acceptance-framework/BUCK
View File

@ -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',

1
gerrit-launcher/BUCK
View File

@ -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',

66
gerrit-pgm/BUCK
View File

@ -3,23 +3,26 @@ RSRCS = 'src/main/resources/com/google/gerrit/pgm/'
INIT_API_SRCS = glob([SRCS + 'init/api/*.java'])
DEPS = [
'//gerrit-common:server',
'//gerrit-extension-api:api',
'//gerrit-gwtexpui:linker_server',
'//gerrit-gwtexpui:server',
'//gerrit-httpd:httpd',
'//gerrit-server:server',
'//gerrit-sshd:sshd',
'//gerrit-reviewdb:server',
'//lib:guava',
'//lib/guice:guice',
'//lib/guice:guice-assistedinject',
'//lib/guice:guice-servlet',
'//lib/jgit:jgit',
'//lib/log:api',
'//lib/log:jsonevent-layout',
'//lib/log:log4j'
BASE_JETTY_DEPS = [
'//gerrit-common:server',
'//gerrit-extension-api:api',
'//gerrit-gwtexpui:linker_server',
'//gerrit-gwtexpui:server',
'//gerrit-httpd:httpd',
'//gerrit-server:server',
'//gerrit-sshd:sshd',
'//lib:guava',
'//lib/guice:guice',
'//lib/guice:guice-assistedinject',
'//lib/guice:guice-servlet',
'//lib/jgit:jgit',
'//lib/log:api',
'//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 = [
'//gerrit-acceptance-framework/...',
],
visibility = ['//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 + [
'//lib/jetty:jmx',
'//lib/jetty:server',
'//lib/jetty:servlet',
],
provided_deps = [
deps = DEPS + JETTY_DEPS,
exported_deps = [':http-jetty'],
visibility = ['//gerrit-war:'],
)
java_library(
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 = [