Bazel: Harmonize names of external repositories

Recent Bazel versions support dash character in external repository
names. Consistently use them with one exception: javax_inject. This is
needed to match the name in the rules_closure.

Change-Id: I1e75690fe1ee2ab32fffe07c0c30dbed84753960
This commit is contained in:
David Ostrovsky
2018-06-08 09:16:50 +02:00
committed by David Pursehouse
parent 38cb32d7b7
commit f98a60b35f
38 changed files with 204 additions and 204 deletions

View File

@@ -16,14 +16,14 @@ java_library(
data = ["//lib:LICENSE-Apache2.0"],
neverlink = 1,
visibility = ["//visibility:public"],
exports = ["@servlet_api_3_1//jar"],
exports = ["@servlet-api-3_1//jar"],
)
java_library(
name = "servlet-api-3_1-without-neverlink",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@servlet_api_3_1//jar"],
exports = ["@servlet-api-3_1//jar"],
)
java_library(
@@ -48,17 +48,17 @@ java_library(
)
java_library(
name = "gwtorm_client",
name = "gwtorm-client",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@gwtorm_client//jar"],
exports = ["@gwtorm-client//jar"],
)
java_library(
name = "gwtorm_client_src",
name = "gwtorm-client_src",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@gwtorm_client//jar:src"],
exports = ["@gwtorm-client//jar:src"],
)
java_library(
@@ -71,7 +71,7 @@ java_library(
java_library(
name = "gwtorm",
visibility = ["//visibility:public"],
exports = [":gwtorm_client"],
exports = [":gwtorm-client"],
runtime_deps = [":protobuf"],
)
@@ -155,21 +155,21 @@ java_library(
name = "tukaani-xz",
data = ["//lib:LICENSE-xz"],
visibility = ["//visibility:public"],
exports = ["@tukaani_xz//jar"],
exports = ["@tukaani-xz//jar"],
)
java_library(
name = "mime-util",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@mime_util//jar"],
exports = ["@mime-util//jar"],
)
java_library(
name = "guava-retrying",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@guava_retrying//jar"],
exports = ["@guava-retrying//jar"],
runtime_deps = [":jsr305"],
)
@@ -184,7 +184,7 @@ java_library(
name = "blame-cache",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@blame_cache//jar"],
exports = ["@blame-cache//jar"],
)
java_library(
@@ -217,7 +217,7 @@ java_library(
name = "hamcrest-core",
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = ["@hamcrest_core//jar"],
exports = ["@hamcrest-core//jar"],
)
java_library(
@@ -284,7 +284,7 @@ java_library(
name = "html-types",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@html_types//jar"],
exports = ["@html-types//jar"],
)
java_library(
@@ -305,5 +305,5 @@ java_library(
name = "commons-io",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons_io//jar"],
exports = ["@commons-io//jar"],
)

View File

@@ -8,10 +8,10 @@
]]
java_library(
name = "java_runtime",
name = "java-runtime",
data = ["//lib:LICENSE-antlr"],
visibility = ["//visibility:public"],
exports = ["@java_runtime//jar"],
exports = ["@java-runtime//jar"],
)
java_binary(
@@ -24,10 +24,10 @@ java_binary(
java_library(
name = "tool",
data = ["//lib:LICENSE-antlr"],
exports = ["@org_antlr//jar"],
exports = ["@org-antlr//jar"],
runtime_deps = [
":antlr27",
":java_runtime",
":java-runtime",
":stringtemplate",
],
)

View File

@@ -1,13 +1,13 @@
java_plugin(
name = "auto-annotation-plugin",
processor_class = "com.google.auto.value.processor.AutoAnnotationProcessor",
deps = ["@auto_value//jar"],
deps = ["@auto-value//jar"],
)
java_plugin(
name = "auto-value-plugin",
processor_class = "com.google.auto.value.processor.AutoValueProcessor",
deps = ["@auto_value//jar"],
deps = ["@auto-value//jar"],
)
java_library(
@@ -18,5 +18,5 @@ java_library(
":auto-value-plugin",
],
visibility = ["//visibility:public"],
exports = ["@auto_value//jar"],
exports = ["@auto-value//jar"],
)

View File

@@ -5,7 +5,7 @@ load("//lib/codemirror:cm.bzl", "pkg_cm")
java_library(
name = "diff-match-patch",
data = ["//lib:LICENSE-Apache2.0"],
runtime_deps = ["@diff_match_patch//jar"],
runtime_deps = ["@diff-match-patch//jar"],
)
pkg_cm()

View File

@@ -231,8 +231,8 @@ DIFF_MATCH_PATCH_TOP = ("META-INF/resources/webjars/google-diff-match-patch/%s"
def pkg_cm():
for archive, suffix, top, license in [
('@codemirror_original//jar', '', TOP, LICENSE),
('@codemirror_minified//jar', '_r', TOP_MINIFIED, LICENSE_MINIFIED)
('@codemirror-original//jar', '', TOP, LICENSE),
('@codemirror-minified//jar', '_r', TOP_MINIFIED, LICENSE_MINIFIED)
]:
# Main JavaScript and addons
genrule2(
@@ -306,13 +306,13 @@ def pkg_cm():
"echo '/** @license' >>$@",
"echo 'LICENSE-Apache2.0' >>$@",
"echo '*/' >>$@",
'unzip -p $(location @diff_match_patch//jar) %s/diff_match_patch.js >>$@' % DIFF_MATCH_PATCH_TOP,
'unzip -p $(location @diff-match-patch//jar) %s/diff_match_patch.js >>$@' % DIFF_MATCH_PATCH_TOP,
"echo ';' >> $@",
'unzip -p $(location %s) %s/addon/merge/merge.js >>$@' % (archive, top)
]
),
tools = [
'@diff_match_patch//jar',
'@diff-match-patch//jar',
# dependency just for license tracking.
':diff-match-patch',
archive,

View File

@@ -4,42 +4,42 @@ java_library(
name = "codec",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons_codec//jar"],
exports = ["@commons-codec//jar"],
)
java_library(
name = "collections",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons_collections//jar"],
exports = ["@commons-collections//jar"],
)
java_library(
name = "compress",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons_compress//jar"],
exports = ["@commons-compress//jar"],
)
java_library(
name = "lang",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons_lang//jar"],
exports = ["@commons-lang//jar"],
)
java_library(
name = "net",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons_net//jar"],
exports = ["@commons-net//jar"],
)
java_library(
name = "dbcp",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons_dbcp//jar"],
exports = ["@commons-dbcp//jar"],
runtime_deps = [":pool"],
)
@@ -47,19 +47,19 @@ java_library(
name = "pool",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons_pool//jar"],
exports = ["@commons-pool//jar"],
)
java_library(
name = "oro",
data = ["//lib:LICENSE-Apache1.1"],
visibility = ["//visibility:public"],
exports = ["@commons_oro//jar"],
exports = ["@commons-oro//jar"],
)
java_library(
name = "validator",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons_validator//jar"],
exports = ["@commons-validator//jar"],
)

View File

@@ -2,5 +2,5 @@ java_library(
name = "dropwizard-core",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@dropwizard_core//jar"],
exports = ["@dropwizard-core//jar"],
)

View File

@@ -13,7 +13,7 @@ java_library(
name = "cglib-3_2",
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = ["@cglib_3_2//jar"],
exports = ["@cglib-3_2//jar"],
)
java_library(

View File

@@ -3,17 +3,17 @@ java_library(
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = [
":guice_library",
":guice-library",
":javax-inject",
":multibindings",
],
)
java_library(
name = "guice_library",
name = "guice-library",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@guice_library//jar"],
exports = ["@guice-library//jar"],
runtime_deps = ["aopalliance"],
)
@@ -21,7 +21,7 @@ java_library(
name = "guice-assistedinject",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@guice_assistedinject//jar"],
exports = ["@guice-assistedinject//jar"],
runtime_deps = [":guice"],
)
@@ -29,7 +29,7 @@ java_library(
name = "guice-servlet",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@guice_servlet//jar"],
exports = ["@guice-servlet//jar"],
runtime_deps = [":guice"],
)

View File

@@ -2,7 +2,7 @@
name = n,
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@%s//jar" % n.replace("-", "_")],
exports = ["@%s//jar" % n],
) for n in [
"ant",
"colt",
@@ -34,12 +34,12 @@ java_library(
name = "javax-validation_src",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@javax_validation//jar:src"],
exports = ["@javax-validation//jar:src"],
)
java_library(
name = "jsinterop-annotations_src",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@jsinterop_annotations//jar:src"],
exports = ["@jsinterop-annotations//jar:src"],
)

View File

@@ -4,7 +4,7 @@ java_library(
name = "fluent-hc",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@fluent_hc//jar"],
exports = ["@fluent-hc//jar"],
runtime_deps = [":httpclient"],
)
@@ -43,5 +43,5 @@ java_library(
java_library(
name = "httpcore-nio",
data = ["//lib:LICENSE-Apache2.0"],
exports = ["@httpcore_nio//jar"],
exports = ["@httpcore-nio//jar"],
)

View File

@@ -5,5 +5,5 @@ VERSION = "2.6.6"
java_library(
name = "jackson-core",
data = ["//lib:LICENSE-Apache2.0"],
exports = ["@jackson_core//jar"],
exports = ["@jackson-core//jar"],
)

View File

@@ -2,7 +2,7 @@ java_library(
name = "servlet",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@jetty_servlet//jar"],
exports = ["@jetty-servlet//jar"],
runtime_deps = [":security"],
)
@@ -10,7 +10,7 @@ java_library(
name = "security",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@jetty_security//jar"],
exports = ["@jetty-security//jar"],
runtime_deps = [":server"],
)
@@ -18,7 +18,7 @@ java_library(
name = "servlets",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@jetty_servlets//jar"],
exports = ["@jetty-servlets//jar"],
)
java_library(
@@ -28,7 +28,7 @@ java_library(
exports = [
":continuation",
":http",
"@jetty_server//jar",
"@jetty-server//jar",
],
)
@@ -39,7 +39,7 @@ java_library(
exports = [
":continuation",
":http",
"@jetty_jmx//jar",
"@jetty-jmx//jar",
],
)
@@ -47,7 +47,7 @@ java_library(
name = "continuation",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@jetty_continuation//jar"],
exports = ["@jetty-continuation//jar"],
)
java_library(
@@ -56,7 +56,7 @@ java_library(
visibility = ["//visibility:public"],
exports = [
":io",
"@jetty_http//jar",
"@jetty-http//jar",
],
)
@@ -65,12 +65,12 @@ java_library(
data = ["//lib:LICENSE-Apache2.0"],
exports = [
":util",
"@jetty_io//jar",
"@jetty-io//jar",
],
)
java_library(
name = "util",
data = ["//lib:LICENSE-Apache2.0"],
exports = ["@jetty_util//jar"],
exports = ["@jetty-util//jar"],
)

View File

@@ -23,7 +23,7 @@ def jgit_repos():
def jgit_maven_repos():
maven_jar(
name = "jgit_lib",
name = "jgit-lib",
artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "0023aa574d6ea984e770af60da94da366a0109d2",
@@ -31,20 +31,20 @@ def jgit_maven_repos():
unsign = True,
)
maven_jar(
name = "jgit_servlet",
name = "jgit-servlet",
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "0bacf02e5c9c587f8a6e680278d2b4b7fc8df96d",
unsign = True,
)
maven_jar(
name = "jgit_archive",
name = "jgit-archive",
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "83c22720f1b00b4b5e321b9c8b089b91c1d78893",
)
maven_jar(
name = "jgit_junit",
name = "jgit-junit",
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "5a3f2d6cf33e88f3436acfd22a129bc7e2d2655b",
@@ -53,11 +53,11 @@ def jgit_maven_repos():
def jgit_dep(name):
mapping = {
"@jgit_junit//jar": "@jgit//org.eclipse.jgit.junit:junit",
"@jgit_lib//jar:src": "@jgit//org.eclipse.jgit:libjgit-src.jar",
"@jgit_lib//jar": "@jgit//org.eclipse.jgit:jgit",
"@jgit_servlet//jar":"@jgit//org.eclipse.jgit.http.server:jgit-servlet",
"@jgit_archive//jar": "@jgit//org.eclipse.jgit.archive:jgit-archive",
"@jgit-junit//jar": "@jgit//org.eclipse.jgit.junit:junit",
"@jgit-lib//jar:src": "@jgit//org.eclipse.jgit:libjgit-src.jar",
"@jgit-lib//jar": "@jgit//org.eclipse.jgit:jgit",
"@jgit-servlet//jar":"@jgit//org.eclipse.jgit.http.server:jgit-servlet",
"@jgit-archive//jar": "@jgit//org.eclipse.jgit.archive:jgit-archive",
}
if LOCAL_JGIT_REPO:

View File

@@ -4,6 +4,6 @@ java_library(
name = "jgit-archive",
data = ["//lib:LICENSE-jgit"],
visibility = ["//visibility:public"],
exports = [jgit_dep("@jgit_archive//jar")],
exports = [jgit_dep("@jgit-archive//jar")],
runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
)

View File

@@ -4,6 +4,6 @@ java_library(
name = "jgit-servlet",
data = ["//lib:LICENSE-jgit"],
visibility = ["//visibility:public"],
exports = [jgit_dep("@jgit_servlet//jar")],
exports = [jgit_dep("@jgit-servlet//jar")],
runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
)

View File

@@ -5,6 +5,6 @@ java_library(
testonly = 1,
data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
visibility = ["//visibility:public"],
exports = [jgit_dep("@jgit_junit//jar")],
exports = [jgit_dep("@jgit-junit//jar")],
runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
)

View File

@@ -4,13 +4,13 @@ java_library(
name = "jgit",
data = ["//lib:LICENSE-jgit"],
visibility = ["//visibility:public"],
exports = [jgit_dep("@jgit_lib//jar")],
exports = [jgit_dep("@jgit-lib//jar")],
runtime_deps = [":javaewah"],
)
alias(
name = "jgit-source",
actual = jgit_dep("@jgit_lib//jar:src"),
actual = jgit_dep("@jgit-lib//jar:src"),
visibility = ["//visibility:public"],
)

View File

@@ -2,12 +2,12 @@ java_library(
name = "joda-time",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@joda_time//jar"],
exports = ["@joda-time//jar"],
runtime_deps = ["joda-convert"],
)
java_library(
name = "joda-convert",
data = ["//lib:LICENSE-Apache2.0"],
exports = ["@joda_convert//jar"],
exports = ["@joda-convert//jar"],
)

View File

@@ -2,14 +2,14 @@ java_library(
name = "api",
data = ["//lib:LICENSE-slf4j"],
visibility = ["//visibility:public"],
exports = ["@log_api//jar"],
exports = ["@log-api//jar"],
)
java_library(
name = "nop",
data = ["//lib:LICENSE-slf4j"],
visibility = ["//visibility:public"],
exports = ["@log_nop//jar"],
exports = ["@log-nop//jar"],
runtime_deps = [":api"],
)
@@ -17,14 +17,14 @@ java_library(
name = "ext",
data = ["//lib:LICENSE-slf4j"],
visibility = ["//visibility:public"],
exports = ["@log_ext//jar"],
exports = ["@log-ext//jar"],
)
java_library(
name = "impl_log4j",
name = "impl-log4j",
data = ["//lib:LICENSE-slf4j"],
visibility = ["//visibility:public"],
exports = ["@impl_log4j//jar"],
exports = ["@impl-log4j//jar"],
runtime_deps = [":log4j"],
)
@@ -32,7 +32,7 @@ java_library(
name = "jcl-over-slf4j",
data = ["//lib:LICENSE-slf4j"],
visibility = ["//visibility:public"],
exports = ["@jcl_over_slf4j//jar"],
exports = ["@jcl-over-slf4j//jar"],
)
java_library(
@@ -46,7 +46,7 @@ java_library(
name = "jsonevent-layout",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@jsonevent_layout//jar"],
exports = ["@jsonevent-layout//jar"],
runtime_deps = [
":json-smart",
"//lib/commons:lang",
@@ -57,5 +57,5 @@ java_library(
name = "json-smart",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@json_smart//jar"],
exports = ["@json-smart//jar"],
)

View File

@@ -7,8 +7,8 @@ load("//tools/bzl:maven.bzl", "merge_maven_jars")
merge_maven_jars(
name = "lucene-core-and-backward-codecs",
srcs = [
"@backward_codecs//jar",
"@lucene_core//jar",
"@backward-codecs//jar",
"@lucene-core//jar",
],
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
@@ -18,7 +18,7 @@ java_library(
name = "lucene-analyzers-common",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@lucene_analyzers_common//jar"],
exports = ["@lucene-analyzers-common//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
@@ -26,14 +26,14 @@ java_library(
name = "lucene-core",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@lucene_core//jar"],
exports = ["@lucene-core//jar"],
)
java_library(
name = "lucene-misc",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@lucene_misc//jar"],
exports = ["@lucene-misc//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
@@ -41,6 +41,6 @@ java_library(
name = "lucene-queryparser",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@lucene_queryparser//jar"],
exports = ["@lucene-queryparser//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)

View File

@@ -2,12 +2,12 @@ java_library(
name = "core",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@mime4j_core//jar"],
exports = ["@mime4j-core//jar"],
)
java_library(
name = "dom",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@mime4j_dom//jar"],
exports = ["@mime4j-dom//jar"],
)

View File

@@ -22,5 +22,5 @@ java_library(
name = "core",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@mina_core//jar"],
exports = ["@mina-core//jar"],
)

View File

@@ -2,7 +2,7 @@ java_library(
name = "consumer",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@openid_consumer//jar"],
exports = ["@openid-consumer//jar"],
runtime_deps = [
":nekohtml",
":xerces",

View File

@@ -2,21 +2,21 @@ java_library(
name = "ow2-asm",
data = ["//lib:LICENSE-ow2"],
visibility = ["//visibility:public"],
exports = ["@ow2_asm//jar"],
exports = ["@ow2-asm//jar"],
)
java_library(
name = "ow2-asm-analysis",
data = ["//lib:LICENSE-ow2"],
visibility = ["//visibility:public"],
exports = ["@ow2_asm_analysis//jar"],
exports = ["@ow2-asm-analysis//jar"],
)
java_library(
name = "ow2-asm-commons",
data = ["//lib:LICENSE-ow2"],
visibility = ["//visibility:public"],
exports = ["@ow2_asm_commons//jar"],
exports = ["@ow2-asm-commons//jar"],
runtime_deps = [":ow2-asm-tree"],
)
@@ -24,12 +24,12 @@ java_library(
name = "ow2-asm-tree",
data = ["//lib:LICENSE-ow2"],
visibility = ["//visibility:public"],
exports = ["@ow2_asm_tree//jar"],
exports = ["@ow2-asm-tree//jar"],
)
java_library(
name = "ow2-asm-util",
data = ["//lib:LICENSE-ow2"],
visibility = ["//visibility:public"],
exports = ["@ow2_asm_util//jar"],
exports = ["@ow2-asm-util//jar"],
)

View File

@@ -5,7 +5,7 @@ java_library(
exports = [
":powermock-module-junit4-common",
"//lib:junit",
"@powermock_module_junit4//jar",
"@powermock-module-junit4//jar",
],
)
@@ -16,7 +16,7 @@ java_library(
exports = [
":powermock-reflect",
"//lib:junit",
"@powermock_module_junit4_common//jar",
"@powermock-module-junit4-common//jar",
],
)
@@ -27,7 +27,7 @@ java_library(
exports = [
"//lib:junit",
"//lib/easymock:objenesis",
"@powermock_reflect//jar",
"@powermock-reflect//jar",
],
)
@@ -38,7 +38,7 @@ java_library(
exports = [
":powermock-api-support",
"//lib/easymock",
"@powermock_api_easymock//jar",
"@powermock-api-easymock//jar",
],
)
@@ -50,7 +50,7 @@ java_library(
":powermock-core",
":powermock-reflect",
"//lib:junit",
"@powermock_api_support//jar",
"@powermock-api-support//jar",
],
)
@@ -62,6 +62,6 @@ java_library(
":powermock-reflect",
"//lib:javassist",
"//lib:junit",
"@powermock_core//jar",
"@powermock-core//jar",
],
)

View File

@@ -2,21 +2,21 @@ java_library(
name = "runtime",
data = ["//lib:LICENSE-prologcafe"],
visibility = ["//visibility:public"],
exports = ["@prolog_runtime//jar"],
exports = ["@prolog-runtime//jar"],
)
java_library(
name = "runtime-neverlink",
data = ["//lib:LICENSE-prologcafe"],
visibility = ["//visibility:public"],
exports = ["@prolog_runtime//jar:neverlink"],
exports = ["@prolog-runtime//jar:neverlink"],
)
java_library(
name = "compiler",
data = ["//lib:LICENSE-prologcafe"],
visibility = ["//visibility:public"],
exports = ["@prolog_compiler//jar"],
exports = ["@prolog-compiler//jar"],
runtime_deps = [
":io",
":runtime",
@@ -26,7 +26,7 @@ java_library(
java_library(
name = "io",
data = ["//lib:LICENSE-prologcafe"],
exports = ["@prolog_io//jar"],
exports = ["@prolog-io//jar"],
)
java_library(
@@ -41,14 +41,14 @@ java_library(
)
java_binary(
name = "compiler_bin",
name = "compiler-bin",
main_class = "BuckPrologCompiler",
visibility = ["//visibility:public"],
runtime_deps = [":compiler_lib"],
runtime_deps = [":compiler-lib"],
)
java_library(
name = "compiler_lib",
name = "compiler-lib",
srcs = ["java/BuckPrologCompiler.java"],
visibility = ["//visibility:public"],
deps = [

View File

@@ -21,11 +21,11 @@ def prolog_cafe_library(
**kwargs):
genrule2(
name = name + '__pl2j',
cmd = '$(location //lib/prolog:compiler_bin) ' +
cmd = '$(location //lib/prolog:compiler-bin) ' +
'$$(dirname $@) $@ ' +
'$(SRCS)',
srcs = srcs,
tools = ['//lib/prolog:compiler_bin'],
tools = ['//lib/prolog:compiler-bin'],
outs = [ name + '.srcjar' ],
)
native.java_library(

View File

@@ -3,7 +3,7 @@ java_library(
testonly = True,
data = ["//lib:LICENSE-testcontainers"],
visibility = ["//visibility:public"],
exports = ["@duct_tape//jar"],
exports = ["@duct-tape//jar"],
)
java_library(
@@ -11,7 +11,7 @@ java_library(
testonly = True,
data = ["//lib:LICENSE-testcontainers"],
visibility = ["//visibility:public"],
exports = ["@visible_assertions//jar"],
exports = ["@visible-assertions//jar"],
)
java_library(