From a21704a0bbd39866bfb711aae9267f989517b52d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Wed, 10 Jan 2024 09:50:39 +0100
Subject: [PATCH] Upgrade dependencies #2587

Netty 4.1.104.Final, Micrometer 1.12.2, Micrometer Tracing 1.2.2, build plugins
---
 pom.xml                                       | 26 +++++++++----------
 .../StreamClusterCommandIntegrationTests.java |  3 +++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5aeb0cfc0b..0a43fd9a1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,17 +52,17 @@
         <commons-pool.version>2.11.1</commons-pool.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
-        <junit5.version>5.10.0</junit5.version>
+        <junit5.version>5.10.1</junit5.version>
         <hamcrest-library.version>2.2</hamcrest-library.version>
         <hdr-histogram.version>2.1.12</hdr-histogram.version>
         <kotlin.version>1.7.21</kotlin.version>
         <kotlinx-coroutines.version>1.5.2</kotlinx-coroutines.version>
         <latencyutils.version>2.0.3</latencyutils.version>
         <log4j2-version>2.17.2</log4j2-version>
-        <micrometer.version>1.12.0</micrometer.version>
-        <micrometer-tracing.version>1.2.0</micrometer-tracing.version>
+        <micrometer.version>1.12.2</micrometer.version>
+        <micrometer-tracing.version>1.2.2</micrometer-tracing.version>
         <mockito.version>4.9.0</mockito.version>
-        <netty.version>4.1.101.Final</netty.version>
+        <netty.version>4.1.104.Final</netty.version>
         <openwebbeans.version>2.0.27</openwebbeans.version>
         <reactor.version>3.6.0</reactor.version>
         <rxjava.version>1.3.8</rxjava.version>
@@ -257,7 +257,7 @@
         <dependency>
             <groupId>io.netty.incubator</groupId>
             <artifactId>netty-incubator-transport-native-io_uring</artifactId>
-            <version>0.0.23.Final</version>
+            <version>0.0.24.Final</version>
             <classifier>linux-x86_64</classifier>
             <optional>true</optional>
         </dependency>
@@ -577,7 +577,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.12.1</version>
                 </plugin>
 
                 <plugin>
@@ -595,7 +595,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.3</version>
                 </plugin>
 
                 <plugin>
@@ -607,12 +607,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.5</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.maven.surefire</groupId>
                             <artifactId>surefire-junit-platform</artifactId>
-                            <version>3.1.2</version>
+                            <version>3.2.5</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -620,12 +620,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.5</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.maven.surefire</groupId>
                             <artifactId>surefire-junit-platform</artifactId>
-                            <version>3.1.2</version>
+                            <version>3.2.5</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -639,13 +639,13 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.5.0</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.1.1</version>
                 </plugin>
 
                 <plugin>
diff --git a/src/test/java/io/lettuce/core/cluster/commands/StreamClusterCommandIntegrationTests.java b/src/test/java/io/lettuce/core/cluster/commands/StreamClusterCommandIntegrationTests.java
index e24dbe7b62..aca7068065 100644
--- a/src/test/java/io/lettuce/core/cluster/commands/StreamClusterCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/cluster/commands/StreamClusterCommandIntegrationTests.java
@@ -22,6 +22,7 @@
 import io.lettuce.core.cluster.ClusterTestUtil;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.commands.StreamCommandIntegrationTests;
+import org.junit.jupiter.api.Test;
 
 /**
  * Integration tests for {@link io.lettuce.core.api.sync.RedisStreamCommands} using Redis Cluster.
@@ -36,12 +37,14 @@ class StreamClusterCommandIntegrationTests extends StreamCommandIntegrationTests
     }
 
     @Disabled("MULTI not available on Redis Cluster")
+    @Test
     @Override
     public void xreadTransactional() {
         super.xreadTransactional();
     }
 
     @Disabled("Required node reconfiguration with stream-node-max-entries")
+    @Test
     @Override
     public void xaddMinidLimit() {
         super.xaddMinidLimit();