opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15 

* stable-2.14:
  Add integration test classes for "ssh index" commands
  Bazel: Harmonize names of external repositories

Change-Id: I081bb8c1fc148f7a86b82586a47ac445f521d8bb
This commit is contained in:
David Pursehouse 2018-06-11 17:43:23 +09:00
parent 6344f22d9e a5b51d2b4a
commit a5d14bdd0a
42 changed files with 384 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
WORKSPACE
View File

@ -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.9",
sha1 = "f7b520c458572890807d143670c9b24f4de90897",
)
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.10",
sha1 = "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
)
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.13",
sha1 = "15c5e9584200122924e50203ae210b57616b75ee",
)
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.6",
sha1 = "e989d1e87cdd60575df0765ed5bac65c905d7908",
)
@ -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.1",
sha1 = "8172ebbd7970188aff304c8a420b9f17168f6f48",
)
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.4"
maven_jar(
name = "lucene_core",
name = "lucene-core",
artifact = "org.apache.lucene:lucene-core:" + LUCENE_VERS,
sha1 = "ab9c77e75cf142aa6e284b310c8395617bd9b19b",
)
maven_jar(
name = "lucene_analyzers_common",
name = "lucene-analyzers-common",
artifact = "org.apache.lucene:lucene-analyzers-common:" + LUCENE_VERS,
sha1 = "08ce9d34c8124c80e176e8332ee947480bbb9576",
)
maven_jar(
name = "backward_codecs",
name = "backward-codecs",
artifact = "org.apache.lucene:lucene-backward-codecs:" + LUCENE_VERS,
sha1 = "a933f42e758c54c43083398127ea7342b54d8212",
)
maven_jar(
name = "lucene_misc",
name = "lucene-misc",
artifact = "org.apache.lucene:lucene-misc:" + LUCENE_VERS,
sha1 = "a74388857f73614e528ae44d742c60187cb55a5a",
)
maven_jar(
name = "lucene_queryparser",
name = "lucene-queryparser",
artifact = "org.apache.lucene:lucene-queryparser:" + LUCENE_VERS,
sha1 = "8a06fad4675473d98d93b61fea529e3f464bf69e",
)
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-5",
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",
)
@ -615,7 +615,7 @@ maven_jar(
)
maven_jar(
name = "mina_core",
name = "mina-core",
artifact = "org.apache.mina:mina-core:2.0.16",
sha1 = "f720f17643eaa7b0fec07c1d7f6272972c02bba4",
)
@ -632,7 +632,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",
)
@ -670,14 +670,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",
)
@ -704,7 +704,7 @@ maven_jar(
)
maven_jar(
name = "cglib_3_2",
name = "cglib-3_2",
artifact = "cglib:cglib-nodep:3.2.0",
sha1 = "cf1ca207c15b04ace918270b6cb3f5601160cdfd",
)
@ -718,37 +718,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",
)
@ -769,61 +769,61 @@ maven_jar(
JETTY_VERS = "9.3.18.v20170406"
maven_jar(
name = "jetty_servlet",
name = "jetty-servlet",
artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VERS,
sha1 = "534e7fa0e4fb6e08f89eb3f6a8c48b4f81ff5738",
)
maven_jar(
name = "jetty_security",
name = "jetty-security",
artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VERS,
sha1 = "16b900e91b04511f42b706c925c8af6023d2c05e",
)
maven_jar(
name = "jetty_servlets",
name = "jetty-servlets",
artifact = "org.eclipse.jetty:jetty-servlets:" + JETTY_VERS,
sha1 = "f9311d1d8e6124d2792f4db5b29514d0ecf46812",
)
maven_jar(
name = "jetty_server",
name = "jetty-server",
artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VERS,
sha1 = "0a32feea88cba2d43951d22b60861c643454bb3f",
)
maven_jar(
name = "jetty_jmx",
name = "jetty-jmx",
artifact = "org.eclipse.jetty:jetty-jmx:" + JETTY_VERS,
sha1 = "f988136dc5aa634afed6c5a35d910ee9599c6c23",
)
maven_jar(
name = "jetty_continuation",
name = "jetty-continuation",
artifact = "org.eclipse.jetty:jetty-continuation:" + JETTY_VERS,
sha1 = "3c5d89c8204d4a48a360087f95e4cbd4520b5de0",
)
maven_jar(
name = "jetty_http",
name = "jetty-http",
artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VERS,
sha1 = "30ece6d732d276442d513b94d914de6fa1075fae",
)
maven_jar(
name = "jetty_io",
name = "jetty-io",
artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VERS,
sha1 = "36cb411ee89be1b527b0c10747aa3153267fc3ec",
)
maven_jar(
name = "jetty_util",
name = "jetty-util",
artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VERS,
sha1 = "8600b7d028a38cb462eff338de91390b3ff5040e",
)
maven_jar(
name = "openid_consumer",
name = "openid-consumer",
artifact = "org.openid4java:openid4java:0.9.8",
sha1 = "de4f1b33d3b0f0b2ab1d32834ec1190b39db4160",
)
@ -848,26 +848,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",
)
@ -893,7 +893,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",
)
@ -905,7 +905,7 @@ maven_jar(
)
maven_jar(
name = "httpcore_nio",
name = "httpcore-nio",
artifact = "org.apache.httpcomponents:httpcore-nio:" + HTTPCOMP_VERS,
sha1 = "a8c5e3c3bfea5ce23fb647c335897e415eb442e3",
)
@ -917,13 +917,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",
)

