refactor: upgrade to testcontainers 2.0.2 (#556)

* build: update to testcontainers 2.0.2

Signed-off-by: Piotr Płaczek <[email protected]>

* refactor: remove JUnit 4 use

Signed-off-by: Piotr Płaczek <[email protected]>

* build: enforce JUnit 4 ban

Signed-off-by: Piotr Płaczek <[email protected]>

* docs: add entry to CHANGELOG.md

Signed-off-by: Piotr Płaczek <[email protected]>

* docs: move CHANGELOG.md entry under SNAPSHOT

Signed-off-by: Piotr Płaczek <[email protected]>

* exclude commons-io from kafka

Signed-off-by: Piotr Płaczek <[email protected]>

* improve comment explaining why commons-io is excluded.

Signed-off-by: Keith Wall <[email protected]>

---------

Signed-off-by: Piotr Płaczek <[email protected]>
Signed-off-by: Keith Wall <[email protected]>
Co-authored-by: Keith Wall <[email protected]>

Author: piotrpdev

CHANGELOG.md

@@ -5,6 +5,7 @@ Please enumerate all user-facing changes using format `<githib issue/pr number>:
 ## SNAPSHOT
 
 * [#550](https://github.com/kroxylicious/kroxylicious-junit5-extension/pull/550):   Bump kafka.version from 4.1.0 to 4.1.1
+* [#556](https://github.com/kroxylicious/kroxylicious-junit5-extension/pull/556): Upgrade to Testcontainers 2.0.2
 
 ## 0.13.0
 

impl/pom.xml

@@ -55,12 +55,12 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>kafka</artifactId>
+            <artifactId>testcontainers-kafka</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

impl/src/main/java/io/kroxylicious/testing/kafka/common/ScramInitialiser.java

@@ -19,7 +19,7 @@
 
 import io.kroxylicious.testing.kafka.internal.AdminSource;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ScramInitialiser {
 

integration-test/pom.xml

@@ -52,12 +52,12 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>kafka</artifactId>
+            <artifactId>testcontainers-kafka</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

pom.xml

@@ -87,7 +87,7 @@
 
         <junit.version>5.13.4</junit.version>
         <kafka.version>4.1.1</kafka.version>
-        <testcontainers.version>1.21.3</testcontainers.version>
+        <testcontainers.version>2.0.2</testcontainers.version>
         <lombok.version>1.18.42</lombok.version>
         <assertj-core.version>3.27.6</assertj-core.version>
         <spotbugs-annotations.version>4.9.8</spotbugs-annotations.version>
@@ -169,6 +169,11 @@
                         <groupId>ch.qos.logback</groupId>
                         <artifactId>logback-classic</artifactId>
                     </exclusion>
+                    <!-- Version supplied by Kafka 3.9 and below is incompatible (too old) for Testcontainers 2.0 -->
+                    <exclusion>
+                        <groupId>commons-io</groupId>
+                        <artifactId>commons-io</artifactId>
+                    </exclusion>
                 </exclusions>
                 <scope>provided</scope>
             </dependency>
@@ -197,6 +202,11 @@
                         <groupId>ch.qos.logback</groupId>
                         <artifactId>logback-classic</artifactId>
                     </exclusion>
+                    <!-- Version supplied by Zookeeper is incompatible (too old) for Testcontainers 2.0 -->
+                    <exclusion>
+                        <groupId>commons-io</groupId>
+                        <artifactId>commons-io</artifactId>
+                    </exclusion>
                 </exclusions>
                 <!-- The user needs to provide this dependency only if they wish to use in-VM kafka with a Zookeeper
                      controller.  If they are using in-VM kafka in KRaft node, or container kafka with Zookeeper, it is not
@@ -529,6 +539,23 @@
                                     </rules>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <!--AssertJ will throw different exceptions than expected when JUnit 4 is on the classpath -->
+                                <!-- See: https://github.com/kroxylicious/kroxylicious/issues/2801-->
+                                <id>ban-junit-4</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <bannedDependencies>
+                                            <excludes>
+                                                <exclude>junit:junit</exclude>
+                                            </excludes>
+                                        </bannedDependencies>
+                                    </rules>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
                     <plugin>