From 127257d326a4eb6f3051613bd772a214cb1d5a16 Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Tue, 5 May 2020 11:19:15 +0300
Subject: [PATCH 1/2] Remove testcontainers from BOM

---
 bom/runtime/pom.xml  | 23 -----------------------
 build-parent/pom.xml | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index b23933870f049..838d7496f8094 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -124,7 +124,6 @@
         <caffeine.version>2.8.0</caffeine.version>
         <netty.version>4.1.49.Final</netty.version>
         <reactive-streams.version>1.0.3</reactive-streams.version>
-        <test-containers.version>1.14.1</test-containers.version>
         <jboss-logging.version>3.3.2.Final</jboss-logging.version>
         <mutiny.version>0.5.0</mutiny.version>
         <axle-client.version>0.0.15</axle-client.version>
@@ -181,7 +180,6 @@
         <mvel2.version>2.4.7.Final</mvel2.version>
         <htmlunit.version>2.36.0</htmlunit.version>
         <mockito.version>3.3.3</mockito.version>
-        <jna.version>5.3.1</jna.version>
         <antlr.version>4.7.2</antlr.version>
         <quarkus-security.version>1.1.1.Final</quarkus-security.version>
         <keycloak.version>9.0.2</keycloak.version>
@@ -1781,27 +1779,6 @@
                 <artifactId>json-smart</artifactId>
                 <version>${json-smart.version}</version>
             </dependency>
-            <!-- JNA dependency is fixed due to transitive dependency issue on testcontainers-->
-            <dependency>
-                <groupId>net.java.dev.jna</groupId>
-                <artifactId>jna</artifactId>
-                <version>${jna.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers</artifactId>
-                <version>${test-containers.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>${test-containers.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>postgresql</artifactId>
-                <version>${test-containers.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-utils</artifactId>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 0451b10131c2b..f4a7ec782868e 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -86,6 +86,9 @@
         <wiremock-jre8.version>2.26.3</wiremock-jre8.version>
         <wiremock-maven-plugin.version>6.0.0</wiremock-maven-plugin.version>
 
+        <test-containers.version>1.14.1</test-containers.version>
+        <jna.version>5.3.1</jna.version>
+
         <!-- Code Coverage Properties-->
         <jacoco.agent.argLine></jacoco.agent.argLine>
         <jacoco.version>0.8.5</jacoco.version>
@@ -195,6 +198,23 @@
                 </exclusions>
             </dependency>
 
+            <!-- JNA dependency is fixed due to transitive dependency issue on testcontainers-->
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>${jna.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers</artifactId>
+                <version>${test-containers.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${test-containers.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

From f1e62f1aa7ac489d387ab2d23de1284b4b5da0d2 Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Tue, 5 May 2020 11:47:15 +0300
Subject: [PATCH 2/2] Update testcontainers dependabot configuration

---
 .dependabot/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.dependabot/config.yml b/.dependabot/config.yml
index c9a1965771a8e..429c7fb0b1e83 100644
--- a/.dependabot/config.yml
+++ b/.dependabot/config.yml
@@ -110,7 +110,7 @@ update_configs:
       - match:
           dependency_name: "org.testcontainers:testcontainers"
       - match:
-          dependency_name: "org.testcontainers:junit-jupiter"
+          dependency_name: "org.testcontainers:postgresql"
       - match:
           dependency_name: "org.mockito:mockito-core"
       - match: