Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
FakeGroupAuditService: Make auditEvents final
ErrorProne: Increase severity of MutableConstantField to ERROR
ConfigUpdatedEvent: Use immutable type in field declaration
Add missing slf4j dependencies in BUILD file
JGitMetricModule: fix WindowCache miss ration which wasn't reported
Revert "JGitMetricModule: Replace anonymous Supplier instances with method references"
Suppress generic logging on docker start for ElasticSearch container
Replace deprecated OptionParser with ArgumentParser
Change-Id: I36a7ce5c043bd43d90fb415fcec67440db2b5c84
diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD
index 82a99bd..ecd5c11 100644
--- a/javatests/com/google/gerrit/elasticsearch/BUILD
+++ b/javatests/com/google/gerrit/elasticsearch/BUILD
@@ -18,6 +18,7 @@
"//lib/guice",
"//lib/httpcomponents:httpcore",
"//lib/jgit/org.eclipse.jgit:jgit",
+ "//lib/log:api",
"//lib/testcontainers",
"//lib/testcontainers:testcontainers-elasticsearch",
],
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 77c50ef..98d723f 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -16,6 +16,8 @@
import org.apache.http.HttpHost;
import org.junit.AssumptionViolatedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
/* Helper class for running ES integration tests in docker container */
@@ -74,6 +76,11 @@
super(getImageName(version));
}
+ @Override
+ protected Logger logger() {
+ return LoggerFactory.getLogger("org.testcontainers");
+ }
+
public HttpHost getHttpHost() {
return new HttpHost(getContainerIpAddress(), getMappedPort(ELASTICSEARCH_DEFAULT_PORT));
}
