From dfa26f98bfb7cf5828a306060731f6ad3038da7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 31 Oct 2026 08:04:17 +0000 Subject: [PATCH 1/2] chore(deps): bump the all-maven group in /services with 11 updates Bumps the all-maven group in /services with 11 updates: | Package | From | To | | --- | --- | --- | | [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) | `4.1.1` | `4.1.2` | | [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) | `4.12.0` | `4.12.1` | | [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) | `3.6.3` | `3.7.0` | | [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) | `0.8.15` | `0.8.16` | | [com.baomidou:mybatis-plus-spring-boot4-starter](https://github.com/baomidou/mybatis-plus) | `3.5.17` | `3.5.18.1` | | [com.baomidou:mybatis-plus-jsqlparser](https://github.com/baomidou/mybatis-plus) | `3.5.17` | `3.5.18.1` | | [com.baomidou:mybatis-plus-annotation](https://github.com/baomidou/mybatis-plus) | `3.5.17` | `3.5.18.1` | | [com.baomidou:mybatis-plus-core](https://github.com/baomidou/mybatis-plus) | `3.5.17` | `3.5.18.1` | | [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) | `3.1.1` | `3.2.0` | | org.flywaydb:flyway-core | `13.10.3` | `13.11.1` | | org.flywaydb:flyway-mysql | `13.10.3` | `13.11.1` | Updates `org.springframework.boot:spring-boot-starter-parent` from 4.1.1 to 4.1.2 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v4.1.1...v4.1.2) Updates `com.squareup.okhttp3:okhttp` from 4.12.0 to 4.12.1 - [Changelog](https://github.com/lysine-dev/okhttp/blob/main/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-4.12.0...parent-4.12.1) Updates `org.apache.maven.plugins:maven-enforcer-plugin` from 3.6.3 to 3.7.0 - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.6.3...enforcer-3.7.0) Updates `org.jacoco:jacoco-maven-plugin` from 0.8.15 to 0.8.16 - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.15...v0.8.16) Updates `com.baomidou:mybatis-plus-spring-boot4-starter` from 3.5.17 to 3.5.18.1 - [Release notes](https://github.com/baomidou/mybatis-plus/releases) - [Changelog](https://github.com/baomidou/mybatis-plus/blob/3.0/CHANGELOG.md) - [Commits](https://github.com/baomidou/mybatis-plus/compare/v3.5.17...v3.5.18.1) Updates `com.baomidou:mybatis-plus-jsqlparser` from 3.5.17 to 3.5.18.1 - [Release notes](https://github.com/baomidou/mybatis-plus/releases) - [Changelog](https://github.com/baomidou/mybatis-plus/blob/3.0/CHANGELOG.md) - [Commits](https://github.com/baomidou/mybatis-plus/compare/v3.5.17...v3.5.18.1) Updates `com.baomidou:mybatis-plus-annotation` from 3.5.17 to 3.5.18.1 - [Release notes](https://github.com/baomidou/mybatis-plus/releases) - [Changelog](https://github.com/baomidou/mybatis-plus/blob/3.0/CHANGELOG.md) - [Commits](https://github.com/baomidou/mybatis-plus/compare/v3.5.17...v3.5.18.1) Updates `com.baomidou:mybatis-plus-core` from 3.5.17 to 3.5.18.1 - [Release notes](https://github.com/baomidou/mybatis-plus/releases) - [Changelog](https://github.com/baomidou/mybatis-plus/blob/3.0/CHANGELOG.md) - [Commits](https://github.com/baomidou/mybatis-plus/compare/v3.5.17...v3.5.18.1) Updates `com.baomidou:mybatis-plus-jsqlparser` from 3.5.17 to 3.5.18.1 - [Release notes](https://github.com/baomidou/mybatis-plus/releases) - [Changelog](https://github.com/baomidou/mybatis-plus/blob/3.0/CHANGELOG.md) - [Commits](https://github.com/baomidou/mybatis-plus/compare/v3.5.17...v3.5.18.1) Updates `org.springdoc:springdoc-openapi-starter-webmvc-ui` from 3.1.1 to 3.2.0 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](https://github.com/springdoc/springdoc-openapi/compare/v3.1.1...v3.2.0) Updates `com.baomidou:mybatis-plus-annotation` from 3.5.17 to 3.5.18.1 - [Release notes](https://github.com/baomidou/mybatis-plus/releases) - [Changelog](https://github.com/baomidou/mybatis-plus/blob/3.0/CHANGELOG.md) - [Commits](https://github.com/baomidou/mybatis-plus/compare/v3.5.17...v3.5.18.1) Updates `com.baomidou:mybatis-plus-core` from 3.5.17 to 3.5.18.1 - [Release notes](https://github.com/baomidou/mybatis-plus/releases) - [Changelog](https://github.com/baomidou/mybatis-plus/blob/3.0/CHANGELOG.md) - [Commits](https://github.com/baomidou/mybatis-plus/compare/v3.5.17...v3.5.18.1) Updates `org.flywaydb:flyway-core` from 13.10.3 to 13.11.1 Updates `org.flywaydb:flyway-mysql` from 13.10.3 to 13.11.1 --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-version: 4.1.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: com.squareup.okhttp3:okhttp dependency-version: 4.12.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-version: 3.7.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all-maven - dependency-name: org.jacoco:jacoco-maven-plugin dependency-version: 0.8.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: com.baomidou:mybatis-plus-spring-boot4-starter dependency-version: 3.5.18.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: com.baomidou:mybatis-plus-jsqlparser dependency-version: 3.5.18.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: com.baomidou:mybatis-plus-annotation dependency-version: 3.5.18.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: com.baomidou:mybatis-plus-core dependency-version: 3.5.18.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: com.baomidou:mybatis-plus-jsqlparser dependency-version: 3.5.18.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-version: 3.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-maven - dependency-name: com.baomidou:mybatis-plus-annotation dependency-version: 3.5.18.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: com.baomidou:mybatis-plus-core dependency-version: 3.5.18.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-maven - dependency-name: org.flywaydb:flyway-core dependency-version: 13.11.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-maven - dependency-name: org.flywaydb:flyway-mysql dependency-version: 13.11.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-maven ... Signed-off-by: dependabot[bot] --- services/admin/pom.xml | 2 +- services/app/app-web/pom.xml | 6 +++--- services/auth/pom.xml | 2 +- services/core/pom.xml | 4 ++-- services/notification/pom.xml | 2 +- services/platform/receipt/pom.xml | 2 +- services/platform/redis/pom.xml | 2 +- services/platform/web-security/pom.xml | 2 +- services/pom.xml | 10 +++++----- services/submission/pom.xml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/services/admin/pom.xml b/services/admin/pom.xml index 532bdde2b2..be247555f0 100644 --- a/services/admin/pom.xml +++ b/services/admin/pom.xml @@ -250,7 +250,7 @@ org.jacoco jacoco-maven-plugin - 0.8.15 + 0.8.16 prepare-agent diff --git a/services/app/app-web/pom.xml b/services/app/app-web/pom.xml index 7b60821737..8efe16dd24 100644 --- a/services/app/app-web/pom.xml +++ b/services/app/app-web/pom.xml @@ -239,7 +239,7 @@ org.flywaydb flyway-core - 13.10.3 + 13.11.1 test - 4.12.0 + 4.12.1 0.26.5 0.50 + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + pure + + + com.alibaba.nacos + nacos-common + ${nacos-client.version} + + + com.alibaba.nacos + nacos-api + ${nacos-client.version} + org.apache.dubbo dubbo-config-spring diff --git a/services/platform/rpc-resilience/src/test/java/com/ulticode/rpc/resilience/NacosRuntimeDependencyTest.java b/services/platform/rpc-resilience/src/test/java/com/ulticode/rpc/resilience/NacosRuntimeDependencyTest.java new file mode 100644 index 0000000000..155e280d28 --- /dev/null +++ b/services/platform/rpc-resilience/src/test/java/com/ulticode/rpc/resilience/NacosRuntimeDependencyTest.java @@ -0,0 +1,71 @@ +package com.ulticode.rpc.resilience; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.alibaba.nacos.api.grpc.auto.Metadata; +import com.alibaba.nacos.api.grpc.auto.Payload; +import com.alibaba.nacos.api.grpc.auto.RequestGrpc; +import com.alibaba.nacos.client.naming.NacosNamingService; +import com.google.protobuf.Any; +import com.google.protobuf.ByteString; +import io.grpc.ManagedChannel; +import io.grpc.Server; +import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder; +import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder; +import io.grpc.stub.StreamObserver; +import java.net.InetSocketAddress; +import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Test; + +class NacosRuntimeDependencyTest { + + @Test + void excludesTheSdkWithUnmanagedShadedDependencies() throws Exception { + assertThat(NacosNamingService.class.getProtectionDomain().getCodeSource().getLocation().toString()) + .endsWith("-pure.jar"); + assertThat(getClass().getClassLoader().getResources( + "com/alibaba/nacos/api/NacosFactory.class").asIterator()) + .toIterable().hasSize(1); + assertThat(getClass().getClassLoader().getResource( + "com/alibaba/nacos/shaded/com/google/common/collect/ImmutableList.class")) + .isNull(); + } + + @Test + void roundTripsNacosMessagesWithTheManagedProtobufRuntime() throws Exception { + Payload payload = payload(); + assertThat(Payload.parseFrom(payload.toByteArray())).isEqualTo(payload); + } + + @Test + void exchangesNacosMessagesOverTheManagedGrpcTransport() throws Exception { + Server server = NettyServerBuilder.forAddress(new InetSocketAddress("127.0.0.1", 0)) + .addService(new RequestGrpc.RequestImplBase() { + @Override + public void request(Payload request, StreamObserver response) { + response.onNext(request); + response.onCompleted(); + } + }).build().start(); + ManagedChannel channel = null; + try { + channel = NettyChannelBuilder.forAddress("127.0.0.1", server.getPort()) + .usePlaintext().build(); + assertThat(RequestGrpc.newBlockingStub(channel).withDeadlineAfter(5, TimeUnit.SECONDS) + .request(payload())).isEqualTo(payload()); + } finally { + if (channel != null) { + channel.shutdownNow().awaitTermination(5, TimeUnit.SECONDS); + } + server.shutdownNow().awaitTermination(5, TimeUnit.SECONDS); + } + } + + private static Payload payload() { + return Payload.newBuilder() + .setMetadata(Metadata.newBuilder().setType("ServerCheckRequest") + .putHeaders("requestId", "dependency-regression")) + .setBody(Any.newBuilder().setValue(ByteString.copyFromUtf8("{}"))) + .build(); + } +} diff --git a/services/pom.xml b/services/pom.xml index 176c5d7e31..1240e93885 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -64,6 +64,8 @@ 2.21.7 3.1.7 11.0.25 + 33.7.2-jre + 2.5.1 UTF-8 3.5.18.1 0.13.0 @@ -225,6 +227,23 @@ okhttp ${okhttp.version} + + + org.apache.dubbo + dubbo-registry-nacos + ${dubbo.version} + + + com.alibaba.nacos + nacos-client + + + + + com.google.guava + guava + ${guava.version} + org.testcontainers testcontainers-bom