From 871a2938efdd75f7ca2a1550b16b2128018701e7 Mon Sep 17 00:00:00 2001
From: Kirill <yuppie-flu@users.noreply.github.com>
Date: Sun, 24 Dec 2023 22:24:48 +0100
Subject: [PATCH] Remove JUnit4, use testcontainers bom

---
 pom.xml                                       | 23 ++++++++++++++-----
 ...figurationBeanDefinitionRegistrarTest.java |  2 +-
 .../repository/ConfigurationParserTest.java   |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1644d29..a0d896e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,9 +52,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>com.amazonaws</groupId>
-                <artifactId>aws-java-sdk-bom</artifactId>
-                <version>${awssdk.version}</version>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -197,19 +197,30 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- A hack until testcontainers require JUnit4 -->
+        <!-- https://github.com/testcontainers/testcontainers-java/issues/970 -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit4-mock</artifactId>
+            <version>3.0.0.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>localstack</artifactId>
-            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/test/java/org/zalando/baigan/context/ConfigurationBeanDefinitionRegistrarTest.java b/src/test/java/org/zalando/baigan/context/ConfigurationBeanDefinitionRegistrarTest.java
index 257abe5..662c2a3 100644
--- a/src/test/java/org/zalando/baigan/context/ConfigurationBeanDefinitionRegistrarTest.java
+++ b/src/test/java/org/zalando/baigan/context/ConfigurationBeanDefinitionRegistrarTest.java
@@ -33,7 +33,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.atLeastOnce;
diff --git a/src/test/java/org/zalando/baigan/repository/ConfigurationParserTest.java b/src/test/java/org/zalando/baigan/repository/ConfigurationParserTest.java
index 3a6eea9..e61040d 100644
--- a/src/test/java/org/zalando/baigan/repository/ConfigurationParserTest.java
+++ b/src/test/java/org/zalando/baigan/repository/ConfigurationParserTest.java
@@ -20,7 +20,7 @@
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;