From fdbf775763b0996c4f859eb415db767a2085c955 Mon Sep 17 00:00:00 2001
From: Allard Buijze <allard.buijze@axoniq.io>
Date: Tue, 13 Jan 2026 09:11:45 +0100
Subject: [PATCH 1/7] Updated dependency to TestContainer to 2.0

Configured maven build with Mockito agent to support JDK21+ where dynamic class definitions aren't allowed by default anymore.

Removed some old references to org.junit.Assert, which is deprecated and no longer available after the upgrade.

TestContainers update is (apparently) required for compatibility with new Docker APIs.
---
 pom.xml                                       | 30 ++++++++++++++++---
 .../admin/AdminChannelIntegrationTest.java    |  4 +--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d1e7e30..fe59bedc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <protobuf.version>4.33.1</protobuf.version>
 
         <slf4j.version>2.0.16</slf4j.version>
-        <log4j.version>2.25.2</log4j.version>
+        <log4j.version>2.25.3</log4j.version>
 
         <javax-annotation.version>1.3.2</javax-annotation.version>
 
@@ -60,7 +60,7 @@
         <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
         <junit.jupiter.version>5.14.1</junit.jupiter.version>
         <mockito.version>5.20.0</mockito.version>
-        <testcontainers.version>1.21.3</testcontainers.version>
+        <testcontainers.version>2.0.3</testcontainers.version>
 
         <httpclient5.version>5.5.1</httpclient5.version>
         <toxiproxy.version>2.1.11</toxiproxy.version>
@@ -135,6 +135,21 @@
                 <version>${reactive.streams.version}</version>
                 <scope>test</scope>
             </dependency>
