From d11cf5aad4d0cb326fb813e062394679767b2ad6 Mon Sep 17 00:00:00 2001
From: Kun-Lu <kun.lu@ibm.com>
Date: Thu, 20 Jan 2022 17:11:22 -0500
Subject: [PATCH] Use new test-container.jar and add ITs

---
 .travis.yml                                           | 11 +----------
 pom.xml                                               |  8 +++++++-
 .../kafka/bridge/http/ConsumerGeneratedNameIT.java    |  2 +-
 .../java/io/strimzi/kafka/bridge/http/HttpCorsIT.java |  2 +-
 .../kafka/bridge/http/base/HttpBridgeITAbstract.java  |  2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 10ac3b601..7f004183a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,20 +4,11 @@ language: java
 jobs:
   fast_finish: true
   include:
-  - build: ppc64le
-    os: linux
-    arch: ppc64le
-    jdk: openjdk11
-    script: mvn install -DskipTests -Dmaven.javadoc.skip=true
-    addons:
-      apt:
-        packages:
-        - maven
   - build: s390x
     os: linux
     arch: s390x
     jdk: openjdk11
-    script: mvn install -DskipTests -Dmaven.javadoc.skip=true
+    script: mvn install -Dmaven.javadoc.skip=true
     addons:
       apt:
         packages:
diff --git a/pom.xml b/pom.xml
index c7bd6a0b6..da8fc1fc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
 		<micrometer.version>1.3.9</micrometer.version>
 		<jmx-prometheus-collector.version>0.12.0</jmx-prometheus-collector.version>
 		<commons-cli.version>1.4</commons-cli.version>
-		<test-container.version>0.25.0</test-container.version>
+		<test-container.version>0.100.0-rc1</test-container.version>
 		<jakarta.version>2.3.2</jakarta.version>
 		<!-- property to skip surefire tests during failsafe execution -->
 		<!--suppress UnresolvedMavenProperty -->
@@ -597,4 +597,10 @@
 			</build>
 		</profile>
 	</profiles>
+	<repositories>
+    	<repository>
+      		<id>staging</id>
+      		<url>https://oss.sonatype.org/content/repositories/iostrimzi-1154</url>
+    	</repository>
+  	</repositories>
 </project>
diff --git a/src/test/java/io/strimzi/kafka/bridge/http/ConsumerGeneratedNameIT.java b/src/test/java/io/strimzi/kafka/bridge/http/ConsumerGeneratedNameIT.java
index a8f001ba2..f2fbe2b69 100644
--- a/src/test/java/io/strimzi/kafka/bridge/http/ConsumerGeneratedNameIT.java
+++ b/src/test/java/io/strimzi/kafka/bridge/http/ConsumerGeneratedNameIT.java
@@ -6,7 +6,7 @@
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.strimzi.StrimziKafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
 import io.strimzi.kafka.bridge.HealthChecker;
 import io.strimzi.kafka.bridge.JmxCollectorRegistry;
 import io.strimzi.kafka.bridge.MetricsReporter;
diff --git a/src/test/java/io/strimzi/kafka/bridge/http/HttpCorsIT.java b/src/test/java/io/strimzi/kafka/bridge/http/HttpCorsIT.java
index 5ca94c783..1872d64cd 100644
--- a/src/test/java/io/strimzi/kafka/bridge/http/HttpCorsIT.java
+++ b/src/test/java/io/strimzi/kafka/bridge/http/HttpCorsIT.java
@@ -6,7 +6,7 @@
 package io.strimzi.kafka.bridge.http;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import io.strimzi.StrimziKafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
 import io.strimzi.kafka.bridge.BridgeContentType;
 import io.strimzi.kafka.bridge.HealthChecker;
 import io.strimzi.kafka.bridge.JmxCollectorRegistry;
diff --git a/src/test/java/io/strimzi/kafka/bridge/http/base/HttpBridgeITAbstract.java b/src/test/java/io/strimzi/kafka/bridge/http/base/HttpBridgeITAbstract.java
index b0d311b8b..1f53da343 100644
--- a/src/test/java/io/strimzi/kafka/bridge/http/base/HttpBridgeITAbstract.java
+++ b/src/test/java/io/strimzi/kafka/bridge/http/base/HttpBridgeITAbstract.java
@@ -5,7 +5,7 @@
 
 package io.strimzi.kafka.bridge.http.base;
 
-import io.strimzi.StrimziKafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.strimzi.kafka.bridge.HealthChecker;
 import io.strimzi.kafka.bridge.JmxCollectorRegistry;