2
gerrit-acceptance-framework/BUILD
View File

@ -58,7 +58,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"],

67
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/AbstractIndexTests.java Normal file
View File

@ -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<ChangeInfo> result = query(q);
Iterable<Integer> ids = ids(result);
if (assertTrue) assertThat(ids).contains(change.getId().get());
else assertThat(ids).doesNotContain(change.getId().get());
}
protected static Iterable<Integer> ids(Iterable<ChangeInfo> changes) {
return FluentIterable.from(changes).transform(in -> in._number);
}
}

31
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD
View File

@ -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",
],
)

62
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/ElasticIndexIT.java Normal file
View File

@ -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.ElasticContainer;
import com.google.gerrit.elasticsearch.ElasticTestUtils;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.elasticsearch.ElasticVersion;
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);
}
}

23
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/IndexIT.java Normal file
View File

@ -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 {}
}

2
gerrit-common/BUILD
View File

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

6
gerrit-index/BUILD
View File

@ -33,7 +33,7 @@ java_library(
visibility = ["//gerrit-plugin-api:__pkg__"],
deps = [
":query_exception",
"//lib/antlr:java_runtime",
"//lib/antlr:java-runtime",
],
)
@ -53,7 +53,7 @@ java_library(
"//lib:guava",
"//lib:gwtjsonrpc",
"//lib:gwtorm",
"//lib/antlr:java_runtime",
"//lib/antlr:java-runtime",
"//lib/auto:auto-value",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:api",
@ -71,7 +71,7 @@ junit_tests(
":query_parser",
"//lib:junit",
"//lib:truth",
"//lib/antlr:java_runtime",
"//lib/antlr:java-runtime",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

2
gerrit-plugin-gwtui/BUILD
View File

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

4
gerrit-reviewdb/BUILD
View File

@ -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",
],
)

2
gerrit-server/BUILD
View File

@ -184,7 +184,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",
]

28
lib/BUILD
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"],
)

8
lib/antlr/BUILD
View File

@ -10,10 +10,10 @@ package(default_visibility = ["//gerrit-index:__pkg__"])
]]
java_library(
name = "java_runtime",
name = "java-runtime",
data = ["//lib:LICENSE-antlr"],
visibility = ["//visibility:public"],
exports = ["@java_runtime//jar"],
exports = ["@java-runtime//jar"],
)
# See https://github.com/bazelbuild/bazel/issues/3542
@ -29,10 +29,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",
],
)

6
lib/auto/BUILD
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"],
)

2
lib/codemirror/BUILD
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()

8
lib/codemirror/cm.bzl
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,

18
lib/commons/BUILD
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"],
)

2
lib/dropwizard/BUILD
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"],
)

2
lib/easymock/BUILD
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(

10
lib/guice/BUILD
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"],
)

6
lib/gwt/BUILD
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"],
)

4
lib/httpcomponents/BUILD
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"],
)

2
lib/jackson/BUILD
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"],
)

18
lib/jetty/BUILD
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"],
)

18
lib/jgit/jgit.bzl
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 = "dd93e272fb38c4a0e2b9e1cc39424e1e8d542352",
@ -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 = "5ef78cf1da610c643a9fd03763b4cac2889567af",
unsign = True,
)
maven_jar(
name = "jgit_archive",
name = "jgit-archive",
artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "238e20f82cb7b5ad99b60445d36f6c2c13ed8e4e",
)
maven_jar(
name = "jgit_junit",
name = "jgit-junit",
artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
repository = _JGIT_REPO,
sha1 = "e16e9635020e8a4a62d93cd05869442690f54209",
@ -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:

2
lib/jgit/org.eclipse.jgit.archive/BUILD
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"],
)

2
lib/jgit/org.eclipse.jgit.http.server/BUILD
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"],
)

2
lib/jgit/org.eclipse.jgit.junit/BUILD
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"],
)

4
lib/jgit/org.eclipse.jgit/BUILD
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"],
)

4
lib/joda/BUILD
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"],
)

16
lib/log/BUILD
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"],
)

12
lib/lucene/BUILD
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"],
)

4
lib/mime4j/BUILD
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"],
)

2
lib/mina/BUILD
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"],
)

2
lib/openid/BUILD
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",

10
lib/ow2/BUILD
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"],
)

12
lib/powermock/BUILD
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",
],
)

14
lib/prolog/BUILD
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 = [

4
lib/prolog/prolog.bzl
View File

@ -19,11 +19,11 @@ def prolog_cafe_library(
**kwargs):
native.genrule(
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(

4
lib/testcontainers/BUILD
View File

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

2
tools/bzl/pkg_war.bzl
View File

@ -24,7 +24,7 @@ LIBS = [
"//lib/bouncycastle:bcpkix",
"//lib/bouncycastle:bcprov",
"//lib/bouncycastle:bcpg",
"//lib/log:impl_log4j",
"//lib/log:impl-log4j",
]
PGMLIBS = [

2
tools/eclipse/BUILD
View File

@ -37,7 +37,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',
]