From 1b265619f340106696c9bbff76ea97c34bae69c9 Mon Sep 17 00:00:00 2001
From: Nikita Karpuk <bitxon.dev@gmail.com>
Date: Sun, 23 Apr 2023 14:00:42 +0200
Subject: [PATCH 1/2] Fix pom.xml formatting

---
 pom.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce942b4..e294a36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,18 +21,18 @@
     <wiremock.version>2.35.0</wiremock.version>
     <testcontainers.version>1.18.0</testcontainers.version>
     <junit.version>5.9.2</junit.version>
-     <project.scm.id>github</project.scm.id>  
+    <project.scm.id>github</project.scm.id>
   </properties>
 
   <dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers-bom</artifactId>
-            <version>${testcontainers.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
+      <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers-bom</artifactId>
+        <version>${testcontainers.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -124,7 +124,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
@@ -146,14 +146,14 @@
       </releases>
     </repository>
   </repositories>
-  
+
   <scm>
     <connection>scm:git:git://github.com/wiremock/wiremock-testcontainers-java.git</connection>
     <developerConnection>scm:git:https://github.com/wiremock/wiremock-testcontainers-java.git</developerConnection>
     <url>https://github.com/wiremock/wiremock-testcontainers-java</url>
     <tag>${scmTag}</tag>
   </scm>
-         
+
   <distributionManagement>
     <repository>
       <id>github</id>

From 33ee1bd90305cad9e51ad0eb6ef181294540cd36 Mon Sep 17 00:00:00 2001
From: Nikita Karpuk <bitxon.dev@gmail.com>
Date: Sun, 23 Apr 2023 14:17:05 +0200
Subject: [PATCH 2/2] Enable execution of Junit4 and Junit5 together

---
 pom.xml | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e294a36..e28d2cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
     <wiremock.version>2.35.0</wiremock.version>
     <testcontainers.version>1.18.0</testcontainers.version>
     <junit.version>5.9.2</junit.version>
+    <assertj.version>3.24.2</assertj.version>
     <project.scm.id>github</project.scm.id>
   </properties>
 
@@ -33,6 +34,20 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${junit.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-bom</artifactId>
+        <version>${assertj.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -40,12 +55,25 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>${testcontainers.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.24.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>