From d78e5a93278067508a6c493be9454391a78eba02 Mon Sep 17 00:00:00 2001
From: chengyouling <spadgerlin888@163.com>
Date: Mon, 2 Mar 2026 09:59:47 +0800
Subject: [PATCH 1/4] [#5087] upgrade netty/vertx version

---
 dependencies/default/pom.xml                                  | 4 ++--
 .../io/vertx/ext/web/impl/TestHttpServerRequestUtils.java     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index a4f3b63ef09..acd270ae280 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -78,7 +78,7 @@
     <mock-server.version>5.14.0</mock-server.version>
     <nacos-client.version>2.2.0</nacos-client.version>
     <netflix-commons.version>0.3.0</netflix-commons.version>
-    <netty.version>4.1.130.Final</netty.version>
+    <netty.version>4.1.131.Final</netty.version>
     <okhttp3.version>4.10.0</okhttp3.version>
     <prometheus.version>0.16.0</prometheus.version>
     <protobuf.version>3.21.12</protobuf.version>
@@ -98,7 +98,7 @@
     <spring-boot.version>2.7.18</spring-boot.version>
     <swagger.version>1.6.9</swagger.version>
     <swagger2markup.version>1.3.3</swagger2markup.version>
-    <vertx.version>4.5.23</vertx.version>
+    <vertx.version>4.5.25</vertx.version>
     <zipkin.version>2.24.0</zipkin.version>
     <zipkin-reporter.version>2.16.3</zipkin-reporter.version>
     <tomcat.version>9.0.108</tomcat.version>
diff --git a/foundations/foundation-vertx/src/test/java/io/vertx/ext/web/impl/TestHttpServerRequestUtils.java b/foundations/foundation-vertx/src/test/java/io/vertx/ext/web/impl/TestHttpServerRequestUtils.java
index 7297a866b2f..aa68b17396e 100644
--- a/foundations/foundation-vertx/src/test/java/io/vertx/ext/web/impl/TestHttpServerRequestUtils.java
+++ b/foundations/foundation-vertx/src/test/java/io/vertx/ext/web/impl/TestHttpServerRequestUtils.java
@@ -38,6 +38,7 @@ public void testVertxServerRequestToHttpServletRequest() {
     Mockito.when(request.scheme()).thenReturn("http");
     Mockito.when(context.request()).thenReturn(wrapper);
     Mockito.when(request.authority()).thenReturn(HostAndPort.create("localhost", 8080));
+    Mockito.when(request.uri()).thenReturn("/test");
     RequestBody requestBody = Mockito.mock(RequestBody.class);
     Mockito.when(context.body()).thenReturn(requestBody);
 

From 794e46e0f4681b306a64c39c413319d4e15fd3be Mon Sep 17 00:00:00 2001
From: chengyouling <spadgerlin888@163.com>
Date: Mon, 2 Mar 2026 10:41:33 +0800
Subject: [PATCH 2/4] set jdk version

---
 .github/workflows/unit-test-jdk11.yml | 2 +-
 .github/workflows/unit-test-jdk17.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unit-test-jdk11.yml b/.github/workflows/unit-test-jdk11.yml
index 39f644a2dc2..9422b755fa7 100644
--- a/.github/workflows/unit-test-jdk11.yml
+++ b/.github/workflows/unit-test-jdk11.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up jdk
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '11.0.10'
           distribution: 'temurin'
       - name: Compilation and Installation
         run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean test
diff --git a/.github/workflows/unit-test-jdk17.yml b/.github/workflows/unit-test-jdk17.yml
index 20102a3aa58..759f307a2ce 100644
--- a/.github/workflows/unit-test-jdk17.yml
+++ b/.github/workflows/unit-test-jdk17.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up jdk
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '17.0.2'
           distribution: 'temurin'
       - name: Compilation and Installation
         run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean install -Pit

From 1ff78938be1a16ca6cf9f21a2898fab24586f308 Mon Sep 17 00:00:00 2001
From: chengyouling <spadgerlin888@163.com>
Date: Mon, 2 Mar 2026 10:44:45 +0800
Subject: [PATCH 3/4] set jdk version

---
 .github/workflows/unit-test-jdk11.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit-test-jdk11.yml b/.github/workflows/unit-test-jdk11.yml
index 9422b755fa7..df2c21db113 100644
--- a/.github/workflows/unit-test-jdk11.yml
+++ b/.github/workflows/unit-test-jdk11.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up jdk
         uses: actions/setup-java@v3
         with:
-          java-version: '11.0.10'
+          java-version: '11.0.18'
           distribution: 'temurin'
       - name: Compilation and Installation
         run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean test

From 587399d561a85de08e7129b491e8e2958a132e59 Mon Sep 17 00:00:00 2001
From: chengyouling <spadgerlin888@163.com>
Date: Mon, 2 Mar 2026 11:14:40 +0800
Subject: [PATCH 4/4] set jdk version

---
 .github/workflows/unit-test-jdk17.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit-test-jdk17.yml b/.github/workflows/unit-test-jdk17.yml
index 759f307a2ce..2604cd9c033 100644
--- a/.github/workflows/unit-test-jdk17.yml
+++ b/.github/workflows/unit-test-jdk17.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up jdk
         uses: actions/setup-java@v3
         with:
-          java-version: '17.0.2'
+          java-version: '17.0.7'
           distribution: 'temurin'
       - name: Compilation and Installation
         run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean install -Pit