From 6a6b7a7877da1cc04e65fd8b8bd8630b9295510b Mon Sep 17 00:00:00 2001
From: Matt Collins <matt.collins@thetradedesk.com>
Date: Fri, 19 Jun 2026 09:53:56 +1000
Subject: [PATCH 1/7] Remove duplicate AWS KMS SDK dependency declaration

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6b485ce..28d2b7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,10 +144,6 @@
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>secretsmanager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>kms</artifactId>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sts</artifactId>

From 77841c1cec5ee15658ef6fe45713c520b462f437 Mon Sep 17 00:00:00 2001
From: Matt Collins <matt.collins@thetradedesk.com>
Date: Fri, 19 Jun 2026 09:54:40 +1000
Subject: [PATCH 2/7] Upgrade Mockito to 5.23.0

- Bump mockito-core 5.12.0 -> 5.23.0.
- Drop the standalone mockito-inline (included in mockito-core).
- Drop the direct byte-buddy dependency.
- Explicitly set up instrumentation for inline mocking, following
  https://javadoc.io/doc/org.mockito/mockito-core/latest/org.mockito/org/mockito/Mockito.html#0.3.
---
 pom.xml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 28d2b7a..41aeb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,8 +12,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <maven-dependency-plugin.version>3.11.0</maven-dependency-plugin.version>
         <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.5.6</maven-surefire-plugin.version>
         <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
 
         <vertx.version>4.5.21</vertx.version>
@@ -168,20 +169,9 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.12.0</version>
+            <version>5.23.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>org.mockito</groupId>
-          <artifactId>mockito-inline</artifactId>
-          <version>5.2.0</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>net.bytebuddy</groupId>
-          <artifactId>byte-buddy</artifactId>
-          <version>1.14.17</version>
-        </dependency>
   </dependencies>
 
   <build>
@@ -303,6 +293,21 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire-plugin.version}</version>
+        <configuration>
+          <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven-dependency-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>properties</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

From 177a2b2dfea18a638cf93925f22e40759dc94d2c Mon Sep 17 00:00:00 2001
From: Matt Collins <matt.collins@thetradedesk.com>
Date: Fri, 19 Jun 2026 10:58:11 +1000
Subject: [PATCH 3/7] Use maven-compiler-plugin.version property

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

diff --git a/pom.xml b/pom.xml
index 41aeb04..f361438 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
         <maven-dependency-plugin.version>3.11.0</maven-dependency-plugin.version>
         <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
         <maven-surefire-plugin.version>3.5.6</maven-surefire-plugin.version>
@@ -191,7 +191,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>${maven-compiler-plugin.version}</version>
         <configuration>
           <source>21</source>
           <target>21</target>

From 109a332d16da59a65a972ebca48d23c1bddba6c9 Mon Sep 17 00:00:00 2001
From: Matt Collins <matt.collins@thetradedesk.com>
Date: Fri, 19 Jun 2026 10:58:41 +1000
Subject: [PATCH 4/7] Remove redundant version tags from Vert.x dependencies

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f361438..b625162 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,22 +95,18 @@
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-config</artifactId>
-            <version>${vertx.version}</version>
         </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-web</artifactId>
-            <version>${vertx.version}</version>
         </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-web-client</artifactId>
-            <version>${vertx.version}</version>
         </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-micrometer-metrics</artifactId>
-            <version>${vertx.version}</version>
         </dependency>
         <dependency>
             <groupId>co.nstant.in</groupId>

From 40dfa24a14e784d8d67c70a7d6c55ca1feefeefe Mon Sep 17 00:00:00 2001
From: Matt Collins <matt.collins@thetradedesk.com>
Date: Fri, 19 Jun 2026 11:22:15 +1000
Subject: [PATCH 5/7] Replace `source`/`target` with `release` in compiler
 plugin config

source/target check the bytecode version but still let you call newer JDK
methods, so a build on JDK 26 can pass and then crash at runtime on Java 21.
release pins everything to Java 21, so if it compiles, it runs.
---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b625162..a70934d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,8 +189,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${maven-compiler-plugin.version}</version>
         <configuration>
-          <source>21</source>
-          <target>21</target>
+          <release>21</release>
         </configuration>
       </plugin>
       <plugin>

From 347dfe03330ac2645702f915d6cdc7b8a91b87a1 Mon Sep 17 00:00:00 2001
From: Matt Collins <matt.collins@thetradedesk.com>
Date: Fri, 19 Jun 2026 11:22:36 +1000
Subject: [PATCH 6/7] Remove unused `maven-shade-plugin.version` property

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a70934d..8e15d6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,6 @@
 
         <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
         <maven-dependency-plugin.version>3.11.0</maven-dependency-plugin.version>
-        <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
         <maven-surefire-plugin.version>3.5.6</maven-surefire-plugin.version>
         <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
 

From 78da3242f913b993d3846f2f8bdbdd8ef72b2ca0 Mon Sep 17 00:00:00 2001
From: Matt Collins <matt.collins@thetradedesk.com>
Date: Fri, 19 Jun 2026 11:31:55 +1000
Subject: [PATCH 7/7] Remove unused cbor dependency

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8e15d6c..51ab9e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,11 +107,6 @@
             <groupId>io.vertx</groupId>
             <artifactId>vertx-micrometer-metrics</artifactId>
         </dependency>
-        <dependency>
-            <groupId>co.nstant.in</groupId>
-            <artifactId>cbor</artifactId>
-            <version>0.9</version>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>kms</artifactId>