commit 8692b06b225a1859b4a278afe49613cae308eb6f
author David Pursehouse <dpursehouse@collab.net> Sun Jan 26 12:06:22 2020 +0900
committer David Pursehouse <dpursehouse@collab.net> Sun Jan 26 12:06:22 2020 +0900
tree b0e755785255c27bf00eae1f9ad769cdccd3e799
parent 2dc0c19c26d3648062599e51e8307ae3038f29e9
parent 3ffceaa5aa6e9f0a77631c4c2c6a1bf3d3403d25

Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I5ade62a4d9b5bc2569d1210c7504d568df623647

java/com/google/gerrit/pgm/BUILD

diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD
index ea6e9b7..2dd4ba5 100644
--- a/java/com/google/gerrit/pgm/BUILD
+++ b/java/com/google/gerrit/pgm/BUILD
@@ -32,7 +32,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 8e3b71d..84eda60 100644
--- a/javatests/com/google/gerrit/pgm/BUILD
+++ b/javatests/com/google/gerrit/pgm/BUILD
@@ -7,7 +7,7 @@
     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",

tools/nongoogle.bzl

diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index 4ffcba6..63e1319 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -162,18 +162,18 @@
         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(