opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Bazel: Remove intermediate pgm/http:http rule
  Upgrade testcontainers to 1.12.5

Change-Id: I5ade62a4d9b5bc2569d1210c7504d568df623647
This commit is contained in:
David Pursehouse
2020-01-26 12:06:22 +09:00
parent 2dc0c19c26 3ffceaa5aa
commit 8692b06b22
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/pgm/BUILD
View File

@@ -32,7 +32,7 @@ java_library(
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/lucene",
"//java/com/google/gerrit/metrics/dropwizard",
"//java/com/google/gerrit/pgm/http",
"//java/com/google/gerrit/pgm/http/jetty",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/pgm/util",

7
java/com/google/gerrit/pgm/http/BUILD
View File

@@ -1,7 +0,0 @@
load("@rules_java//java:defs.bzl", "java_library")
java_library(
name = "http",
visibility = ["//visibility:public"],
exports = ["//java/com/google/gerrit/pgm/http/jetty"],
)

2
javatests/com/google/gerrit/pgm/BUILD
View File

@@ -7,7 +7,7 @@ junit_tests(
deps = [
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/pgm",
"//java/com/google/gerrit/pgm/http",
"//java/com/google/gerrit/pgm/http/jetty",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/server",

6
tools/nongoogle.bzl
View File

@@ -162,18 +162,18 @@ def declare_nongoogle_deps():
sha1 = "3e83394258ae2089be7219b971ec21a8288528ad",
)
TESTCONTAINERS_VERSION = "1.12.4"
TESTCONTAINERS_VERSION = "1.12.5"
maven_jar(
name = "testcontainers",
artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
sha1 = "456b6facac12c4b67130d9056a43c011679e9f0c",
sha1 = "ca8a8dfbd3b194fb6c541e3bad858898865ce069",
)
maven_jar(
name = "testcontainers-elasticsearch",
artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION,
sha1 = "9e210c277a35a95a76d03a79e2812575bd07391c",
sha1 = "d88f79c83e7057edd23d33621c36d6267b9c4e96",
)
maven_jar(