Merge pull request #485 from AxonIQ/enhancement/port-2025.2.2

Port 2025.2.2 to 2026.0.0

Author: smcvb

pom.xml

@@ -46,7 +46,7 @@
 
         <axonserver.api.version>2026.0.0-SNAPSHOT</axonserver.api.version>
 
-        <grpc.version>1.76.0</grpc.version>
+        <grpc.version>1.79.0</grpc.version>
         <protobuf.version>4.34.0</protobuf.version>
 
         <slf4j.version>2.0.16</slf4j.version>
@@ -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>1.21.4</testcontainers.version>
+        <testcontainers.version>2.0.3</testcontainers.version>
 
         <httpclient5.version>5.6</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>

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.

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.*;
 
 /**

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();