Bazel: Reformat build files
Reformat the Bazel build files with the buildifier tool [1]. The style is different for Bazel files. Most notably, indentation level is 4 spaces instead of 2, and " is used instead of '. [1] https://github.com/bazelbuild/buildifier Change-Id: I95c0c6f11b6d76572797853b4ebb5cee5ebd3c98
This commit is contained in:
David Ostrovsky
committed by
David Pursehouse
David Pursehouse
parent
8836c8bbfe
commit
fa18907d7f
@@ -1,6 +1,6 @@
|
||||
py_binary(
|
||||
name = 'merge_jars',
|
||||
srcs = ['merge_jars.py'],
|
||||
main = 'merge_jars.py',
|
||||
visibility = ['//visibility:public'],
|
||||
name = "merge_jars",
|
||||
srcs = ["merge_jars.py"],
|
||||
main = "merge_jars.py",
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
exports_files([
|
||||
"license-map.py",
|
||||
"test_empty.sh",
|
||||
"test_license.sh",
|
||||
"license-map.py",
|
||||
"test_empty.sh",
|
||||
"test_license.sh",
|
||||
])
|
||||
|
||||
@@ -1,68 +1,69 @@
|
||||
load('//tools/bzl:pkg_war.bzl', 'LIBS', 'PGMLIBS')
|
||||
load('//tools/bzl:classpath.bzl', 'classpath_collector')
|
||||
load('//tools/bzl:plugins.bzl',
|
||||
'CORE_PLUGINS',
|
||||
'CUSTOM_PLUGINS')
|
||||
load("//tools/bzl:pkg_war.bzl", "LIBS", "PGMLIBS")
|
||||
load("//tools/bzl:classpath.bzl", "classpath_collector")
|
||||
load(
|
||||
"//tools/bzl:plugins.bzl",
|
||||
"CORE_PLUGINS",
|
||||
"CUSTOM_PLUGINS",
|
||||
)
|
||||
|
||||
PROVIDED_DEPS = [
|
||||
'//lib/bouncycastle:bcprov',
|
||||
'//lib/bouncycastle:bcpg',
|
||||
'//lib/bouncycastle:bcpkix',
|
||||
"//lib/bouncycastle:bcprov",
|
||||
"//lib/bouncycastle:bcpg",
|
||||
"//lib/bouncycastle:bcpkix",
|
||||
]
|
||||
|
||||
TEST_DEPS = [
|
||||
'//gerrit-gpg:gpg_tests',
|
||||
'//gerrit-gwtui:ui_tests',
|
||||
'//gerrit-httpd:httpd_tests',
|
||||
'//gerrit-patch-jgit:jgit_patch_tests',
|
||||
'//gerrit-reviewdb:client_tests',
|
||||
'//gerrit-server:server_tests',
|
||||
"//gerrit-gpg:gpg_tests",
|
||||
"//gerrit-gwtui:ui_tests",
|
||||
"//gerrit-httpd:httpd_tests",
|
||||
"//gerrit-patch-jgit:jgit_patch_tests",
|
||||
"//gerrit-reviewdb:client_tests",
|
||||
"//gerrit-server:server_tests",
|
||||
]
|
||||
|
||||
DEPS = [
|
||||
'//gerrit-acceptance-tests:lib',
|
||||
'//gerrit-gwtdebug:gwtdebug',
|
||||
'//gerrit-gwtui:ui_module',
|
||||
'//gerrit-main:main_lib',
|
||||
'//gerrit-plugin-gwtui:gwtui-api-lib',
|
||||
'//gerrit-server:server',
|
||||
'//lib/asciidoctor:asciidoc_lib',
|
||||
'//lib/asciidoctor:doc_indexer_lib',
|
||||
'//lib/auto:auto-value',
|
||||
'//lib/gwt:ant',
|
||||
'//lib/gwt:colt',
|
||||
'//lib/gwt:javax-validation',
|
||||
'//lib/gwt:javax-validation_src',
|
||||
'//lib/gwt:jsinterop-annotations',
|
||||
'//lib/gwt:jsinterop-annotations_src',
|
||||
'//lib/gwt:tapestry',
|
||||
'//lib/gwt:w3c-css-sac',
|
||||
'//lib/jetty:servlets',
|
||||
'//lib/prolog:compiler_lib',
|
||||
# TODO(davido): I do not understand why it must be on the Eclipse classpath
|
||||
#'//Documentation:index',
|
||||
"//gerrit-acceptance-tests:lib",
|
||||
"//gerrit-gwtdebug:gwtdebug",
|
||||
"//gerrit-gwtui:ui_module",
|
||||
"//gerrit-main:main_lib",
|
||||
"//gerrit-plugin-gwtui:gwtui-api-lib",
|
||||
"//gerrit-server:server",
|
||||
"//lib/asciidoctor:asciidoc_lib",
|
||||
"//lib/asciidoctor:doc_indexer_lib",
|
||||
"//lib/auto:auto-value",
|
||||
"//lib/gwt:ant",
|
||||
"//lib/gwt:colt",
|
||||
"//lib/gwt:javax-validation",
|
||||
"//lib/gwt:javax-validation_src",
|
||||
"//lib/gwt:jsinterop-annotations",
|
||||
"//lib/gwt:jsinterop-annotations_src",
|
||||
"//lib/gwt:tapestry",
|
||||
"//lib/gwt:w3c-css-sac",
|
||||
"//lib/jetty:servlets",
|
||||
"//lib/prolog:compiler_lib",
|
||||
# TODO(davido): I do not understand why it must be on the Eclipse classpath
|
||||
#'//Documentation:index',
|
||||
]
|
||||
|
||||
java_library(
|
||||
name = 'classpath',
|
||||
runtime_deps = LIBS + PGMLIBS + DEPS,
|
||||
testonly = 1,
|
||||
name = "classpath",
|
||||
testonly = 1,
|
||||
runtime_deps = LIBS + PGMLIBS + DEPS,
|
||||
)
|
||||
|
||||
classpath_collector(
|
||||
name = 'main_classpath_collect',
|
||||
deps = LIBS + PGMLIBS + DEPS + TEST_DEPS + PROVIDED_DEPS +
|
||||
['//plugins/%s:%s__plugin' % (n, n)
|
||||
for n in CORE_PLUGINS + CUSTOM_PLUGINS],
|
||||
testonly = 1,
|
||||
name = "main_classpath_collect",
|
||||
testonly = 1,
|
||||
deps = LIBS + PGMLIBS + DEPS + TEST_DEPS + PROVIDED_DEPS +
|
||||
["//plugins/%s:%s__plugin" % (n, n) for n in CORE_PLUGINS + CUSTOM_PLUGINS],
|
||||
)
|
||||
|
||||
classpath_collector(
|
||||
name = "gwt_classpath_collect",
|
||||
deps = ["//gerrit-gwtui:ui_module"],
|
||||
name = "gwt_classpath_collect",
|
||||
deps = ["//gerrit-gwtui:ui_module"],
|
||||
)
|
||||
|
||||
classpath_collector(
|
||||
name = "autovalue_classpath_collect",
|
||||
deps = ["//lib/auto:auto-value"],
|
||||
name = "autovalue_classpath_collect",
|
||||
deps = ["//lib/auto:auto-value"],
|
||||
)
|
||||
|
||||
@@ -1,31 +1,32 @@
|
||||
load('//:version.bzl', 'GERRIT_VERSION')
|
||||
load('//tools/maven:package.bzl', 'maven_package')
|
||||
load("//:version.bzl", "GERRIT_VERSION")
|
||||
load("//tools/maven:package.bzl", "maven_package")
|
||||
|
||||
MAVEN_REPOSITORY = "sonatype-nexus-staging"
|
||||
|
||||
MAVEN_REPOSITORY = 'sonatype-nexus-staging'
|
||||
# TODO(davido): support snapshot repositories
|
||||
MAVEN_RELEASE_URL = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
|
||||
MAVEN_RELEASE_URL = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
|
||||
|
||||
maven_package(
|
||||
repository = MAVEN_REPOSITORY,
|
||||
url = MAVEN_RELEASE_URL,
|
||||
version = GERRIT_VERSION,
|
||||
jar = {
|
||||
'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework_deploy.jar',
|
||||
'gerrit-extension-api': '//gerrit-extension-api:extension-api_deploy.jar',
|
||||
'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api_deploy.jar',
|
||||
'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api_deploy.jar',
|
||||
},
|
||||
src = {
|
||||
'gerrit-acceptance-framework': '//gerrit-acceptance-framework:liblib-src.jar',
|
||||
'gerrit-extension-api': '//gerrit-extension-api:libapi-src.jar',
|
||||
'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api-sources_deploy.jar',
|
||||
'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar',
|
||||
},
|
||||
doc = {
|
||||
'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework-javadoc',
|
||||
'gerrit-extension-api': '//gerrit-extension-api:extension-api-javadoc',
|
||||
'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api-javadoc',
|
||||
'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api-javadoc',
|
||||
},
|
||||
war = {'gerrit-war': '//:release'},
|
||||
src = {
|
||||
"gerrit-acceptance-framework": "//gerrit-acceptance-framework:liblib-src.jar",
|
||||
"gerrit-extension-api": "//gerrit-extension-api:libapi-src.jar",
|
||||
"gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-sources_deploy.jar",
|
||||
"gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar",
|
||||
},
|
||||
doc = {
|
||||
"gerrit-acceptance-framework": "//gerrit-acceptance-framework:acceptance-framework-javadoc",
|
||||
"gerrit-extension-api": "//gerrit-extension-api:extension-api-javadoc",
|
||||
"gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-javadoc",
|
||||
"gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-javadoc",
|
||||
},
|
||||
jar = {
|
||||
"gerrit-acceptance-framework": "//gerrit-acceptance-framework:acceptance-framework_deploy.jar",
|
||||
"gerrit-extension-api": "//gerrit-extension-api:extension-api_deploy.jar",
|
||||
"gerrit-plugin-api": "//gerrit-plugin-api:plugin-api_deploy.jar",
|
||||
"gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api_deploy.jar",
|
||||
},
|
||||
repository = MAVEN_REPOSITORY,
|
||||
url = MAVEN_RELEASE_URL,
|
||||
version = GERRIT_VERSION,
|
||||
war = {"gerrit-war": "//:release"},
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user