Merge pull request #10 from bitxon/feature/re-organize-dependencies

Feature/Re-organize Dependencies and enable Juni4 & Junit5 execution togeter

Author: oleg-nenashev

pom.xml

@@ -21,31 +21,59 @@
     <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>  
+    <assertj.version>3.24.2</assertj.version>
+    <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>
+      <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>
 
   <dependencies>
     <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>
@@ -124,7 +152,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
@@ -146,14 +174,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>