commit c905d71459bc3f9a4058164fda543ada211c893b
author Luca Milanesio <luca.milanesio@gmail.com> Thu Apr 23 00:26:21 2020 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Thu Apr 23 00:26:21 2020 +0100
tree a0daf03b1d7aabb7a03c9ebc4578e2be016be5e4
parent 5737b79748383c53d9a48b053d6be0137b6459eb
parent 0ec3b914de59950b2bd1b563b47cb1522848e16d

Merge branch 'stable-3.1'

* stable-3.1:
  Align testcontainers-kafka to the version used in Gerrit
  Do not listen for Kafka/Zookeeper on fixed ports

Change-Id: I9ac76663aa8a7c53ce852cf9a92397ce408ed1fb

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index bbc1da5..0945768 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -9,8 +9,8 @@
 
     maven_jar(
         name = "testcontainers-kafka",
-        artifact = "org.testcontainers:kafka:1.10.6",
-        sha1 = "5984e31306bd6c84a36092cdd19e0ef7e2268d98",
+        artifact = "org.testcontainers:kafka:1.13.0",
+        sha1 = "ab6b31212f6a0ce341aa907fceffb722d9b9f3f7",
     )
 
     maven_jar(

src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java b/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java
index 64a2973..fab4d3b 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java
@@ -67,18 +67,6 @@
   private KafkaSession session;
   private Gson gson;
 
-  public static class TestKafkaContainer extends KafkaContainer {
-    public TestKafkaContainer() {
-      addFixedExposedPort(KAFKA_PORT, KAFKA_PORT);
-      addFixedExposedPort(ZOOKEEPER_PORT, ZOOKEEPER_PORT);
-    }
-
-    @Override
-    public String getBootstrapServers() {
-      return String.format("PLAINTEXT://%s:%s", getContainerIpAddress(), KAFKA_PORT);
-    }
-  }
-
   public static class TestWorkQueue extends WorkQueue {
 
     @Inject
@@ -143,7 +131,7 @@
 
   @BeforeClass
   public static void beforeClass() throws Exception {
-    kafka = new TestKafkaContainer();
+    kafka = new KafkaContainer();
     kafka.start();
     System.setProperty(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServers());
   }