From 551d1ef6fb27a90f6ae3838a52946ed36cadd59d Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Fri, 24 Jan 2020 12:51:31 -0500 Subject: [PATCH 1/2] Upgrade testcontainers to 1.12.5 Change-Id: I7da2dfa19c1788b41436aa19a861f9639148724f --- tools/nongoogle.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 4ffcba6891..63e13192a8 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -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( From 3ffceaa5aa6e9f0a77631c4c2c6a1bf3d3403d25 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 25 Jan 2020 15:50:10 +0100 Subject: [PATCH 2/2] Bazel: Remove intermediate pgm/http:http rule This rule only exports the pgm/http/jetty rule and is not actually needed. Remove it and use pgm/http/jetty rule directly. Change-Id: Ib15d4dd7d101f3d8e1b2d14f405cb23a74644817 --- java/com/google/gerrit/pgm/BUILD | 2 +- java/com/google/gerrit/pgm/http/BUILD | 7 ------- javatests/com/google/gerrit/pgm/BUILD | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 java/com/google/gerrit/pgm/http/BUILD diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD index 11dcfd5be4..e022e86475 100644 --- a/java/com/google/gerrit/pgm/BUILD +++ b/java/com/google/gerrit/pgm/BUILD @@ -31,7 +31,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", diff --git a/java/com/google/gerrit/pgm/http/BUILD b/java/com/google/gerrit/pgm/http/BUILD deleted file mode 100644 index 34115ae811..0000000000 --- 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"], -) diff --git a/javatests/com/google/gerrit/pgm/BUILD b/javatests/com/google/gerrit/pgm/BUILD index e4afae2699..f01fa1396d 100644 --- a/javatests/com/google/gerrit/pgm/BUILD +++ b/javatests/com/google/gerrit/pgm/BUILD @@ -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",