Dissolve gerrit-plugin-api top-level directory

Change-Id: If83f4c6dca1251c2b632a914fa7c521791490d2c
This commit is contained in:
David Ostrovsky 2017-08-24 22:10:33 +02:00 committed by Dave Borowitz
parent 1e60b8cf75
commit 32c69339a0
6 changed files with 122 additions and 121 deletions

6
BUILD
View File

@ -51,9 +51,9 @@ API_DEPS = [
"//java/com/google/gerrit/extensions:extension-api_deploy.jar",
"//java/com/google/gerrit/extensions:libapi-src.jar",
"//java/com/google/gerrit/extensions:extension-api-javadoc",
"//gerrit-plugin-api:plugin-api_deploy.jar",
"//gerrit-plugin-api:plugin-api-sources_deploy.jar",
"//gerrit-plugin-api:plugin-api-javadoc",
"//plugins:plugin-api_deploy.jar",
"//plugins:plugin-api-sources_deploy.jar",
"//plugins:plugin-api-javadoc",
"//gerrit-plugin-gwtui:gwtui-api_deploy.jar",
"//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar",
"//gerrit-plugin-gwtui:gwtui-api-javadoc",

View File

@ -1,112 +0,0 @@
PLUGIN_API = [
"//java/com/google/gerrit/pgm/init/api",
"//gerrit-server:server",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/sshd",
]
EXPORTS = [
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/index:query_parser",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/metrics/dropwizard",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gwtexpui/server",
"//lib/commons:dbcp",
"//lib/commons:lang",
"//lib/commons:lang3",
"//lib/dropwizard:dropwizard-core",
"//lib/guice:guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
"//lib/guice:javax-inject",
"//lib/guice:multibindings",
"//lib/httpcomponents:httpclient",
"//lib/httpcomponents:httpcore",
"//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:api",
"//lib/log:log4j",
"//lib/mina:sshd",
"//lib/ow2:ow2-asm",
"//lib/ow2:ow2-asm-analysis",
"//lib/ow2:ow2-asm-commons",
"//lib/ow2:ow2-asm-util",
"//lib:args4j",
"//lib:blame-cache",
"//lib:guava",
"//lib:guava-retrying",
"//lib:gson",
"//lib:gwtorm",
"//lib:icu4j",
"//lib:jsch",
"//lib:mime-util",
"//lib:protobuf",
"//lib:servlet-api-3_1-without-neverlink",
"//lib:soy",
"//prolog:gerrit-prolog-common",
]
java_binary(
name = "plugin-api",
main_class = "Dummy",
visibility = ["//visibility:public"],
runtime_deps = [":lib"],
)
java_library(
name = "lib",
visibility = ["//visibility:public"],
exports = PLUGIN_API + EXPORTS,
)
java_library(
name = "lib-neverlink",
neverlink = 1,
visibility = ["//visibility:public"],
exports = PLUGIN_API + EXPORTS,
)
java_binary(
name = "plugin-api-sources",
main_class = "Dummy",
visibility = ["//visibility:public"],
runtime_deps = [
"//gerrit-server:libserver-src.jar",
"//java/com/google/gerrit/common:libannotations-src.jar",
"//java/com/google/gerrit/common:libserver-src.jar",
"//java/com/google/gerrit/extensions:libapi-src.jar",
"//java/com/google/gerrit/httpd:libhttpd-src.jar",
"//java/com/google/gerrit/index:libindex-src.jar",
"//java/com/google/gerrit/index:libquery_exception-src.jar",
"//java/com/google/gerrit/index:libquery_parser-src.jar",
"//java/com/google/gerrit/pgm/init/api:libapi-src.jar",
"//java/com/google/gerrit/reviewdb:libserver-src.jar",
"//java/com/google/gerrit/sshd:libsshd-src.jar",
"//java/com/google/gwtexpui/server:libserver-src.jar",
],
)
load("//tools/bzl:javadoc.bzl", "java_doc")
java_doc(
name = "plugin-api-javadoc",
libs = PLUGIN_API + [
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/index:query_parser",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gwtexpui/server",
"//java/com/google/gerrit/reviewdb:server",
],
pkgs = ["com.google.gerrit"],
title = "Gerrit Review Plugin API Documentation",
visibility = ["//visibility:public"],
)

View File

@ -15,8 +15,8 @@ java_library(
name = "query_parser",
srcs = ["//antlr3:query"],
visibility = [
"//gerrit-plugin-api:__pkg__",
"//javatests/com/google/gerrit/index:__pkg__",
"//plugins:__pkg__",
],
deps = [
":query_exception",

View File

@ -16,3 +16,116 @@ genrule2(
"zip -qr $$ROOT/$@ .",
visibility = ["//visibility:public"],
)
PLUGIN_API = [
"//java/com/google/gerrit/pgm/init/api",
"//gerrit-server:server",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/sshd",
]
EXPORTS = [
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/index:query_parser",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/metrics/dropwizard",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gwtexpui/server",
"//lib/commons:dbcp",
"//lib/commons:lang",
"//lib/commons:lang3",
"//lib/dropwizard:dropwizard-core",
"//lib/guice:guice",
"//lib/guice:guice-assistedinject",
"//lib/guice:guice-servlet",
"//lib/guice:javax-inject",
"//lib/guice:multibindings",
"//lib/httpcomponents:httpclient",
"//lib/httpcomponents:httpcore",
"//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:api",
"//lib/log:log4j",
"//lib/mina:sshd",
"//lib/ow2:ow2-asm",
"//lib/ow2:ow2-asm-analysis",
"//lib/ow2:ow2-asm-commons",
"//lib/ow2:ow2-asm-util",
"//lib:args4j",
"//lib:blame-cache",
"//lib:guava",
"//lib:guava-retrying",
"//lib:gson",
"//lib:gwtorm",
"//lib:icu4j",
"//lib:jsch",
"//lib:mime-util",
"//lib:protobuf",
"//lib:servlet-api-3_1-without-neverlink",
"//lib:soy",
"//prolog:gerrit-prolog-common",
]
java_binary(
name = "plugin-api",
main_class = "Dummy",
visibility = ["//visibility:public"],
runtime_deps = [":plugin-lib"],
)
java_library(
name = "plugin-lib",
visibility = ["//visibility:public"],
exports = PLUGIN_API + EXPORTS,
)
java_library(
name = "plugin-lib-neverlink",
neverlink = 1,
visibility = ["//visibility:public"],
exports = PLUGIN_API + EXPORTS,
)
java_binary(
name = "plugin-api-sources",
main_class = "Dummy",
visibility = ["//visibility:public"],
runtime_deps = [
"//gerrit-server:libserver-src.jar",
"//java/com/google/gerrit/common:libannotations-src.jar",
"//java/com/google/gerrit/common:libserver-src.jar",
"//java/com/google/gerrit/extensions:libapi-src.jar",
"//java/com/google/gerrit/httpd:libhttpd-src.jar",
"//java/com/google/gerrit/index:libindex-src.jar",
"//java/com/google/gerrit/index:libquery_exception-src.jar",
"//java/com/google/gerrit/index:libquery_parser-src.jar",
"//java/com/google/gerrit/pgm/init/api:libapi-src.jar",
"//java/com/google/gerrit/reviewdb:libserver-src.jar",
"//java/com/google/gerrit/sshd:libsshd-src.jar",
"//java/com/google/gwtexpui/server:libserver-src.jar",
],
)
load("//tools/bzl:javadoc.bzl", "java_doc")
java_doc(
name = "plugin-api-javadoc",
libs = PLUGIN_API + [
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/index:query_parser",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gwtexpui/server",
"//java/com/google/gerrit/reviewdb:server",
],
pkgs = ["com.google.gerrit"],
title = "Gerrit Review Plugin API Documentation",
visibility = ["//visibility:public"],
)

View File

@ -9,8 +9,8 @@ load(
"gwt_binary",
)
PLUGIN_DEPS = ["//gerrit-plugin-api:lib"]
PLUGIN_DEPS_NEVERLINK = ["//gerrit-plugin-api:lib-neverlink"]
PLUGIN_DEPS = ["//plugins:plugin-lib"]
PLUGIN_DEPS_NEVERLINK = ["//plugins:plugin-lib-neverlink"]
PLUGIN_TEST_DEPS = [
"//java/com/google/gerrit/acceptance:lib",

View File

@ -9,19 +9,19 @@ maven_package(
src = {
"gerrit-acceptance-framework": "//java/com/google/gerrit/acceptance:libframework-lib-src.jar",
"gerrit-extension-api": "//java/com/google/gerrit/extensions:libapi-src.jar",
"gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-sources_deploy.jar",
"gerrit-plugin-api": "//plugins:plugin-api-sources_deploy.jar",
"gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar",
},
doc = {
"gerrit-acceptance-framework": "//java/com/google/gerrit/acceptance:framework-javadoc",
"gerrit-extension-api": "//java/com/google/gerrit/extensions:extension-api-javadoc",
"gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-javadoc",
"gerrit-plugin-api": "//plugins:plugin-api-javadoc",
"gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-javadoc",
},
jar = {
"gerrit-acceptance-framework": "//java/com/google/gerrit/acceptance:framework_deploy.jar",
"gerrit-extension-api": "//java/com/google/gerrit/extensions:extension-api_deploy.jar",
"gerrit-plugin-api": "//gerrit-plugin-api:plugin-api_deploy.jar",
"gerrit-plugin-api": "//plugins:plugin-api_deploy.jar",
"gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api_deploy.jar",
},
repository = MAVEN_REPOSITORY,