From 13b7cce6695d0c30f837c104986ec4369ebc84e5 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Wed, 20 Oct 2021 11:06:15 +0100
Subject: [PATCH 1/2] Upgrade to Testcontainers 1.16.1, docker-java 3.2.12

---
 bom/application/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index a0e14f13309ed..e7147679c9fda 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -203,8 +203,8 @@
         <avro.version>1.10.2</avro.version>
         <apicurio-registry.version>2.0.1.Final</apicurio-registry.version>
         <jacoco.version>0.8.7</jacoco.version>
-        <testcontainers.version>1.16.0</testcontainers.version>
-        <docker-java.version>3.2.11</docker-java.version> <!-- must be the version Testcontainers use -->
+        <testcontainers.version>1.16.1</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
+        <docker-java.version>3.2.12</docker-java.version> <!-- must be the version Testcontainers use -->
         <aesh-readline.version>2.1</aesh-readline.version>
         <strimzi-oauth.version>0.8.1</strimzi-oauth.version>
         <strimzi.oauth.nimbus.version>9.14</strimzi.oauth.nimbus.version>

From 03304217cb94c65c167f428f99a7f8fac25621b3 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Wed, 20 Oct 2021 11:34:49 +0100
Subject: [PATCH 2/2] Avoid dependency convergence issue with
 org.jetbrains:annotations

---
 extensions/mongodb-client/deployment/pom.xml                | 4 ++++
 integration-tests/resteasy-reactive-kotlin/standard/pom.xml | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/extensions/mongodb-client/deployment/pom.xml b/extensions/mongodb-client/deployment/pom.xml
index 8d8bacc5048ab..4ca4f0e213fcf 100644
--- a/extensions/mongodb-client/deployment/pom.xml
+++ b/extensions/mongodb-client/deployment/pom.xml
@@ -42,6 +42,10 @@
                     <groupId>junit</groupId>
                     <artifactId>junit</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/integration-tests/resteasy-reactive-kotlin/standard/pom.xml b/integration-tests/resteasy-reactive-kotlin/standard/pom.xml
index 71a953d16c947..9ce9a1d56e615 100644
--- a/integration-tests/resteasy-reactive-kotlin/standard/pom.xml
+++ b/integration-tests/resteasy-reactive-kotlin/standard/pom.xml
@@ -60,6 +60,12 @@
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>