+
+            <!-- For update of testng version, used by reactive-streams-tck to avoid vulnerability -->
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>7.11.0</version>
+                <scope>test</scope>
+            </dependency>
+            <!-- Apparently the log4j dependencies don't all include their own version -->
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${log4j.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -245,13 +260,13 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>toxiproxy</artifactId>
+            <artifactId>testcontainers-toxiproxy</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
@@ -304,6 +319,12 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <!-- this makes dependencies available as properties that resolve to the actual jar file -->
+                    <execution>
+                        <goals>
+                            <goal>properties</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
             <!-- Generated classes for .proto files -->
@@ -406,6 +427,7 @@
                         <include>**/*Test_*.java</include>
                         <include>**/*Tests_*.java</include>
                     </includes>
+                    <argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/test/java/io/axoniq/axonserver/connector/admin/AdminChannelIntegrationTest.java b/src/test/java/io/axoniq/axonserver/connector/admin/AdminChannelIntegrationTest.java
index af7e77a8..1c8dceb0 100644
--- a/src/test/java/io/axoniq/axonserver/connector/admin/AdminChannelIntegrationTest.java
+++ b/src/test/java/io/axoniq/axonserver/connector/admin/AdminChannelIntegrationTest.java
@@ -54,10 +54,10 @@
 import static io.axoniq.axonserver.connector.testutils.AssertUtils.assertWithin;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.*;
 
 /**

From a3502fa8043a4c2d21fb7fdc00c0186b714103fb Mon Sep 17 00:00:00 2001
From: Allard Buijze <allard.buijze@axoniq.io>
Date: Tue, 20 Jan 2026 08:50:39 -0500
Subject: [PATCH 2/7] Removed excessive logging from test case

The DcbEndToEndTest printed all container logs to the test logging. While useful for debugging in certain cases, it is excessive as part of a regular build
---
 .../axoniq/axonserver/connector/event/dcb/DcbEndToEndTest.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/test/java/io/axoniq/axonserver/connector/event/dcb/DcbEndToEndTest.java b/src/test/java/io/axoniq/axonserver/connector/event/dcb/DcbEndToEndTest.java
index 70be6730..d1b3381f 100644
--- a/src/test/java/io/axoniq/axonserver/connector/event/dcb/DcbEndToEndTest.java
+++ b/src/test/java/io/axoniq/axonserver/connector/event/dcb/DcbEndToEndTest.java
@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
@@ -92,8 +91,6 @@ void setUp() {
         } else {
             // Connect to Docker container
             builder.routingServers(axonServerAddress);
-            Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(logger);
-            axonServerContainer.followOutput(logConsumer);
         }
 
         client = builder.build();

From 9bc29b3fd5abadc105ad251b29658703ecebbb73 Mon Sep 17 00:00:00 2001
From: Allard Buijze <allard.buijze@axoniq.io>
Date: Wed, 21 Jan 2026 15:51:16 -0600
Subject: [PATCH 3/7] Disabled the javadoc linter

This seems to revert a change in default settings in a new javadoc plugin version.
---
 pom.xml                                                        | 1 +
 src/main/java/io/axoniq/axonserver/connector/Registration.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fe59bedc..3e328be4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -444,6 +444,7 @@
                 </executions>
                 <configuration>
                     <encoding>UTF-8</encoding>
+                    <doclint>none</doclint>
                     <tags>
                         <tag>
                             <name>apiNote</name>
diff --git a/src/main/java/io/axoniq/axonserver/connector/Registration.java b/src/main/java/io/axoniq/axonserver/connector/Registration.java
index 6b7c045e..7b0afde2 100644
--- a/src/main/java/io/axoniq/axonserver/connector/Registration.java
+++ b/src/main/java/io/axoniq/axonserver/connector/Registration.java
@@ -58,7 +58,7 @@ default Registration awaitAck(long timeout, TimeUnit unit) throws TimeoutExcepti
      * Registers the given {@code runnable} to {@code this} {@link Registration} to be executed when the acknowledgement
      * of {@code this} {@link Registration} is received. Allows for the addition of further logic to {@code this
      * Registration}, like invoking {@link #awaitAck(long, TimeUnit)} for example.
-     * <p/>
+     * <p>
      * The given {@code runnable} is invoked, regardless of successful or failed acknowledgement. Use
      * {@link #onAck(Consumer)} to register an action that needs to distinguish between successful and failed
      * registration.

From f0366b7eb3cb4fd019371450378bd4b2497abf7a Mon Sep 17 00:00:00 2001
From: Marc <marc.gathier@axoniq.io>
Date: Fri, 6 Mar 2026 14:28:46 +0100
Subject: [PATCH 4/7] update gRPC version to fix CVE-2025-58057 in netty.

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

diff --git a/pom.xml b/pom.xml
index 3e328be4..ec270e32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 
         <axonserver.api.version>2025.2.0</axonserver.api.version>
 
-        <grpc.version>1.76.0</grpc.version>
+        <grpc.version>1.79.0</grpc.version>
         <protobuf.version>4.33.1</protobuf.version>
 
         <slf4j.version>2.0.16</slf4j.version>

From b6a395fecc0c01434632efa0c57a528da667a2d7 Mon Sep 17 00:00:00 2001
From: Steven van Beelen <steven.vanbeelen@axoniq.io>
Date: Mon, 16 Mar 2026 09:40:45 +0100
Subject: [PATCH 5/7] [maven-release-plugin] prepare release 2025.2.2

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

diff --git a/pom.xml b/pom.xml
index ec270e32..6eb69122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>io.axoniq</groupId>
     <artifactId>axonserver-connector-java</artifactId>
-    <version>2025.2.2-SNAPSHOT</version>
+    <version>2025.2.2</version>
 
     <name>AxonServer Connector</name>
     <description>
@@ -579,7 +579,7 @@
         <connection>scm:git:https://github.com/AxonIQ/axonserver-connector-java.git</connection>
         <developerConnection>scm:git:https://github.com/AxonIQ/axonserver-connector-java.git</developerConnection>
         <url>https://github.com/AxonIQ/axonserver-connector-java</url>
-        <tag>2025.2.0-rc1</tag>
+        <tag>2025.2.2</tag>
     </scm>
 
     <organization>

From 613179c98b8c07210facb587b738da4cb7a59ddb Mon Sep 17 00:00:00 2001
From: Steven van Beelen <steven.vanbeelen@axoniq.io>
Date: Mon, 16 Mar 2026 09:40:45 +0100
Subject: [PATCH 6/7] [maven-release-plugin] prepare for next development
 iteration

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

diff --git a/pom.xml b/pom.xml
index 6eb69122..4b86549f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>io.axoniq</groupId>
     <artifactId>axonserver-connector-java</artifactId>
-    <version>2025.2.2</version>
+    <version>2025.2.3-SNAPSHOT</version>
 
     <name>AxonServer Connector</name>
     <description>
@@ -579,7 +579,7 @@
         <connection>scm:git:https://github.com/AxonIQ/axonserver-connector-java.git</connection>
         <developerConnection>scm:git:https://github.com/AxonIQ/axonserver-connector-java.git</developerConnection>
         <url>https://github.com/AxonIQ/axonserver-connector-java</url>
-        <tag>2025.2.2</tag>
+        <tag>2025.2.0-rc1</tag>
     </scm>
 
     <organization>

From 4e6a1501e6aa423c7bc9276df959a58907584797 Mon Sep 17 00:00:00 2001
From: Steven van Beelen <steven.vanbeelen@axoniq.io>
Date: Mon, 16 Mar 2026 14:16:37 +0100
Subject: [PATCH 7/7] Fix incorrect auto merge resolution

Fix incorrect auto merge resolution
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 82009df3..e53a59c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
         <junit.jupiter.version>5.14.3</junit.jupiter.version>
         <mockito.version>5.23.0</mockito.version>
-        <testcontainers.version>2.0.4</testcontainers.version>
+        <testcontainers.version>2.0.3</testcontainers.version>
 
         <httpclient5.version>5.6</httpclient5.version>
         <toxiproxy.version>2.1.11</toxiproxy.version>