commit bcf5d111d2ae0ab659e081e98c2a01688dc2c6eb
author David Pursehouse <dpursehouse@collab.net> Sun Jan 26 16:50:37 2020 +0900
committer David Pursehouse <dpursehouse@collab.net> Sun Jan 26 16:50:37 2020 +0900
tree 8e5929bc15ca5b9bce4ae5a4edc881257e4d52bb
parent a8f47b5c51681e34303a38790448eb7d15f9501d
parent 8692b06b225a1859b4a278afe49613cae308eb6f

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bazel: Remove intermediate pgm/http:http rule
  Upgrade testcontainers to 1.12.5

Change-Id: Ibf5c4c2a348767920f19459f3b0502a3bfce95bf

java/com/google/gerrit/pgm/BUILD

diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD
index 08916a3..ee1aede 100644
--- a/java/com/google/gerrit/pgm/BUILD
+++ b/java/com/google/gerrit/pgm/BUILD
@@ -33,7 +33,7 @@
         "//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",

java/com/google/gerrit/pgm/http/BUILD

diff --git a/java/com/google/gerrit/pgm/http/BUILD b/java/com/google/gerrit/pgm/http/BUILD
deleted file mode 100644
index 34115ae..0000000
--- a/java/com/google/gerrit/pgm/http/BUILD
+++ /dev/null
@@ -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"],
-)

javatests/com/google/gerrit/pgm/BUILD

diff --git a/javatests/com/google/gerrit/pgm/BUILD b/javatests/com/google/gerrit/pgm/BUILD
index eb0bf25..49371f4 100644
--- a/javatests/com/google/gerrit/pgm/BUILD
+++ b/javatests/com/google/gerrit/pgm/BUILD
@@ -6,7 +6,7 @@
     srcs = glob(["**/*.java"]),
     deps = [
         "//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",

tools/nongoogle.bzl

diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index 69ef4d5..b480943 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -126,18 +126,18 @@
         sha1 = "dc13ae4faca6df981fc7aeb5a522d9db446d5d50",
     )
 
-    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(