From eb29c39afd9c65ace16aba5cd5aed3c3a8c597a4 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Mon, 2 Mar 2026 11:03:30 +0800 Subject: [PATCH 01/10] [#5087] upgrade netty/vertx version --- .github/workflows/unit-test-jdk17.yml | 2 +- dependencies/default/pom.xml | 4 ++-- .../io/vertx/ext/web/impl/TestHttpServerRequestUtils.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unit-test-jdk17.yml b/.github/workflows/unit-test-jdk17.yml index ebc920c237a..c66036fd95a 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 diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 68cdcf8c6da..5c68d536e89 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -77,7 +77,7 @@ 5.14.0 2.2.0 0.3.0 - 4.1.130.Final + 4.1.131.Final 4.10.0 0.16.0 3.21.12 @@ -97,7 +97,7 @@ 3.4.9 1.6.9 1.3.3 - 4.5.23 + 4.5.25 3.4.3 3.4.0 3.0.2 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 e820a0bd04f060245de94c3585eac5cde251460f Mon Sep 17 00:00:00 2001 From: chengyouling Date: Mon, 2 Mar 2026 11:13:29 +0800 Subject: [PATCH 02/10] set jdk version --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d566e7e2728..33a6e5bec39 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,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: Set up Maven uses: stCarolas/setup-maven@v4.5 From 4c1fb96c1d9c3c775b1e006e81ad1c72532a1b31 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Mon, 2 Mar 2026 16:30:18 +0800 Subject: [PATCH 03/10] rollback 17.0.2 --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 33a6e5bec39..d566e7e2728 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '17.0.7' + java-version: '17.0.2' distribution: 'temurin' - name: Set up Maven uses: stCarolas/setup-maven@v4.5 From 25d4c99eb9847ea77022957b859d31876510a2ac Mon Sep 17 00:00:00 2001 From: chengyouling Date: Mon, 2 Mar 2026 16:38:05 +0800 Subject: [PATCH 04/10] 17.0.8 --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d566e7e2728..3a993f00893 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '17.0.2' + java-version: '17.0.8' distribution: 'temurin' - name: Set up Maven uses: stCarolas/setup-maven@v4.5 From 8d4196d0d8d93bda4c95f02bd3cd780c2662cc7a Mon Sep 17 00:00:00 2001 From: chengyouling Date: Mon, 2 Mar 2026 16:54:48 +0800 Subject: [PATCH 05/10] for test --- .../apache/servicecomb/registry/discovery/DiscoveryTree.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTree.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTree.java index d4246266f67..0996aba11cb 100644 --- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTree.java +++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTree.java @@ -134,7 +134,7 @@ public DiscoveryTreeNode discovery(DiscoveryContext context, String appId, Strin VersionedCache instanceVersionedCache = DiscoveryManager.INSTANCE .getInstanceCacheManager() .getOrCreateVersionedCache(appId, microserviceName, versionRule); - + LOGGER.info("======================================>" + instanceVersionedCache.data().toString()); return discovery(context, instanceVersionedCache); } From 65fb32b030295fdbe8c8ec113c2466cfb1f1f45d Mon Sep 17 00:00:00 2001 From: chengyouling Date: Mon, 2 Mar 2026 16:59:31 +0800 Subject: [PATCH 06/10] for test --- .../registry/consumer/MicroserviceVersions.java | 7 +++++++ .../servicecomb/registry/discovery/DiscoveryTree.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java index c84925a4783..f769d95cca9 100644 --- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java +++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java @@ -167,6 +167,13 @@ public VendorExtensions getVendorExtensions() { public void pullInstances() { lastPullTime = System.currentTimeMillis(); MicroserviceInstances microserviceInstances = findServiceInstances(); + if (microserviceInstances == null || microserviceInstances.getInstancesResponse() == null + || microserviceInstances.getInstancesResponse().getInstances().isEmpty()) { + LOGGER.info("=======================> findServiceInstances is empty"); + } else { + LOGGER.info("pulledInstances =======================>" + + microserviceInstances.getInstancesResponse().getInstances().get(0).toString()); + } lastPulledResult = microserviceInstances; if (microserviceInstances == null) { // pulled failed, did not get anything diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTree.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTree.java index 0996aba11cb..d4246266f67 100644 --- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTree.java +++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/discovery/DiscoveryTree.java @@ -134,7 +134,7 @@ public DiscoveryTreeNode discovery(DiscoveryContext context, String appId, Strin VersionedCache instanceVersionedCache = DiscoveryManager.INSTANCE .getInstanceCacheManager() .getOrCreateVersionedCache(appId, microserviceName, versionRule); - LOGGER.info("======================================>" + instanceVersionedCache.data().toString()); + return discovery(context, instanceVersionedCache); } From 5b75a65036ec9b7b9d8bf6865d1c96302ecc7f75 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Mon, 2 Mar 2026 19:27:30 +0800 Subject: [PATCH 07/10] for test --- .github/workflows/maven.yml | 2 +- dependencies/default/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3a993f00893..33a6e5bec39 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '17.0.8' + java-version: '17.0.7' distribution: 'temurin' - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 5c68d536e89..68cdcf8c6da 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -77,7 +77,7 @@ 5.14.0 2.2.0 0.3.0 - 4.1.131.Final + 4.1.130.Final 4.10.0 0.16.0 3.21.12 @@ -97,7 +97,7 @@ 3.4.9 1.6.9 1.3.3 - 4.5.25 + 4.5.23 3.4.3 3.4.0 3.0.2 From 4b028d8d9054c29fd5744c702cce23a3ef456662 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 3 Mar 2026 14:40:12 +0800 Subject: [PATCH 08/10] for test --- .github/workflows/maven.yml | 2 +- .../registry/cache/RefreshableMicroserviceCache.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 33a6e5bec39..ff18698a535 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '17.0.7' + java-version: '17.0.3' distribution: 'temurin' - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCache.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCache.java index d12dddf9326..954e22e4e23 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCache.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCache.java @@ -115,10 +115,11 @@ private void pullInstance(String revisionId) { revisionId, serviceInstances.getRevision()); for (MicroserviceInstance instance : instances) { - LOGGER.info("service id={}, instance id={}, endpoints={}", + LOGGER.info("service id={}, instance id={}, endpoints={}, status={}", instance.getServiceId(), instance.getInstanceId(), - instance.getEndpoints()); + instance.getEndpoints(), + instance.getStatus()); } safeSetInstances(instances, serviceInstances.getRevision()); } From ec434ba1c418fc2c269c2c6c744e9bde85125783 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 3 Mar 2026 15:02:49 +0800 Subject: [PATCH 09/10] change jdk --- .github/workflows/maven.yml | 2 +- demo/docker-build-config/pom.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ff18698a535..d566e7e2728 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '17.0.3' + java-version: '17.0.2' distribution: 'temurin' - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/demo/docker-build-config/pom.xml b/demo/docker-build-config/pom.xml index 0fea43d196e..aee77410bc0 100644 --- a/demo/docker-build-config/pom.xml +++ b/demo/docker-build-config/pom.xml @@ -42,7 +42,8 @@ ${project.artifactId}:${project.version} ${project.artifactId} - openjdk:17.0.2 + + eclipse-temurin:17-jre-jammy 7070 8080 From c1cf53381408793c0be7f8543b5e29d03ca66544 Mon Sep 17 00:00:00 2001 From: chengyouling Date: Tue, 3 Mar 2026 15:35:15 +0800 Subject: [PATCH 10/10] change jdk --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d566e7e2728..18e87b19c2b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '17.0.2' + java-version: '17.0.4' distribution: 'temurin' - name: Set up Maven uses: stCarolas/setup-maven@v4.5