From f98a60b35f5fa0ae4640406a5d2a97c3a166bef2 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 8 Jun 2018 09:16:50 +0200 Subject: [PATCH 1/2] 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 --- WORKSPACE | 158 ++++++++++---------- gerrit-acceptance-framework/BUILD | 2 +- gerrit-antlr/BUILD | 2 +- gerrit-common/BUILD | 2 +- gerrit-plugin-gwtui/BUILD | 2 +- gerrit-reviewdb/BUILD | 4 +- gerrit-server/BUILD | 8 +- lib/BUILD | 28 ++-- lib/antlr/BUILD | 8 +- lib/auto/BUILD | 6 +- lib/codemirror/BUILD | 2 +- lib/codemirror/cm.bzl | 8 +- lib/commons/BUILD | 18 +-- lib/dropwizard/BUILD | 2 +- lib/easymock/BUILD | 2 +- lib/guice/BUILD | 10 +- lib/gwt/BUILD | 6 +- lib/httpcomponents/BUILD | 4 +- lib/jackson/BUILD | 2 +- lib/jetty/BUILD | 18 +-- lib/jgit/jgit.bzl | 18 +-- lib/jgit/org.eclipse.jgit.archive/BUILD | 2 +- lib/jgit/org.eclipse.jgit.http.server/BUILD | 2 +- lib/jgit/org.eclipse.jgit.junit/BUILD | 2 +- lib/jgit/org.eclipse.jgit/BUILD | 4 +- lib/joda/BUILD | 4 +- lib/log/BUILD | 16 +- lib/lucene/BUILD | 12 +- lib/mime4j/BUILD | 4 +- lib/mina/BUILD | 2 +- lib/openid/BUILD | 2 +- lib/ow2/BUILD | 10 +- lib/powermock/BUILD | 12 +- lib/prolog/BUILD | 14 +- lib/prolog/prolog.bzl | 4 +- lib/testcontainers/BUILD | 4 +- tools/bzl/pkg_war.bzl | 2 +- tools/eclipse/BUILD | 2 +- 38 files changed, 204 insertions(+), 204 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b0ca3376b4..b5e7d4cad2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -46,7 +46,7 @@ closure_repositories( ANTLR_VERS = "3.5.2" maven_jar( - name = "java_runtime", + name = "java-runtime", artifact = "org.antlr:antlr-runtime:" + ANTLR_VERS, sha1 = "cd9cd41361c155f3af0f653009dcecb08d8b4afd", ) @@ -58,7 +58,7 @@ maven_jar( ) maven_jar( - name = "org_antlr", + name = "org-antlr", artifact = "org.antlr:antlr:" + ANTLR_VERS, sha1 = "c4a65c950bfc3e7d04309c515b2177c00baf7764", ) @@ -73,19 +73,19 @@ maven_jar( GUICE_VERS = "4.1.0" maven_jar( - name = "guice_library", + name = "guice-library", artifact = "com.google.inject:guice:" + GUICE_VERS, sha1 = "eeb69005da379a10071aa4948c48d89250febb07", ) maven_jar( - name = "guice_assistedinject", + name = "guice-assistedinject", artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS, sha1 = "af799dd7e23e6fe8c988da12314582072b07edcb", ) maven_jar( - name = "guice_servlet", + name = "guice-servlet", artifact = "com.google.inject.extensions:guice-servlet:" + GUICE_VERS, sha1 = "90ac2db772d9b85e2b05417b74f7464bcc061dcb", ) @@ -109,7 +109,7 @@ maven_jar( ) maven_jar( - name = "servlet_api_3_1", + name = "servlet-api-3_1", artifact = "org.apache.tomcat:tomcat-servlet-api:8.0.24", sha1 = "5d9e2e895e3111622720157d0aa540066d5fce3a", ) @@ -129,14 +129,14 @@ maven_jar( ) maven_jar( - name = "javax_validation", + name = "javax-validation", artifact = "javax.validation:validation-api:1.0.0.GA", sha1 = "b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e", src_sha1 = "7a561191db2203550fbfa40d534d4997624cd369", ) maven_jar( - name = "jsinterop_annotations", + name = "jsinterop-annotations", artifact = "com.google.jsinterop:jsinterop-annotations:1.0.2", sha1 = "abd7319f53d018e11108a88f599bd16492448dd2", src_sha1 = "33716f8aef043f2f02b78ab4a1acda6cd90a7602", @@ -164,7 +164,7 @@ maven_jar( ) maven_jar( - name = "w3c_css_sac", + name = "w3c-css-sac", artifact = "org.w3c.css:sac:1.3", sha1 = "cdb2dcb4e22b83d6b32b93095f644c3462739e82", ) @@ -194,7 +194,7 @@ maven_jar( ) maven_jar( - name = "gwtorm_client", + name = "gwtorm-client", artifact = "com.google.gerrit:gwtorm:1.18", sha1 = "f326dec463439a92ccb32f05b38345e21d0b5ecf", src_sha1 = "e0b973d5cafef3d145fa80cdf032fcead1186d29", @@ -207,13 +207,13 @@ maven_jar( ) maven_jar( - name = "joda_time", + name = "joda-time", artifact = "joda-time:joda-time:2.9.4", sha1 = "1c295b462f16702ebe720bbb08f62e1ba80da41b", ) maven_jar( - name = "joda_convert", + name = "joda-convert", artifact = "org.joda:joda-convert:1.8.1", sha1 = "675642ac208e0b741bc9118dcbcae44c271b992a", ) @@ -247,31 +247,31 @@ maven_jar( SLF4J_VERS = "1.7.7" maven_jar( - name = "log_api", + name = "log-api", artifact = "org.slf4j:slf4j-api:" + SLF4J_VERS, sha1 = "2b8019b6249bb05d81d3a3094e468753e2b21311", ) maven_jar( - name = "log_nop", + name = "log-nop", artifact = "org.slf4j:slf4j-nop:" + SLF4J_VERS, sha1 = "6cca9a3b999ff28b7a35ca762b3197cd7e4c2ad1", ) maven_jar( - name = "log_ext", + name = "log-ext", artifact = "org.slf4j:slf4j-ext:" + SLF4J_VERS, sha1 = "09a8f58c784c37525d2624062414358acf296717", ) maven_jar( - name = "impl_log4j", + name = "impl-log4j", artifact = "org.slf4j:slf4j-log4j12:" + SLF4J_VERS, sha1 = "58f588119ffd1702c77ccab6acb54bfb41bed8bd", ) maven_jar( - name = "jcl_over_slf4j", + name = "jcl-over-slf4j", artifact = "org.slf4j:jcl-over-slf4j:" + SLF4J_VERS, sha1 = "56003dcd0a31deea6391b9e2ef2f2dc90b205a92", ) @@ -283,13 +283,13 @@ maven_jar( ) maven_jar( - name = "jsonevent_layout", + name = "jsonevent-layout", artifact = "net.logstash.log4j:jsonevent-layout:1.7", sha1 = "507713504f0ddb75ba512f62763519c43cf46fde", ) maven_jar( - name = "json_smart", + name = "json-smart", artifact = "net.minidev:json-smart:1.1.1", sha1 = "24a2f903d25e004de30ac602c5b47f2d4e420a59", ) @@ -301,55 +301,55 @@ maven_jar( ) maven_jar( - name = "commons_codec", + name = "commons-codec", artifact = "commons-codec:commons-codec:1.4", sha1 = "4216af16d38465bbab0f3dff8efa14204f7a399a", ) maven_jar( - name = "commons_collections", + name = "commons-collections", artifact = "commons-collections:commons-collections:3.2.2", sha1 = "8ad72fe39fa8c91eaaf12aadb21e0c3661fe26d5", ) maven_jar( - name = "commons_compress", + name = "commons-compress", artifact = "org.apache.commons:commons-compress:1.12", sha1 = "84caa68576e345eb5e7ae61a0e5a9229eb100d7b", ) maven_jar( - name = "commons_lang", + name = "commons-lang", artifact = "commons-lang:commons-lang:2.6", sha1 = "0ce1edb914c94ebc388f086c6827e8bdeec71ac2", ) maven_jar( - name = "commons_dbcp", + name = "commons-dbcp", artifact = "commons-dbcp:commons-dbcp:1.4", sha1 = "30be73c965cc990b153a100aaaaafcf239f82d39", ) maven_jar( - name = "commons_pool", + name = "commons-pool", artifact = "commons-pool:commons-pool:1.5.5", sha1 = "7d8ffbdc47aa0c5a8afe5dc2aaf512f369f1d19b", ) maven_jar( - name = "commons_net", + name = "commons-net", artifact = "commons-net:commons-net:3.5", sha1 = "342fc284019f590e1308056990fdb24a08f06318", ) maven_jar( - name = "commons_oro", + name = "commons-oro", artifact = "oro:oro:2.0.8", sha1 = "5592374f834645c4ae250f4c9fbb314c9369d698", ) maven_jar( - name = "commons_validator", + name = "commons-validator", artifact = "commons-validator:commons-validator:1.5.1", sha1 = "86d05a46e8f064b300657f751b5a98c62807e2a0", ) @@ -397,13 +397,13 @@ maven_jar( MIME4J_VERS = "0.8.0" maven_jar( - name = "mime4j_core", + name = "mime4j-core", artifact = "org.apache.james:apache-mime4j-core:" + MIME4J_VERS, sha1 = "d54f45fca44a2f210569656b4ca3574b42911c95", ) maven_jar( - name = "mime4j_dom", + name = "mime4j-dom", artifact = "org.apache.james:apache-mime4j-dom:" + MIME4J_VERS, sha1 = "6720c93d14225c3e12c4a69768a0370c80e376a3", ) @@ -417,43 +417,43 @@ maven_jar( OW2_VERS = "5.1" maven_jar( - name = "ow2_asm", + name = "ow2-asm", artifact = "org.ow2.asm:asm:" + OW2_VERS, sha1 = "5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45", ) maven_jar( - name = "ow2_asm_analysis", + name = "ow2-asm-analysis", artifact = "org.ow2.asm:asm-analysis:" + OW2_VERS, sha1 = "6d1bf8989fc7901f868bee3863c44f21aa63d110", ) maven_jar( - name = "ow2_asm_commons", + name = "ow2-asm-commons", artifact = "org.ow2.asm:asm-commons:" + OW2_VERS, sha1 = "25d8a575034dd9cfcb375a39b5334f0ba9c8474e", ) maven_jar( - name = "ow2_asm_tree", + name = "ow2-asm-tree", artifact = "org.ow2.asm:asm-tree:" + OW2_VERS, sha1 = "87b38c12a0ea645791ead9d3e74ae5268d1d6c34", ) maven_jar( - name = "ow2_asm_util", + name = "ow2-asm-util", artifact = "org.ow2.asm:asm-util:" + OW2_VERS, sha1 = "b60e33a6bd0d71831e0c249816d01e6c1dd90a47", ) maven_jar( - name = "auto_value", + name = "auto-value", artifact = "com.google.auto.value:auto-value:1.4", sha1 = "6d1448fcd13074bd3658ef915022410b7c48343b", ) maven_jar( - name = "tukaani_xz", + name = "tukaani-xz", artifact = "org.tukaani:xz:1.4", sha1 = "18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3", ) @@ -461,37 +461,37 @@ maven_jar( LUCENE_VERS = "5.5.2" maven_jar( - name = "lucene_core", + name = "lucene-core", artifact = "org.apache.lucene:lucene-core:" + LUCENE_VERS, sha1 = "de5e5c3161ea01e89f2a09a14391f9b7ed66cdbb", ) maven_jar( - name = "lucene_analyzers_common", + name = "lucene-analyzers-common", artifact = "org.apache.lucene:lucene-analyzers-common:" + LUCENE_VERS, sha1 = "f0bc3114a6b43f8e64a33c471d5b9e8ddc51564d", ) maven_jar( - name = "backward_codecs", + name = "backward-codecs", artifact = "org.apache.lucene:lucene-backward-codecs:" + LUCENE_VERS, sha1 = "c5cfcd7a8cf48a0144b61fb991c8e50a0bf868d5", ) maven_jar( - name = "lucene_misc", + name = "lucene-misc", artifact = "org.apache.lucene:lucene-misc:" + LUCENE_VERS, sha1 = "37bbe5a2fb429499dfbe75d750d1778881fff45d", ) maven_jar( - name = "lucene_queryparser", + name = "lucene-queryparser", artifact = "org.apache.lucene:lucene-queryparser:" + LUCENE_VERS, sha1 = "8ac921563e744463605284c6d9d2d95e1be5b87c", ) maven_jar( - name = "mime_util", + name = "mime-util", artifact = "eu.medsea.mimeutil:mime-util:2.1.3", attach_source = False, sha1 = "0c9cfae15c74f62491d4f28def0dff1dabe52a47", @@ -502,7 +502,7 @@ PROLOG_VERS = "1.4.3" PROLOG_REPO = GERRIT maven_jar( - name = "prolog_runtime", + name = "prolog-runtime", artifact = "com.googlecode.prolog-cafe:prolog-runtime:" + PROLOG_VERS, attach_source = False, repository = PROLOG_REPO, @@ -510,7 +510,7 @@ maven_jar( ) maven_jar( - name = "prolog_compiler", + name = "prolog-compiler", artifact = "com.googlecode.prolog-cafe:prolog-compiler:" + PROLOG_VERS, attach_source = False, repository = PROLOG_REPO, @@ -518,7 +518,7 @@ maven_jar( ) maven_jar( - name = "prolog_io", + name = "prolog-io", artifact = "com.googlecode.prolog-cafe:prolog-io:" + PROLOG_VERS, attach_source = False, repository = PROLOG_REPO, @@ -534,7 +534,7 @@ maven_jar( ) maven_jar( - name = "guava_retrying", + name = "guava-retrying", artifact = "com.github.rholder:guava-retrying:2.0.0", sha1 = "974bc0a04a11cc4806f7c20a34703bd23c34e7f4", ) @@ -546,7 +546,7 @@ maven_jar( ) maven_jar( - name = "blame_cache", + name = "blame-cache", artifact = "com/google/gitiles:blame-cache:0.2-1", attach_source = False, repository = GERRIT, @@ -561,7 +561,7 @@ maven_jar( ) maven_jar( - name = "html_types", + name = "html-types", artifact = "com.google.common.html.types:types:1.0.4", sha1 = "2adf4c8bfccc0ff7346f9186ac5aa57d829ad065", ) @@ -573,7 +573,7 @@ maven_jar( ) maven_jar( - name = "dropwizard_core", + name = "dropwizard-core", artifact = "io.dropwizard.metrics:metrics-core:4.0.2", sha1 = "ec9878842d510cabd6bd6a9da1bebae1ae0cd199", ) @@ -614,7 +614,7 @@ maven_jar( ) maven_jar( - name = "mina_core", + name = "mina-core", artifact = "org.apache.mina:mina-core:2.0.16", sha1 = "f720f17643eaa7b0fec07c1d7f6272972c02bba4", ) @@ -628,7 +628,7 @@ maven_jar( HTTPCOMP_VERS = "4.4.1" maven_jar( - name = "fluent_hc", + name = "fluent-hc", artifact = "org.apache.httpcomponents:fluent-hc:" + HTTPCOMP_VERS, sha1 = "96fb842b68a44cc640c661186828b60590c71261", ) @@ -666,14 +666,14 @@ maven_jar( ) maven_jar( - name = "hamcrest_core", + name = "hamcrest-core", artifact = "org.hamcrest:hamcrest-core:1.3", sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0", ) # Only needed when jgit is built from the development tree maven_jar( - name = "hamcrest_library", + name = "hamcrest-library", artifact = "org.hamcrest:hamcrest-library:1.3", sha1 = "4785a3c21320980282f9f33d0d1264a69040538f", ) @@ -699,7 +699,7 @@ maven_jar( ) maven_jar( - name = "cglib_3_2", + name = "cglib-3_2", artifact = "cglib:cglib-nodep:3.2.0", sha1 = "cf1ca207c15b04ace918270b6cb3f5601160cdfd", ) @@ -713,37 +713,37 @@ maven_jar( POWERM_VERS = "1.6.1" maven_jar( - name = "powermock_module_junit4", + name = "powermock-module-junit4", artifact = "org.powermock:powermock-module-junit4:" + POWERM_VERS, sha1 = "ea8530b2848542624f110a393513af397b37b9cf", ) maven_jar( - name = "powermock_module_junit4_common", + name = "powermock-module-junit4-common", artifact = "org.powermock:powermock-module-junit4-common:" + POWERM_VERS, sha1 = "7222ced54dabc310895d02e45c5428ca05193cda", ) maven_jar( - name = "powermock_reflect", + name = "powermock-reflect", artifact = "org.powermock:powermock-reflect:" + POWERM_VERS, sha1 = "97d25eda8275c11161bcddda6ef8beabd534c878", ) maven_jar( - name = "powermock_api_easymock", + name = "powermock-api-easymock", artifact = "org.powermock:powermock-api-easymock:" + POWERM_VERS, sha1 = "aa740ecf89a2f64d410b3d93ef8cd6833009ef00", ) maven_jar( - name = "powermock_api_support", + name = "powermock-api-support", artifact = "org.powermock:powermock-api-support:" + POWERM_VERS, sha1 = "592ee6d929c324109d3469501222e0c76ccf0869", ) maven_jar( - name = "powermock_core", + name = "powermock-core", artifact = "org.powermock:powermock-core:" + POWERM_VERS, sha1 = "5afc1efce8d44ed76b30af939657bd598e45d962", ) @@ -764,61 +764,61 @@ maven_jar( JETTY_VERS = "9.3.17.v20170317" maven_jar( - name = "jetty_servlet", + name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VERS, sha1 = "ed6986b0d0ca7b9b0f9015c9efb80442e3043a8e", ) maven_jar( - name = "jetty_security", + name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VERS, sha1 = "ca52535569445682d42aaa97c7039442719a0507", ) maven_jar( - name = "jetty_servlets", + name = "jetty-servlets", artifact = "org.eclipse.jetty:jetty-servlets:" + JETTY_VERS, sha1 = "6369e945c7da441ac042002e31dbe3ca2068db8f", ) maven_jar( - name = "jetty_server", + name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VERS, sha1 = "194e9a02e6ba249ef4a3f4bd56b4993087992299", ) maven_jar( - name = "jetty_jmx", + name = "jetty-jmx", artifact = "org.eclipse.jetty:jetty-jmx:" + JETTY_VERS, sha1 = "2ba3219f6ee2617ca7f1ec7ae87e4b2128a0c1ce", ) maven_jar( - name = "jetty_continuation", + name = "jetty-continuation", artifact = "org.eclipse.jetty:jetty-continuation:" + JETTY_VERS, sha1 = "63ff8e2716e20b72787a1dbc666022ef6c1f7b1e", ) maven_jar( - name = "jetty_http", + name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VERS, sha1 = "6c02d728e15d4868486254039c867a1ac3e4a52e", ) maven_jar( - name = "jetty_io", + name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VERS, sha1 = "756a8cd2a1cbfb84a94973b6332dd3eccd47c0cd", ) maven_jar( - name = "jetty_util", + name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VERS, sha1 = "b8512ab02819de01f0f5a5c6026163041f579beb", ) maven_jar( - name = "openid_consumer", + name = "openid-consumer", artifact = "org.openid4java:openid4java:0.9.8", sha1 = "de4f1b33d3b0f0b2ab1d32834ec1190b39db4160", ) @@ -843,26 +843,26 @@ maven_jar( ) maven_jar( - name = "codemirror_minified", + name = "codemirror-minified", artifact = "org.webjars.npm:codemirror-minified:" + CM_VERSION, sha1 = "f84c178b11a188f416b4380bfb2b24f126453d28", ) maven_jar( - name = "codemirror_original", + name = "codemirror-original", artifact = "org.webjars.npm:codemirror:" + CM_VERSION, sha1 = "5a1f6c10d5aef0b9d2ce513dcc1e2657e4af730d", ) maven_jar( - name = "diff_match_patch", + name = "diff-match-patch", artifact = "org.webjars:google-diff-match-patch:" + DIFF_MATCH_PATCH_VERSION, attach_source = False, sha1 = "0cf1782dbcb8359d95070da9176059a5a9d37709", ) maven_jar( - name = "commons_io", + name = "commons-io", artifact = "commons-io:commons-io:1.4", sha1 = "a8762d07e76cfde2395257a5da47ba7c1dbd3dce", ) @@ -888,7 +888,7 @@ maven_jar( JACKSON_VERSION = "2.6.6" maven_jar( - name = "jackson_core", + name = "jackson-core", artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_VERSION, sha1 = "02eb801df67aacaf5b1deb4ac626e1964508e47b", ) @@ -900,7 +900,7 @@ maven_jar( ) maven_jar( - name = "httpcore_nio", + name = "httpcore-nio", artifact = "org.apache.httpcomponents:httpcore-nio:" + HTTPCOMP_VERS, sha1 = "a8c5e3c3bfea5ce23fb647c335897e415eb442e3", ) @@ -912,13 +912,13 @@ maven_jar( ) maven_jar( - name = "duct_tape", + name = "duct-tape", artifact = "org.rnorth.duct-tape:duct-tape:1.0.7", sha1 = "a26b5d90d88c91321dc7a3734ea72d2fc019ebb6", ) maven_jar( - name = "visible_assertions", + name = "visible-assertions", artifact = "org.rnorth.visible-assertions:visible-assertions:2.1.0", sha1 = "f2fcff2862860828ac38a5e1f14d941787c06b13", ) diff --git a/gerrit-acceptance-framework/BUILD b/gerrit-acceptance-framework/BUILD index ca8ffbdcdd..83aca51124 100644 --- a/gerrit-acceptance-framework/BUILD +++ b/gerrit-acceptance-framework/BUILD @@ -49,7 +49,7 @@ java_library2( "//lib/httpcomponents:httpcore", "//lib/jetty:servlet", "//lib/jgit/org.eclipse.jgit.junit:junit", - "//lib/log:impl_log4j", + "//lib/log:impl-log4j", "//lib/log:log4j", ], visibility = ["//visibility:public"], diff --git a/gerrit-antlr/BUILD b/gerrit-antlr/BUILD index 0b317086a7..80e3e8049f 100644 --- a/gerrit-antlr/BUILD +++ b/gerrit-antlr/BUILD @@ -30,6 +30,6 @@ java_library( visibility = ["//visibility:public"], deps = [ ":query_exception", - "//lib/antlr:java_runtime", + "//lib/antlr:java-runtime", ], ) diff --git a/gerrit-common/BUILD b/gerrit-common/BUILD index 438908066d..7f299da76e 100644 --- a/gerrit-common/BUILD +++ b/gerrit-common/BUILD @@ -25,7 +25,7 @@ gwt_module( "//gerrit-extension-api:api", "//gerrit-prettify:client", "//lib:guava", - "//lib:gwtorm_client", + "//lib:gwtorm-client", "//lib:servlet-api-3_1", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/joda:joda-time", diff --git a/gerrit-plugin-gwtui/BUILD b/gerrit-plugin-gwtui/BUILD index f8960502aa..acaeac41bd 100644 --- a/gerrit-plugin-gwtui/BUILD +++ b/gerrit-plugin-gwtui/BUILD @@ -63,7 +63,7 @@ java_doc( libs = DEPS + [ ":gwtui-api-lib", "//lib:gwtjsonrpc", - "//lib:gwtorm_client", + "//lib:gwtorm-client", "//lib/gwt:dev", "//gerrit-gwtui-common:client-lib", "//gerrit-common:client", diff --git a/gerrit-reviewdb/BUILD b/gerrit-reviewdb/BUILD index 98af668577..35c1535dad 100644 --- a/gerrit-reviewdb/BUILD +++ b/gerrit-reviewdb/BUILD @@ -16,8 +16,8 @@ gwt_module( visibility = ["//visibility:public"], deps = [ "//gerrit-extension-api:client", - "//lib:gwtorm_client", - "//lib:gwtorm_client_src", + "//lib:gwtorm-client", + "//lib:gwtorm-client_src", ], ) diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD index 3eac246819..f730ca4819 100644 --- a/gerrit-server/BUILD +++ b/gerrit-server/BUILD @@ -53,7 +53,7 @@ java_library( "//lib:soy", "//lib:tukaani-xz", "//lib:velocity", - "//lib/antlr:java_runtime", + "//lib/antlr:java-runtime", "//lib/auto:auto-value", "//lib/bouncycastle:bcpkix-neverlink", "//lib/bouncycastle:bcprov-neverlink", @@ -105,7 +105,7 @@ TESTUTIL_DEPS = [ "//lib/jgit/org.eclipse.jgit.junit:junit", "//lib/joda:joda-time", "//lib/log:api", - "//lib/log:impl_log4j", + "//lib/log:impl-log4j", "//lib/log:log4j", ] @@ -191,7 +191,7 @@ java_library( "//gerrit-antlr:query_exception", "//gerrit-antlr:query_parser", "//gerrit-server/src/main/prolog:common", - "//lib/antlr:java_runtime", + "//lib/antlr:java-runtime", ], ) @@ -205,7 +205,7 @@ junit_tests( "//gerrit-antlr:query_exception", "//gerrit-antlr:query_parser", "//gerrit-server/src/main/prolog:common", - "//lib/antlr:java_runtime", + "//lib/antlr:java-runtime", ], ) diff --git a/lib/BUILD b/lib/BUILD index 91334cb83d..5218424bc2 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -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"], ) diff --git a/lib/antlr/BUILD b/lib/antlr/BUILD index 6afe7b85f9..435d6d372c 100644 --- a/lib/antlr/BUILD +++ b/lib/antlr/BUILD @@ -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", ], ) diff --git a/lib/auto/BUILD b/lib/auto/BUILD index 569398ea13..98055eb475 100644 --- a/lib/auto/BUILD +++ b/lib/auto/BUILD @@ -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"], ) diff --git a/lib/codemirror/BUILD b/lib/codemirror/BUILD index 9c03887b5e..d0c9278106 100644 --- a/lib/codemirror/BUILD +++ b/lib/codemirror/BUILD @@ -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() diff --git a/lib/codemirror/cm.bzl b/lib/codemirror/cm.bzl index 54d60d5132..0cab158189 100644 --- a/lib/codemirror/cm.bzl +++ b/lib/codemirror/cm.bzl @@ -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, diff --git a/lib/commons/BUILD b/lib/commons/BUILD index 9e9e0566f9..55c6b4e6ec 100644 --- a/lib/commons/BUILD +++ b/lib/commons/BUILD @@ -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"], ) diff --git a/lib/dropwizard/BUILD b/lib/dropwizard/BUILD index dd1469983f..4ae12f14c5 100644 --- a/lib/dropwizard/BUILD +++ b/lib/dropwizard/BUILD @@ -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"], ) diff --git a/lib/easymock/BUILD b/lib/easymock/BUILD index b579ec567f..352d2a778c 100644 --- a/lib/easymock/BUILD +++ b/lib/easymock/BUILD @@ -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( diff --git a/lib/guice/BUILD b/lib/guice/BUILD index 6d7bf91dd3..c919d52b7f 100644 --- a/lib/guice/BUILD +++ b/lib/guice/BUILD @@ -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"], ) diff --git a/lib/gwt/BUILD b/lib/gwt/BUILD index 487e05b326..fa2fef3c32 100644 --- a/lib/gwt/BUILD +++ b/lib/gwt/BUILD @@ -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"], ) diff --git a/lib/httpcomponents/BUILD b/lib/httpcomponents/BUILD index 6e8fcd81a8..8e9fbc57ce 100644 --- a/lib/httpcomponents/BUILD +++ b/lib/httpcomponents/BUILD @@ -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"], ) diff --git a/lib/jackson/BUILD b/lib/jackson/BUILD index c01890dc21..5c1519356e 100644 --- a/lib/jackson/BUILD +++ b/lib/jackson/BUILD @@ -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"], ) diff --git a/lib/jetty/BUILD b/lib/jetty/BUILD index c6ba9c85ec..c5f1da8a11 100644 --- a/lib/jetty/BUILD +++ b/lib/jetty/BUILD @@ -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"], ) diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl index 869daa8d37..660669663e 100644 --- a/lib/jgit/jgit.bzl +++ b/lib/jgit/jgit.bzl @@ -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: diff --git a/lib/jgit/org.eclipse.jgit.archive/BUILD b/lib/jgit/org.eclipse.jgit.archive/BUILD index 198ff25d3b..27426235ef 100644 --- a/lib/jgit/org.eclipse.jgit.archive/BUILD +++ b/lib/jgit/org.eclipse.jgit.archive/BUILD @@ -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"], ) diff --git a/lib/jgit/org.eclipse.jgit.http.server/BUILD b/lib/jgit/org.eclipse.jgit.http.server/BUILD index 6b5bf78179..001ad8b5c8 100644 --- a/lib/jgit/org.eclipse.jgit.http.server/BUILD +++ b/lib/jgit/org.eclipse.jgit.http.server/BUILD @@ -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"], ) diff --git a/lib/jgit/org.eclipse.jgit.junit/BUILD b/lib/jgit/org.eclipse.jgit.junit/BUILD index ba6c42f9d0..85e9167722 100644 --- a/lib/jgit/org.eclipse.jgit.junit/BUILD +++ b/lib/jgit/org.eclipse.jgit.junit/BUILD @@ -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"], ) diff --git a/lib/jgit/org.eclipse.jgit/BUILD b/lib/jgit/org.eclipse.jgit/BUILD index 5586cb10f3..6b9bba65c7 100644 --- a/lib/jgit/org.eclipse.jgit/BUILD +++ b/lib/jgit/org.eclipse.jgit/BUILD @@ -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"], ) diff --git a/lib/joda/BUILD b/lib/joda/BUILD index e1a1924c9e..e1521349b9 100644 --- a/lib/joda/BUILD +++ b/lib/joda/BUILD @@ -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"], ) diff --git a/lib/log/BUILD b/lib/log/BUILD index 8ca87e7538..ddad6a8c20 100644 --- a/lib/log/BUILD +++ b/lib/log/BUILD @@ -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"], ) diff --git a/lib/lucene/BUILD b/lib/lucene/BUILD index 5c8982ab39..421caed03d 100644 --- a/lib/lucene/BUILD +++ b/lib/lucene/BUILD @@ -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"], ) diff --git a/lib/mime4j/BUILD b/lib/mime4j/BUILD index e7b85efee5..ee407c37cc 100644 --- a/lib/mime4j/BUILD +++ b/lib/mime4j/BUILD @@ -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"], ) diff --git a/lib/mina/BUILD b/lib/mina/BUILD index 66a0960904..8595bb52c1 100644 --- a/lib/mina/BUILD +++ b/lib/mina/BUILD @@ -22,5 +22,5 @@ java_library( name = "core", data = ["//lib:LICENSE-Apache2.0"], visibility = ["//visibility:public"], - exports = ["@mina_core//jar"], + exports = ["@mina-core//jar"], ) diff --git a/lib/openid/BUILD b/lib/openid/BUILD index 2b36fbba8b..faa073b6bc 100644 --- a/lib/openid/BUILD +++ b/lib/openid/BUILD @@ -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", diff --git a/lib/ow2/BUILD b/lib/ow2/BUILD index aebca490af..5a82572830 100644 --- a/lib/ow2/BUILD +++ b/lib/ow2/BUILD @@ -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"], ) diff --git a/lib/powermock/BUILD b/lib/powermock/BUILD index 7353b560ff..57880f4e32 100644 --- a/lib/powermock/BUILD +++ b/lib/powermock/BUILD @@ -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", ], ) diff --git a/lib/prolog/BUILD b/lib/prolog/BUILD index f6b4c5f900..8518af7010 100644 --- a/lib/prolog/BUILD +++ b/lib/prolog/BUILD @@ -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 = [ diff --git a/lib/prolog/prolog.bzl b/lib/prolog/prolog.bzl index 0e87c01ffa..38d3e3e7fc 100644 --- a/lib/prolog/prolog.bzl +++ b/lib/prolog/prolog.bzl @@ -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( diff --git a/lib/testcontainers/BUILD b/lib/testcontainers/BUILD index e6ec04f5cf..f99365d730 100644 --- a/lib/testcontainers/BUILD +++ b/lib/testcontainers/BUILD @@ -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( diff --git a/tools/bzl/pkg_war.bzl b/tools/bzl/pkg_war.bzl index 59ede4cb40..35df93a30b 100644 --- a/tools/bzl/pkg_war.bzl +++ b/tools/bzl/pkg_war.bzl @@ -24,7 +24,7 @@ LIBS = [ "//lib/bouncycastle:bcpkix", "//lib/bouncycastle:bcprov", "//lib/bouncycastle:bcpg", - "//lib/log:impl_log4j", + "//lib/log:impl-log4j", ] PGMLIBS = [ diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD index 7d79bc2729..7e48c7fcb5 100644 --- a/tools/eclipse/BUILD +++ b/tools/eclipse/BUILD @@ -35,7 +35,7 @@ DEPS = [ "//lib/gwt:tapestry", "//lib/gwt:w3c-css-sac", "//lib/jetty:servlets", - "//lib/prolog:compiler_lib", + "//lib/prolog:compiler-lib", # TODO(davido): I do not understand why it must be on the Eclipse classpath #'//Documentation:index', ] From a360ca56fcce3f519f89279a29461e21d3312fb6 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 11 Jun 2018 14:43:22 +0900 Subject: [PATCH 2/2] Add integration test classes for "ssh index" commands Introduce AbstractIndexTests which contains the tests, and IndexIT and ElasticIndexIT which provide the implementations for Lucene and Elasticsearch respectively. In ElasticIndexIT, provide configurations for Elasticsearch versions 2.4. 5.6 and 6.2. The intial implementation only includes a test for the "index change" command. Further tests will be added in follow-up commits. Bug: Issue 9168 Change-Id: I45fab4895962815f737f94976c4ef62be8b082a3 --- .../acceptance/ssh/AbstractIndexTests.java | 67 +++++++++++++++++++ .../com/google/gerrit/acceptance/ssh/BUILD | 31 ++++++++- .../gerrit/acceptance/ssh/ElasticIndexIT.java | 62 +++++++++++++++++ .../google/gerrit/acceptance/ssh/IndexIT.java | 23 +++++++ 4 files changed, 181 insertions(+), 2 deletions(-) create mode 100644 gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/AbstractIndexTests.java create mode 100644 gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java create mode 100644 gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/IndexIT.java diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/AbstractIndexTests.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/AbstractIndexTests.java new file mode 100644 index 0000000000..c72edfb77f --- /dev/null +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/AbstractIndexTests.java @@ -0,0 +1,67 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.acceptance.ssh; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.common.base.Joiner; +import com.google.common.collect.FluentIterable; +import com.google.gerrit.acceptance.AbstractDaemonTest; +import com.google.gerrit.acceptance.NoHttpd; +import com.google.gerrit.acceptance.PushOneCommit; +import com.google.gerrit.acceptance.UseSsh; +import com.google.gerrit.extensions.common.ChangeInfo; +import com.google.gerrit.server.query.change.ChangeData; +import com.google.inject.Injector; +import java.util.List; +import org.junit.Test; + +@NoHttpd +@UseSsh +public abstract class AbstractIndexTests extends AbstractDaemonTest { + /** @param injector injector */ + public abstract void configureIndex(Injector injector) throws Exception; + + @Test + public void indexChange() throws Exception { + configureIndex(server.getTestInjector()); + + PushOneCommit.Result change = createChange("first change", "test1.txt", "test1"); + String changeId = change.getChangeId(); + String changeLegacyId = change.getChange().getId().toString(); + + disableChangeIndexWrites(); + amendChange(changeId, "second test", "test2.txt", "test2"); + + assertQuery("message:second", change.getChange(), false); + enableChangeIndexWrites(); + + String cmd = Joiner.on(" ").join("gerrit", "index", "changes", changeLegacyId); + adminSshSession.exec(cmd); + + assertQuery("message:second", change.getChange(), true); + } + + protected void assertQuery(String q, ChangeData change, Boolean assertTrue) throws Exception { + List result = query(q); + Iterable ids = ids(result); + if (assertTrue) assertThat(ids).contains(change.getId().get()); + else assertThat(ids).doesNotContain(change.getId().get()); + } + + protected static Iterable ids(Iterable changes) { + return FluentIterable.from(changes).transform(in -> in._number); + } +} diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD index 91d8d71776..dafd49412d 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD @@ -1,8 +1,35 @@ load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests") +java_library( + name = "util", + testonly = 1, + srcs = ["AbstractIndexTests.java"], + deps = ["//gerrit-acceptance-tests:lib"], +) + acceptance_tests( - srcs = glob(["*IT.java"]), + srcs = glob( + ["*IT.java"], + exclude = ["ElasticIndexIT.java"], + ), group = "ssh", labels = ["ssh"], - deps = ["//lib/commons:compress"], + deps = [ + ":util", + "//lib/commons:compress", + ], +) + +acceptance_tests( + srcs = ["ElasticIndexIT.java"], + group = "elastic", + labels = [ + "elastic", + "docker", + "ssh", + ], + deps = [ + ":util", + "//lib/commons:compress", + ], ) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java new file mode 100644 index 0000000000..5750659ed1 --- /dev/null +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java @@ -0,0 +1,62 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.acceptance.ssh; + +import com.google.gerrit.elasticsearch.ElasticVersion; +import com.google.gerrit.elasticsearch.testing.ElasticContainer; +import com.google.gerrit.elasticsearch.testing.ElasticTestUtils; +import com.google.gerrit.elasticsearch.testing.ElasticTestUtils.ElasticNodeInfo; +import com.google.gerrit.testutil.ConfigSuite; +import com.google.inject.Injector; +import java.util.UUID; +import org.eclipse.jgit.lib.Config; + +public class ElasticIndexIT extends AbstractIndexTests { + private static ElasticContainer container; + + private static Config getConfig(ElasticVersion version) { + ElasticNodeInfo elasticNodeInfo; + try { + container = ElasticContainer.createAndStart(version); + elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); + } catch (Throwable t) { + return null; + } + String indicesPrefix = UUID.randomUUID().toString(); + Config cfg = new Config(); + ElasticTestUtils.configure(cfg, elasticNodeInfo.port, indicesPrefix); + return cfg; + } + + @ConfigSuite.Default + public static Config elasticsearchV2() { + return getConfig(ElasticVersion.V2_4); + } + + @ConfigSuite.Config + public static Config elasticsearchV5() { + return getConfig(ElasticVersion.V5_6); + } + + @ConfigSuite.Config + public static Config elasticsearchV6() { + return getConfig(ElasticVersion.V6_2); + } + + @Override + public void configureIndex(Injector injector) throws Exception { + ElasticTestUtils.createAllIndexes(injector); + } +} diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/IndexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/IndexIT.java new file mode 100644 index 0000000000..196a1e5e2d --- /dev/null +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/IndexIT.java @@ -0,0 +1,23 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.acceptance.ssh; + +import com.google.inject.Injector; + +public class IndexIT extends AbstractIndexTests { + + @Override + public void configureIndex(Injector injector) throws Exception {} +}