diff --git a/1-basic/dubbo-samples-api-idl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/DubboGreeterTriple.java b/1-basic/dubbo-samples-api-idl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/DubboGreeterTriple.java index 8e90c7b155..0bff5a0491 100644 --- a/1-basic/dubbo-samples-api-idl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/DubboGreeterTriple.java +++ b/1-basic/dubbo-samples-api-idl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/DubboGreeterTriple.java @@ -15,10 +15,10 @@ * limitations under the License. */ - package org.apache.dubbo.samples.tri.unary; +package org.apache.dubbo.samples.tri.unary; -import org.apache.dubbo.common.stream.StreamObserver; import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.stream.StreamObserver; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.PathResolver; import org.apache.dubbo.rpc.RpcException; @@ -28,20 +28,19 @@ import org.apache.dubbo.rpc.model.ServiceDescriptor; import org.apache.dubbo.rpc.model.StubMethodDescriptor; import org.apache.dubbo.rpc.model.StubServiceDescriptor; -import org.apache.dubbo.rpc.stub.BiStreamMethodHandler; -import org.apache.dubbo.rpc.stub.ServerStreamMethodHandler; +import org.apache.dubbo.rpc.service.Destroyable; import org.apache.dubbo.rpc.stub.StubInvocationUtil; import org.apache.dubbo.rpc.stub.StubInvoker; import org.apache.dubbo.rpc.stub.StubMethodHandler; import org.apache.dubbo.rpc.stub.StubSuppliers; import org.apache.dubbo.rpc.stub.UnaryStubMethodHandler; -import com.google.protobuf.Message; - import java.util.HashMap; import java.util.Map; -import java.util.function.BiConsumer; import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; + +import com.google.protobuf.Message; public final class DubboGreeterTriple { @@ -63,31 +62,40 @@ public static Greeter newStub(Invoker invoker) { } private static final StubMethodDescriptor greetMethod = new StubMethodDescriptor("greet", - org.apache.dubbo.samples.tri.unary.GreeterRequest.class, org.apache.dubbo.samples.tri.unary.GreeterReply.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY, + org.apache.dubbo.samples.tri.unary.GreeterRequest.class, org.apache.dubbo.samples.tri.unary.GreeterReply.class, MethodDescriptor.RpcType.UNARY, obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), org.apache.dubbo.samples.tri.unary.GreeterRequest::parseFrom, org.apache.dubbo.samples.tri.unary.GreeterReply::parseFrom); private static final StubMethodDescriptor greetAsyncMethod = new StubMethodDescriptor("greet", - org.apache.dubbo.samples.tri.unary.GreeterRequest.class, java.util.concurrent.CompletableFuture.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY, + org.apache.dubbo.samples.tri.unary.GreeterRequest.class, java.util.concurrent.CompletableFuture.class, MethodDescriptor.RpcType.UNARY, obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), org.apache.dubbo.samples.tri.unary.GreeterRequest::parseFrom, org.apache.dubbo.samples.tri.unary.GreeterReply::parseFrom); private static final StubMethodDescriptor greetProxyAsyncMethod = new StubMethodDescriptor("greetAsync", - org.apache.dubbo.samples.tri.unary.GreeterRequest.class, org.apache.dubbo.samples.tri.unary.GreeterReply.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY, + org.apache.dubbo.samples.tri.unary.GreeterRequest.class, org.apache.dubbo.samples.tri.unary.GreeterReply.class, MethodDescriptor.RpcType.UNARY, obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), org.apache.dubbo.samples.tri.unary.GreeterRequest::parseFrom, org.apache.dubbo.samples.tri.unary.GreeterReply::parseFrom); + static{ + serviceDescriptor.addMethod(greetMethod); + serviceDescriptor.addMethod(greetProxyAsyncMethod); + } - public static class GreeterStub implements Greeter{ + public static class GreeterStub implements Greeter, Destroyable { private final Invoker invoker; public GreeterStub(Invoker invoker) { this.invoker = invoker; } + @Override + public void $destroy() { + invoker.destroy(); + } + @Override public org.apache.dubbo.samples.tri.unary.GreeterReply greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request){ return StubInvocationUtil.unaryCall(invoker, greetMethod, request); @@ -97,7 +105,6 @@ public CompletableFuture greetA return StubInvocationUtil.unaryCall(invoker, greetAsyncMethod, request); } - @Override public void greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request, StreamObserver responseObserver){ StubInvocationUtil.unaryCall(invoker, greetMethod , request, responseObserver); } @@ -123,6 +130,26 @@ public void accept(T t, StreamObserver observer) { }; } + @Override + public CompletableFuture greetAsync(org.apache.dubbo.samples.tri.unary.GreeterRequest request){ + return CompletableFuture.completedFuture(greet(request)); + } + + /** + * This server stream type unary method is only used for generated stub to support async unary method. + * It will not be called if you are NOT using Dubbo3 generated triple stub and DO NOT implement this method. + */ + public void greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request, StreamObserver responseObserver){ + greetAsync(request).whenComplete((r, t) -> { + if (t != null) { + responseObserver.onError(t); + } else { + responseObserver.onNext(r); + responseObserver.onCompleted(); + } + }); + } + @Override public final Invoker getInvoker(URL url) { PathResolver pathResolver = url.getOrDefaultFrameworkModel() @@ -130,8 +157,12 @@ public final Invoker getInvoker(URL url) { .getDefaultExtension(); Map> handlers = new HashMap<>(); - pathResolver.addNativeStub( "/" + SERVICE_NAME + "/greet" ); - pathResolver.addNativeStub( "/" + SERVICE_NAME + "/greetAsync" ); + pathResolver.addNativeStub( "/" + SERVICE_NAME + "/greet"); + pathResolver.addNativeStub( "/" + SERVICE_NAME + "/greetAsync"); + // for compatibility + pathResolver.addNativeStub( "/" + JAVA_SERVICE_NAME + "/greet"); + pathResolver.addNativeStub( "/" + JAVA_SERVICE_NAME + "/greetAsync"); + BiConsumer> greetFunc = this::greet; handlers.put(greetMethod.getMethodName(), new UnaryStubMethodHandler<>(greetFunc)); diff --git a/1-basic/dubbo-samples-api-idl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/Greeter.java b/1-basic/dubbo-samples-api-idl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/Greeter.java index ff3efea876..36ddf1d6da 100644 --- a/1-basic/dubbo-samples-api-idl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/Greeter.java +++ b/1-basic/dubbo-samples-api-idl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/Greeter.java @@ -15,41 +15,19 @@ * limitations under the License. */ - package org.apache.dubbo.samples.tri.unary; +package org.apache.dubbo.samples.tri.unary; -import org.apache.dubbo.common.stream.StreamObserver; -import com.google.protobuf.Message; - -import java.util.HashMap; -import java.util.Map; -import java.util.function.BiConsumer; import java.util.concurrent.CompletableFuture; public interface Greeter extends org.apache.dubbo.rpc.model.DubboStub { String JAVA_SERVICE_NAME = "org.apache.dubbo.samples.tri.unary.Greeter"; String SERVICE_NAME = "org.apache.dubbo.samples.tri.unary.Greeter"; - org.apache.dubbo.samples.tri.unary.GreeterReply greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request); - default CompletableFuture greetAsync(org.apache.dubbo.samples.tri.unary.GreeterRequest request){ - return CompletableFuture.completedFuture(greet(request)); - } - - /** - * This server stream type unary method is only used for generated stub to support async unary method. - * It will not be called if you are NOT using Dubbo3 generated triple stub and DO NOT implement this method. - */ - default void greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request, StreamObserver responseObserver){ - greetAsync(request).whenComplete((r, t) -> { - if (t != null) { - responseObserver.onError(t); - } else { - responseObserver.onNext(r); - responseObserver.onCompleted(); - } - }); - } + CompletableFuture greetAsync(org.apache.dubbo.samples.tri.unary.GreeterRequest request); + + diff --git a/1-basic/dubbo-samples-api-idl/pom.xml b/1-basic/dubbo-samples-api-idl/pom.xml index 0f65a4e8ca..fa52e6c6b1 100644 --- a/1-basic/dubbo-samples-api-idl/pom.xml +++ b/1-basic/dubbo-samples-api-idl/pom.xml @@ -35,7 +35,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.19.6 3.22.3 2.20.0 diff --git a/1-basic/dubbo-samples-api-idl/src/main/java/org/apache/dubbo/samples/tri/unary/GreeterImpl.java b/1-basic/dubbo-samples-api-idl/src/main/java/org/apache/dubbo/samples/tri/unary/GreeterImpl.java index bd828b545c..1c335b56fb 100644 --- a/1-basic/dubbo-samples-api-idl/src/main/java/org/apache/dubbo/samples/tri/unary/GreeterImpl.java +++ b/1-basic/dubbo-samples-api-idl/src/main/java/org/apache/dubbo/samples/tri/unary/GreeterImpl.java @@ -17,11 +17,11 @@ package org.apache.dubbo.samples.tri.unary; +import java.util.concurrent.CompletableFuture; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.CompletableFuture; - public class GreeterImpl extends DubboGreeterTriple.GreeterImplBase { private static final Logger LOGGER = LoggerFactory.getLogger(GreeterImpl.class); private final String serverName; diff --git a/1-basic/dubbo-samples-api/pom.xml b/1-basic/dubbo-samples-api/pom.xml index 6363dbabc4..0680b87462 100644 --- a/1-basic/dubbo-samples-api/pom.xml +++ b/1-basic/dubbo-samples-api/pom.xml @@ -40,7 +40,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 2.20.0 5.9.2 diff --git a/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-consumer/build/generated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java b/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-consumer/build/generated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java index 48eba35dfc..d515e1bc2e 100644 --- a/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-consumer/build/generated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java +++ b/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-consumer/build/generated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java @@ -17,8 +17,8 @@ package org.apache.dubbo.springboot.demo.idl; -import org.apache.dubbo.common.stream.StreamObserver; import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.stream.StreamObserver; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.PathResolver; import org.apache.dubbo.rpc.RpcException; @@ -28,20 +28,19 @@ import org.apache.dubbo.rpc.model.ServiceDescriptor; import org.apache.dubbo.rpc.model.StubMethodDescriptor; import org.apache.dubbo.rpc.model.StubServiceDescriptor; -import org.apache.dubbo.rpc.stub.BiStreamMethodHandler; -import org.apache.dubbo.rpc.stub.ServerStreamMethodHandler; +import org.apache.dubbo.rpc.service.Destroyable; import org.apache.dubbo.rpc.stub.StubInvocationUtil; import org.apache.dubbo.rpc.stub.StubInvoker; import org.apache.dubbo.rpc.stub.StubMethodHandler; import org.apache.dubbo.rpc.stub.StubSuppliers; import org.apache.dubbo.rpc.stub.UnaryStubMethodHandler; -import com.google.protobuf.Message; - import java.util.HashMap; import java.util.Map; -import java.util.function.BiConsumer; import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; + +import com.google.protobuf.Message; public final class DubboGreeterTriple { @@ -85,13 +84,18 @@ public static Greeter newStub(Invoker invoker) { serviceDescriptor.addMethod(greetProxyAsyncMethod); } - public static class GreeterStub implements Greeter{ + public static class GreeterStub implements Greeter, Destroyable { private final Invoker invoker; public GreeterStub(Invoker invoker) { this.invoker = invoker; } + @Override + public void $destroy() { + invoker.destroy(); + } + @Override public org.apache.dubbo.springboot.demo.idl.GreeterReply greet(org.apache.dubbo.springboot.demo.idl.GreeterRequest request){ return StubInvocationUtil.unaryCall(invoker, greetMethod, request); diff --git a/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-provider/build/generated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java b/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-provider/build/generated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java index 48eba35dfc..d515e1bc2e 100644 --- a/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-provider/build/generated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java +++ b/1-basic/dubbo-samples-spring-boot-idl/dubbo-samples-spring-boot-idl-provider/build/generated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java @@ -17,8 +17,8 @@ package org.apache.dubbo.springboot.demo.idl; -import org.apache.dubbo.common.stream.StreamObserver; import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.stream.StreamObserver; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.PathResolver; import org.apache.dubbo.rpc.RpcException; @@ -28,20 +28,19 @@ import org.apache.dubbo.rpc.model.ServiceDescriptor; import org.apache.dubbo.rpc.model.StubMethodDescriptor; import org.apache.dubbo.rpc.model.StubServiceDescriptor; -import org.apache.dubbo.rpc.stub.BiStreamMethodHandler; -import org.apache.dubbo.rpc.stub.ServerStreamMethodHandler; +import org.apache.dubbo.rpc.service.Destroyable; import org.apache.dubbo.rpc.stub.StubInvocationUtil; import org.apache.dubbo.rpc.stub.StubInvoker; import org.apache.dubbo.rpc.stub.StubMethodHandler; import org.apache.dubbo.rpc.stub.StubSuppliers; import org.apache.dubbo.rpc.stub.UnaryStubMethodHandler; -import com.google.protobuf.Message; - import java.util.HashMap; import java.util.Map; -import java.util.function.BiConsumer; import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; + +import com.google.protobuf.Message; public final class DubboGreeterTriple { @@ -85,13 +84,18 @@ public static Greeter newStub(Invoker invoker) { serviceDescriptor.addMethod(greetProxyAsyncMethod); } - public static class GreeterStub implements Greeter{ + public static class GreeterStub implements Greeter, Destroyable { private final Invoker invoker; public GreeterStub(Invoker invoker) { this.invoker = invoker; } + @Override + public void $destroy() { + invoker.destroy(); + } + @Override public org.apache.dubbo.springboot.demo.idl.GreeterReply greet(org.apache.dubbo.springboot.demo.idl.GreeterRequest request){ return StubInvocationUtil.unaryCall(invoker, greetMethod, request); diff --git a/1-basic/dubbo-samples-spring-boot-idl/pom.xml b/1-basic/dubbo-samples-spring-boot-idl/pom.xml index 6dba99d5eb..5176743a03 100644 --- a/1-basic/dubbo-samples-spring-boot-idl/pom.xml +++ b/1-basic/dubbo-samples-spring-boot-idl/pom.xml @@ -40,7 +40,7 @@ 17 UTF-8 - 3.3.0-beta.2 + 3.3.1 3.2.3 3.19.6 3.22.3 diff --git a/1-basic/dubbo-samples-spring-boot/pom.xml b/1-basic/dubbo-samples-spring-boot/pom.xml index 7c34f74433..bb0dc6ac7d 100644 --- a/1-basic/dubbo-samples-spring-boot/pom.xml +++ b/1-basic/dubbo-samples-spring-boot/pom.xml @@ -40,7 +40,7 @@ 17 UTF-8 - 3.3.0-beta.2 + 3.3.1 3.2.3 diff --git a/10-task/dubbo-samples-benchmark/dubbo-samples-benchmark-consumer/pom.xml b/10-task/dubbo-samples-benchmark/dubbo-samples-benchmark-consumer/pom.xml index b3a45557e2..1d9fd9d680 100644 --- a/10-task/dubbo-samples-benchmark/dubbo-samples-benchmark-consumer/pom.xml +++ b/10-task/dubbo-samples-benchmark/dubbo-samples-benchmark-consumer/pom.xml @@ -40,7 +40,7 @@ org.apache.dubbo - dubbo-dependencies-zookeeper + dubbo-dependencies-zookeeper-curator5 pom diff --git a/10-task/dubbo-samples-benchmark/pom.xml b/10-task/dubbo-samples-benchmark/pom.xml index 545df97c65..13f447338f 100644 --- a/10-task/dubbo-samples-benchmark/pom.xml +++ b/10-task/dubbo-samples-benchmark/pom.xml @@ -37,7 +37,7 @@ Dubbo Samples benchmark - 3.3.0-beta.1 + 3.3.1 4.13.1 2.7.8 1.8 diff --git a/10-task/dubbo-samples-develop/dubbo-samples-develop-consumer/pom.xml b/10-task/dubbo-samples-develop/dubbo-samples-develop-consumer/pom.xml index 250c6cd7e9..e57846d05e 100644 --- a/10-task/dubbo-samples-develop/dubbo-samples-develop-consumer/pom.xml +++ b/10-task/dubbo-samples-develop/dubbo-samples-develop-consumer/pom.xml @@ -38,7 +38,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 diff --git a/10-task/dubbo-samples-develop/dubbo-samples-develop-provider/pom.xml b/10-task/dubbo-samples-develop/dubbo-samples-develop-provider/pom.xml index 220c3d5ef7..52160dc90d 100644 --- a/10-task/dubbo-samples-develop/dubbo-samples-develop-provider/pom.xml +++ b/10-task/dubbo-samples-develop/dubbo-samples-develop-provider/pom.xml @@ -38,7 +38,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 diff --git a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-consumer/pom.xml b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-consumer/pom.xml index 9e627c55fc..c2153bc4aa 100644 --- a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-consumer/pom.xml +++ b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-consumer/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-provider/pom.xml b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-provider/pom.xml index 292ba2ee88..ba4e8165a6 100644 --- a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-provider/pom.xml +++ b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-provider/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-common/pom.xml b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-common/pom.xml index 15ce6fa238..4d572b8803 100644 --- a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-common/pom.xml +++ b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-common/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 diff --git a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-consumer/pom.xml b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-consumer/pom.xml index 9f8dc2f2b0..28740311cf 100644 --- a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-consumer/pom.xml +++ b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-consumer/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-provider/pom.xml b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-provider/pom.xml index b8c830975c..8446632c73 100644 --- a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-provider/pom.xml +++ b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-protocol-provider/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-router-consumer/pom.xml b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-router-consumer/pom.xml index f6ded21d91..01ea4162e3 100644 --- a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-router-consumer/pom.xml +++ b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-router-consumer/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-router-provider/pom.xml b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-router-provider/pom.xml index 3235020dad..feeed873e0 100644 --- a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-router-provider/pom.xml +++ b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-router-provider/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1/pom.xml index 267c2eb4fb..aa9c12e7f2 100644 --- a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1/pom.xml +++ b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 @@ -64,12 +64,12 @@ org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-starter ${dubbo.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${dubbo.version} diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v2/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v2/pom.xml index ad9d965d3f..595b775c8a 100644 --- a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v2/pom.xml +++ b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v2/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 @@ -64,12 +64,12 @@ org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-starter ${dubbo.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${dubbo.version} diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-detail-v1/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-detail-v1/pom.xml index 6cd7b55142..1aa3917ffc 100644 --- a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-detail-v1/pom.xml +++ b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-detail-v1/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 @@ -68,12 +68,12 @@ org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-starter ${dubbo.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${dubbo.version} diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-detail-v2/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-detail-v2/pom.xml index 5ea38c6e4e..f4037fdddb 100644 --- a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-detail-v2/pom.xml +++ b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-detail-v2/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 @@ -68,12 +68,12 @@ org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-starter ${dubbo.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${dubbo.version} diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-frontend/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-frontend/pom.xml index 13968865d4..1d01178774 100644 --- a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-frontend/pom.xml +++ b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-frontend/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 @@ -80,12 +80,12 @@ org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-starter ${dubbo.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${dubbo.version} diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-order-v1/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-order-v1/pom.xml index 7ee19e1ed0..8f4b22f887 100644 --- a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-order-v1/pom.xml +++ b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-order-v1/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 @@ -64,12 +64,12 @@ org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-starter ${dubbo.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${dubbo.version} diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-order-v2/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-order-v2/pom.xml index ade081406b..fcb948bab5 100644 --- a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-order-v2/pom.xml +++ b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-order-v2/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 @@ -69,12 +69,12 @@ org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-starter ${dubbo.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${dubbo.version} diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-user/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-user/pom.xml index f645b1777b..27c54da98b 100644 --- a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-user/pom.xml +++ b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-user/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 @@ -64,12 +64,12 @@ org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-starter ${dubbo.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${dubbo.version} diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-a/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-a/pom.xml index 56f5619932..8f0e090372 100644 --- a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-a/pom.xml +++ b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-a/pom.xml @@ -37,7 +37,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v1/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v1/pom.xml index 33dd6c38c7..e0115f3c4b 100644 --- a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v1/pom.xml +++ b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v1/pom.xml @@ -37,7 +37,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v2/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v2/pom.xml index f1d589cada..9b4705b14c 100644 --- a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v2/pom.xml +++ b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-b-v2/pom.xml @@ -37,7 +37,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-c/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-c/pom.xml index 5de0c3da14..da7b7ba54f 100644 --- a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-c/pom.xml +++ b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-c/pom.xml @@ -37,7 +37,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 diff --git a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-d/pom.xml b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-d/pom.xml index 8b2b239a22..05c951d6a1 100644 --- a/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-d/pom.xml +++ b/10-task/dubbo-samples-rpc-advanced/dubbo-samples-rpc-advanced-app-d/pom.xml @@ -37,7 +37,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 diff --git a/10-task/dubbo-samples-rpc-basic/dubbo-samples-rpc-basic-consumer/pom.xml b/10-task/dubbo-samples-rpc-basic/dubbo-samples-rpc-basic-consumer/pom.xml index ac26ddc5b2..cab494c6db 100644 --- a/10-task/dubbo-samples-rpc-basic/dubbo-samples-rpc-basic-consumer/pom.xml +++ b/10-task/dubbo-samples-rpc-basic/dubbo-samples-rpc-basic-consumer/pom.xml @@ -38,7 +38,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-rpc-basic/dubbo-samples-rpc-basic-provider/pom.xml b/10-task/dubbo-samples-rpc-basic/dubbo-samples-rpc-basic-provider/pom.xml index a7a337884a..7dce37bb75 100644 --- a/10-task/dubbo-samples-rpc-basic/dubbo-samples-rpc-basic-provider/pom.xml +++ b/10-task/dubbo-samples-rpc-basic/dubbo-samples-rpc-basic-provider/pom.xml @@ -37,7 +37,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-gray/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-gray/pom.xml index 1f3ea1385d..044b99c034 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-gray/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-gray/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-v1/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-v1/pom.xml index 727c27f91a..5583c5e12c 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-v1/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-v1/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-v2/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-v2/pom.xml index 405d5574a8..49239f35b4 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-v2/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-comment-v2/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-gray/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-gray/pom.xml index 245e0f55cd..1e478add3a 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-gray/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-gray/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-v1/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-v1/pom.xml index 5828d8bdab..e32c0757ba 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-v1/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-v1/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-v2/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-v2/pom.xml index 022b9649bc..f5bbd33ddd 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-v2/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-detail-v2/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-frontend/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-frontend/pom.xml index c84d6e47e5..efb4654477 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-frontend/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-frontend/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-order-gray/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-order-gray/pom.xml index ac6a71c40d..d9b3c7bccd 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-order-gray/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-order-gray/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-order-v1/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-order-v1/pom.xml index e43ca199ac..9aed9964d4 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-order-v1/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-order-v1/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-order-v2/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-order-v2/pom.xml index 5018562f46..40870b1d9f 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-order-v2/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-order-v2/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-user-gray/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-user-gray/pom.xml index 11cb688e20..d9a6e3facb 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-user-gray/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-user-gray/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/10-task/dubbo-samples-shop/dubbo-samples-shop-user/pom.xml b/10-task/dubbo-samples-shop/dubbo-samples-shop-user/pom.xml index 1ead5219c1..4edad6485a 100644 --- a/10-task/dubbo-samples-shop/dubbo-samples-shop-user/pom.xml +++ b/10-task/dubbo-samples-shop/dubbo-samples-shop-user/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.2.0 diff --git a/2-advanced/dubbo-samples-annotation/pom.xml b/2-advanced/dubbo-samples-annotation/pom.xml index 44e0fe47b9..afea910a88 100644 --- a/2-advanced/dubbo-samples-annotation/pom.xml +++ b/2-advanced/dubbo-samples-annotation/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 5.3.25 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-api-with-registry/pom.xml b/2-advanced/dubbo-samples-api-with-registry/pom.xml index 5f143da4d3..8371628c40 100644 --- a/2-advanced/dubbo-samples-api-with-registry/pom.xml +++ b/2-advanced/dubbo-samples-api-with-registry/pom.xml @@ -40,7 +40,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 2.20.0 5.10.1 diff --git a/2-advanced/dubbo-samples-async/dubbo-sample-async-generated-future-springboot/pom.xml b/2-advanced/dubbo-samples-async/dubbo-sample-async-generated-future-springboot/pom.xml index eb9351ebb1..e744c05731 100644 --- a/2-advanced/dubbo-samples-async/dubbo-sample-async-generated-future-springboot/pom.xml +++ b/2-advanced/dubbo-samples-async/dubbo-sample-async-generated-future-springboot/pom.xml @@ -40,7 +40,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.7.8 4.13.1 diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future-springboot/pom.xml b/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future-springboot/pom.xml index 4903d48df5..9ed8e6a6c7 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future-springboot/pom.xml +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future-springboot/pom.xml @@ -41,7 +41,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.7.8 4.3.30.RELEASE 4.13.1 diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future/pom.xml b/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future/pom.xml index 26b7f9c053..3cc1e427ae 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future/pom.xml +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml b/2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml index d5c2930b4a..191b0f916a 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 3.2.3 1.1.0.Final 6.0.23.Final diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/pom.xml b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/pom.xml index 4efa00fed8..81c4de7460 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/pom.xml +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-provider/pom.xml b/2-advanced/dubbo-samples-async/dubbo-samples-async-provider/pom.xml index 9e57041f3b..08492c88f4 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-provider/pom.xml +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-provider/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-simple-boot/pom.xml b/2-advanced/dubbo-samples-async/dubbo-samples-async-simple-boot/pom.xml index 6b840059c5..b92c98548c 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-simple-boot/pom.xml +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-simple-boot/pom.xml @@ -46,7 +46,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.7.8 diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-simple/pom.xml b/2-advanced/dubbo-samples-async/dubbo-samples-async-simple/pom.xml index 56fe59f489..1f3d516d97 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-simple/pom.xml +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-simple/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-attachment/pom.xml b/2-advanced/dubbo-samples-attachment/pom.xml index 6aa773ba24..fb1a026e3a 100644 --- a/2-advanced/dubbo-samples-attachment/pom.xml +++ b/2-advanced/dubbo-samples-attachment/pom.xml @@ -40,7 +40,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.7.8 4.13.1 diff --git a/2-advanced/dubbo-samples-autowire/pom.xml b/2-advanced/dubbo-samples-autowire/pom.xml index 94be10a55c..e97a504d8c 100644 --- a/2-advanced/dubbo-samples-autowire/pom.xml +++ b/2-advanced/dubbo-samples-autowire/pom.xml @@ -46,7 +46,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 1.9.3 diff --git a/2-advanced/dubbo-samples-cache/pom.xml b/2-advanced/dubbo-samples-cache/pom.xml index 059e78e058..fd0f8eb63c 100644 --- a/2-advanced/dubbo-samples-cache/pom.xml +++ b/2-advanced/dubbo-samples-cache/pom.xml @@ -40,7 +40,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 4.13.1 diff --git a/2-advanced/dubbo-samples-callback/dubbo-samples-callback-consumer/pom.xml b/2-advanced/dubbo-samples-callback/dubbo-samples-callback-consumer/pom.xml index 314ef41d9c..bb11d8613f 100644 --- a/2-advanced/dubbo-samples-callback/dubbo-samples-callback-consumer/pom.xml +++ b/2-advanced/dubbo-samples-callback/dubbo-samples-callback-consumer/pom.xml @@ -35,12 +35,12 @@ org.apache.dubbo dubbo-spring-boot-starter - 3.3.0-beta.1 + 3.3.1 org.apache.dubbo dubbo-zookeeper-curator5-spring-boot-starter - 3.3.0-beta.1 + 3.3.1 diff --git a/2-advanced/dubbo-samples-callback/dubbo-samples-callback-provider/pom.xml b/2-advanced/dubbo-samples-callback/dubbo-samples-callback-provider/pom.xml index a6d80eaef1..478bdb8e9e 100644 --- a/2-advanced/dubbo-samples-callback/dubbo-samples-callback-provider/pom.xml +++ b/2-advanced/dubbo-samples-callback/dubbo-samples-callback-provider/pom.xml @@ -36,12 +36,12 @@ org.apache.dubbo dubbo-spring-boot-starter - 3.3.0-beta.1 + 3.3.1 org.apache.dubbo dubbo-zookeeper-curator5-spring-boot-starter - 3.3.0-beta.1 + 3.3.1 diff --git a/2-advanced/dubbo-samples-callback/pom.xml b/2-advanced/dubbo-samples-callback/pom.xml index 957c3380d2..0c0643182c 100644 --- a/2-advanced/dubbo-samples-callback/pom.xml +++ b/2-advanced/dubbo-samples-callback/pom.xml @@ -39,7 +39,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 4.13.1 diff --git a/2-advanced/dubbo-samples-chain/pom.xml b/2-advanced/dubbo-samples-chain/pom.xml index 79286a6ca8..c00b0830e1 100644 --- a/2-advanced/dubbo-samples-chain/pom.xml +++ b/2-advanced/dubbo-samples-chain/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-compatible/pom.xml b/2-advanced/dubbo-samples-compatible/pom.xml index 4a4e172b0d..4499da8bca 100644 --- a/2-advanced/dubbo-samples-compatible/pom.xml +++ b/2-advanced/dubbo-samples-compatible/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-context/pom.xml b/2-advanced/dubbo-samples-context/pom.xml index 1a2fec5013..ba70255299 100644 --- a/2-advanced/dubbo-samples-context/pom.xml +++ b/2-advanced/dubbo-samples-context/pom.xml @@ -32,7 +32,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-direct/pom.xml b/2-advanced/dubbo-samples-direct/pom.xml index ec13d7eb55..6ef0fb33e8 100644 --- a/2-advanced/dubbo-samples-direct/pom.xml +++ b/2-advanced/dubbo-samples-direct/pom.xml @@ -38,7 +38,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 diff --git a/2-advanced/dubbo-samples-docker/pom.xml b/2-advanced/dubbo-samples-docker/pom.xml index 2ce0237590..c61b3f85ba 100644 --- a/2-advanced/dubbo-samples-docker/pom.xml +++ b/2-advanced/dubbo-samples-docker/pom.xml @@ -32,7 +32,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 1.5.22.RELEASE 4.13.1 diff --git a/2-advanced/dubbo-samples-dubbo/pom.xml b/2-advanced/dubbo-samples-dubbo/pom.xml index c65dd459c2..26ebe222c3 100644 --- a/2-advanced/dubbo-samples-dubbo/pom.xml +++ b/2-advanced/dubbo-samples-dubbo/pom.xml @@ -40,7 +40,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.1 2.7.8 diff --git a/2-advanced/dubbo-samples-echo/pom.xml b/2-advanced/dubbo-samples-echo/pom.xml index 78fe38ceb0..b02fa03bd4 100644 --- a/2-advanced/dubbo-samples-echo/pom.xml +++ b/2-advanced/dubbo-samples-echo/pom.xml @@ -38,7 +38,7 @@ 17 UTF-8 4.13.1 - 3.3.0-beta.1 + 3.3.1 3.2.3 diff --git a/2-advanced/dubbo-samples-environment-keys/pom.xml b/2-advanced/dubbo-samples-environment-keys/pom.xml index 3747ed9aa8..b9d0511e1d 100644 --- a/2-advanced/dubbo-samples-environment-keys/pom.xml +++ b/2-advanced/dubbo-samples-environment-keys/pom.xml @@ -33,7 +33,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 1.9.3 diff --git a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-apisix/dubbo-samples-gateway-apisix-dubbo/pom.xml b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-apisix/dubbo-samples-gateway-apisix-dubbo/pom.xml index fe9ac7df96..3322b8a3b7 100644 --- a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-apisix/dubbo-samples-gateway-apisix-dubbo/pom.xml +++ b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-apisix/dubbo-samples-gateway-apisix-dubbo/pom.xml @@ -37,7 +37,7 @@ 17 UTF-8 3.2.3 - 3.3.0-beta.2 + 3.3.1 3.2.0 diff --git a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-apisix/pom.xml b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-apisix/pom.xml index f5136becdb..65011fc490 100644 --- a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-apisix/pom.xml +++ b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-apisix/pom.xml @@ -39,7 +39,7 @@ 17 UTF-8 - 3.3.0-beta.2 + 3.3.1 2.20.0 4.13.1 6.1.5 diff --git a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-dubbo/pom.xml b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-dubbo/pom.xml index 88022dc142..854e3543a1 100644 --- a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-dubbo/pom.xml +++ b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-dubbo/pom.xml @@ -39,7 +39,7 @@ 17 UTF-8 - 3.3.0-beta.2 + 3.3.1 2.20.0 4.13.1 6.1.5 diff --git a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-triple/pom.xml b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-triple/pom.xml index 3e282a9fe8..55f3deb7ad 100644 --- a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-triple/pom.xml +++ b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-triple/pom.xml @@ -39,7 +39,7 @@ 17 UTF-8 - 3.3.0-beta.2 + 3.3.1 2.20.0 4.13.1 6.1.5 diff --git a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-call/pom.xml b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-call/pom.xml index 1775b2611e..12e2bef65b 100644 --- a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-call/pom.xml +++ b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-call/pom.xml @@ -39,7 +39,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-impl/pom.xml b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-impl/pom.xml index 26ba4007df..bcb050730c 100644 --- a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-impl/pom.xml +++ b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-impl/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-type/pom.xml b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-type/pom.xml index 1d2a8a5e40..dd5b26ad8b 100644 --- a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-type/pom.xml +++ b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-type/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-group/pom.xml b/2-advanced/dubbo-samples-group/pom.xml index 5a3f60a599..2326a2934e 100644 --- a/2-advanced/dubbo-samples-group/pom.xml +++ b/2-advanced/dubbo-samples-group/pom.xml @@ -36,7 +36,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 diff --git a/2-advanced/dubbo-samples-local/pom.xml b/2-advanced/dubbo-samples-local/pom.xml index 2d0ac315e8..116170e313 100644 --- a/2-advanced/dubbo-samples-local/pom.xml +++ b/2-advanced/dubbo-samples-local/pom.xml @@ -32,7 +32,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 5.3.25 2.20.0 5.9.2 diff --git a/2-advanced/dubbo-samples-merge/pom.xml b/2-advanced/dubbo-samples-merge/pom.xml index e2eeb76f32..22d378af4f 100644 --- a/2-advanced/dubbo-samples-merge/pom.xml +++ b/2-advanced/dubbo-samples-merge/pom.xml @@ -48,7 +48,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 4.13.1 diff --git a/2-advanced/dubbo-samples-mock/pom.xml b/2-advanced/dubbo-samples-mock/pom.xml index ba140697d5..c80d64b44c 100644 --- a/2-advanced/dubbo-samples-mock/pom.xml +++ b/2-advanced/dubbo-samples-mock/pom.xml @@ -36,7 +36,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 diff --git a/2-advanced/dubbo-samples-multiple-protocols/pom.xml b/2-advanced/dubbo-samples-multiple-protocols/pom.xml index d27dc62751..8d7aaa112d 100644 --- a/2-advanced/dubbo-samples-multiple-protocols/pom.xml +++ b/2-advanced/dubbo-samples-multiple-protocols/pom.xml @@ -40,7 +40,7 @@ 17 UTF-8 - 3.3.0-beta.2 + 3.3.1 3.2.3 diff --git a/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer/pom.xml b/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer/pom.xml index 6d80853d95..67cedfc46b 100644 --- a/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer/pom.xml +++ b/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer/pom.xml @@ -34,7 +34,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.2 3.19.6 diff --git a/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider/pom.xml b/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider/pom.xml index b349d1e673..1c5575885e 100644 --- a/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider/pom.xml +++ b/2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider/pom.xml @@ -34,7 +34,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.2 3.19.6 diff --git a/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-consumer/pom.xml b/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-consumer/pom.xml index f3f073fade..02c962b42f 100644 --- a/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-consumer/pom.xml +++ b/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-consumer/pom.xml @@ -41,10 +41,6 @@ org.apache.dubbo dubbo-remoting-netty4 - - org.apache.dubbo - dubbo-serialization-jdk - org.apache.dubbo dubbo-serialization-fastjson2 diff --git a/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-provider/pom.xml b/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-provider/pom.xml index 451417ee33..2d3385d502 100644 --- a/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-provider/pom.xml +++ b/2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-provider/pom.xml @@ -41,10 +41,6 @@ org.apache.dubbo dubbo-remoting-netty4 - - org.apache.dubbo - dubbo-serialization-jdk - org.apache.dubbo dubbo-serialization-fastjson2 diff --git a/2-advanced/dubbo-samples-native-image/pom.xml b/2-advanced/dubbo-samples-native-image/pom.xml index 89c393e3b4..2e84455f20 100644 --- a/2-advanced/dubbo-samples-native-image/pom.xml +++ b/2-advanced/dubbo-samples-native-image/pom.xml @@ -29,7 +29,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 3.19.6 diff --git a/2-advanced/dubbo-samples-notify/pom.xml b/2-advanced/dubbo-samples-notify/pom.xml index 2368af447d..20a7f1a799 100644 --- a/2-advanced/dubbo-samples-notify/pom.xml +++ b/2-advanced/dubbo-samples-notify/pom.xml @@ -40,7 +40,7 @@ 17 UTF-8 - 3.2.6 + 3.3.1 3.2.3 5.10.1 diff --git a/2-advanced/dubbo-samples-rpccontext/pom.xml b/2-advanced/dubbo-samples-rpccontext/pom.xml index 049775731b..ffc14294b0 100644 --- a/2-advanced/dubbo-samples-rpccontext/pom.xml +++ b/2-advanced/dubbo-samples-rpccontext/pom.xml @@ -38,7 +38,7 @@ 17 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 diff --git a/2-advanced/dubbo-samples-scala/pom.xml b/2-advanced/dubbo-samples-scala/pom.xml index 18590ba665..cb629d25fb 100644 --- a/2-advanced/dubbo-samples-scala/pom.xml +++ b/2-advanced/dubbo-samples-scala/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.12.18 3.8.3 diff --git a/2-advanced/dubbo-samples-seata/pom.xml b/2-advanced/dubbo-samples-seata/pom.xml index 505c5eafe3..271cdfed0b 100644 --- a/2-advanced/dubbo-samples-seata/pom.xml +++ b/2-advanced/dubbo-samples-seata/pom.xml @@ -29,7 +29,7 @@ 17 UTF-8 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 diff --git a/2-advanced/dubbo-samples-service-discovery/dubbo-demo-servicediscovery-xml/pom.xml b/2-advanced/dubbo-samples-service-discovery/dubbo-demo-servicediscovery-xml/pom.xml index 52bdf550f3..f3f05b5982 100644 --- a/2-advanced/dubbo-samples-service-discovery/dubbo-demo-servicediscovery-xml/pom.xml +++ b/2-advanced/dubbo-samples-service-discovery/dubbo-demo-servicediscovery-xml/pom.xml @@ -39,7 +39,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 4.13.1 diff --git a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/pom.xml b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/pom.xml index ac855db4f9..ccda74cec8 100644 --- a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/pom.xml +++ b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/pom.xml @@ -40,7 +40,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 4.13.1 diff --git a/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/pom.xml b/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/pom.xml index a26f7c9235..7a8ec0629a 100644 --- a/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/pom.xml +++ b/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/pom.xml @@ -40,7 +40,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 4.13.1 diff --git a/2-advanced/dubbo-samples-spring-security/pom.xml b/2-advanced/dubbo-samples-spring-security/pom.xml index 94799ac75b..720fbe5a0a 100644 --- a/2-advanced/dubbo-samples-spring-security/pom.xml +++ b/2-advanced/dubbo-samples-spring-security/pom.xml @@ -42,7 +42,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 diff --git a/2-advanced/dubbo-samples-spring-xml/pom.xml b/2-advanced/dubbo-samples-spring-xml/pom.xml index 5b56bd38aa..5773ee6e0b 100644 --- a/2-advanced/dubbo-samples-spring-xml/pom.xml +++ b/2-advanced/dubbo-samples-spring-xml/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.1 5.3.25 2.20.0 4.13.1 diff --git a/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/pom.xml b/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/pom.xml index 67d1fd0b90..8337df80a7 100644 --- a/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/pom.xml +++ b/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/pom.xml @@ -38,7 +38,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 2023.0.0 2022.0.0.0 diff --git a/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/pom.xml b/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/pom.xml index d454b43def..db2b531068 100644 --- a/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/pom.xml +++ b/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/pom.xml @@ -38,7 +38,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 2023.0.0 2022.0.0.0 diff --git a/2-advanced/dubbo-samples-stub/pom.xml b/2-advanced/dubbo-samples-stub/pom.xml index 4fe19eeaa8..0bb2384075 100644 --- a/2-advanced/dubbo-samples-stub/pom.xml +++ b/2-advanced/dubbo-samples-stub/pom.xml @@ -46,7 +46,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 4.13.1 diff --git a/2-advanced/dubbo-samples-tengine/dubbo-samples-tengine-provider/pom.xml b/2-advanced/dubbo-samples-tengine/dubbo-samples-tengine-provider/pom.xml index 7996ea4729..e164a5508d 100644 --- a/2-advanced/dubbo-samples-tengine/dubbo-samples-tengine-provider/pom.xml +++ b/2-advanced/dubbo-samples-tengine/dubbo-samples-tengine-provider/pom.xml @@ -34,7 +34,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 diff --git a/2-advanced/dubbo-samples-tengine/pom.xml b/2-advanced/dubbo-samples-tengine/pom.xml index 109f1581ce..a23ce08929 100644 --- a/2-advanced/dubbo-samples-tengine/pom.xml +++ b/2-advanced/dubbo-samples-tengine/pom.xml @@ -29,7 +29,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.7.8 3.7.0 diff --git a/2-advanced/dubbo-samples-triple-grpc/pom.xml b/2-advanced/dubbo-samples-triple-grpc/pom.xml index 314d722d8f..3588f5d328 100644 --- a/2-advanced/dubbo-samples-triple-grpc/pom.xml +++ b/2-advanced/dubbo-samples-triple-grpc/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.1 1.58.0 3.22.2 2.20.0 diff --git a/2-advanced/dubbo-samples-triple-grpc/src/main/java/org/apache/dubbo/samples/tri/grpc/util/EmbeddedZooKeeper.java b/2-advanced/dubbo-samples-triple-grpc/src/main/java/org/apache/dubbo/samples/tri/grpc/util/EmbeddedZooKeeper.java deleted file mode 100644 index 159288761f..0000000000 --- a/2-advanced/dubbo-samples-triple-grpc/src/main/java/org/apache/dubbo/samples/tri/grpc/util/EmbeddedZooKeeper.java +++ /dev/null @@ -1,309 +0,0 @@ - -/* - * Copyright 2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dubbo.samples.tri.streaming.util; - -import org.apache.zookeeper.server.ServerConfig; -import org.apache.zookeeper.server.ZooKeeperServerMain; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.SmartLifecycle; -import org.springframework.util.ErrorHandler; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.ServerSocket; -import java.util.List; -import java.util.Properties; -import java.util.Random; -import java.util.UUID; -import java.util.stream.Collectors; - -/** - * from: https://github.com/spring-projects/spring-xd/blob/v1.3.1.RELEASE/spring-xd-dirt/src/main/java/org/springframework/xd/dirt/zookeeper/ZooKeeperUtils.java - *

- * Helper class to start an embedded instance of standalone (non clustered) ZooKeeper. - *

- * NOTE: at least an external standalone server (if not an ensemble) are recommended, even for - * {@link org.springframework.xd.dirt.server.singlenode.SingleNodeApplication} - * - * @author Patrick Peralta - * @author Mark Fisher - * @author David Turanski - */ -public class EmbeddedZooKeeper implements SmartLifecycle { - - private static final Random RANDOM = new Random(); - - /** - * Logger. - */ - private static final Logger logger = LoggerFactory.getLogger(EmbeddedZooKeeper.class); - - /** - * ZooKeeper client port. This will be determined dynamically upon startup. - */ - private final int clientPort; - - /** - * Whether to auto-start. Default is true. - */ - private boolean autoStartup = true; - - /** - * Lifecycle phase. Default is 0. - */ - private int phase = 0; - - /** - * Thread for running the ZooKeeper server. - */ - private volatile Thread zkServerThread; - - /** - * ZooKeeper server. - */ - private volatile ZooKeeperServerMain zkServer; - - /** - * {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. - */ - private ErrorHandler errorHandler; - - private boolean daemon = true; - - /** - * Construct an EmbeddedZooKeeper with a random port. - */ - public EmbeddedZooKeeper() { - clientPort = findRandomPort(30000, 65535); - } - - /** - * Construct an EmbeddedZooKeeper with the provided port. - * - * @param clientPort port for ZooKeeper server to bind to - */ - public EmbeddedZooKeeper(int clientPort, boolean daemon) { - this.clientPort = clientPort; - this.daemon = daemon; - } - - /** - * Returns the port that clients should use to connect to this embedded server. - * - * @return dynamically determined client port - */ - public int getClientPort() { - return this.clientPort; - } - - /** - * Specify whether to start automatically. Default is true. - * - * @param autoStartup whether to start automatically - */ - public void setAutoStartup(boolean autoStartup) { - this.autoStartup = autoStartup; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isAutoStartup() { - return this.autoStartup; - } - - /** - * Specify the lifecycle phase for the embedded server. - * - * @param phase the lifecycle phase - */ - public void setPhase(int phase) { - this.phase = phase; - } - - /** - * {@inheritDoc} - */ - @Override - public int getPhase() { - return this.phase; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isRunning() { - return (zkServerThread != null); - } - - /** - * Start the ZooKeeper server in a background thread. - *

- * Register an error handler via {@link #setErrorHandler} in order to handle - * any exceptions thrown during startup or execution. - */ - @Override - public synchronized void start() { - if (zkServerThread == null) { - zkServerThread = new Thread(new ServerRunnable(), "ZooKeeper Server Starter"); - zkServerThread.setDaemon(daemon); - zkServerThread.start(); - } - } - - /** - * Shutdown the ZooKeeper server. - */ - @Override - public synchronized void stop() { - if (zkServerThread != null) { - // The shutdown method is protected...thus this hack to invoke it. - // This will log an exception on shutdown; see - // https://issues.apache.org/jira/browse/ZOOKEEPER-1873 for details. - try { - Method shutdown = ZooKeeperServerMain.class.getDeclaredMethod("shutdown"); - shutdown.setAccessible(true); - shutdown.invoke(zkServer); - } catch (Exception e) { - throw new RuntimeException(e); - } - - // It is expected that the thread will exit after - // the server is shutdown; this will block until - // the shutdown is complete. - try { - zkServerThread.join(5000); - zkServerThread = null; - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - logger.warn("Interrupted while waiting for embedded ZooKeeper to exit"); - // abandoning zk thread - zkServerThread = null; - } - } - } - - /** - * Stop the server if running and invoke the callback when complete. - */ - @Override - public void stop(Runnable callback) { - stop(); - callback.run(); - } - - /** - * Provide an {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. If none - * is provided, only error-level logging will occur. - * - * @param errorHandler the {@link ErrorHandler} to be invoked - */ - public void setErrorHandler(ErrorHandler errorHandler) { - this.errorHandler = errorHandler; - } - - /** - * Runnable implementation that starts the ZooKeeper server. - */ - private class ServerRunnable implements Runnable { - - @Override - public void run() { - try { - Properties properties = new Properties(); - File file = new File(System.getProperty("java.io.tmpdir") - + File.separator + UUID.randomUUID()); - file.deleteOnExit(); - properties.setProperty("dataDir", file.getAbsolutePath()); - properties.setProperty("clientPort", String.valueOf(clientPort)); - - QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig(); - quorumPeerConfig.parseProperties(properties); - - zkServer = new ZooKeeperServerMain(); - ServerConfig configuration = new ServerConfig(); - configuration.readFrom(quorumPeerConfig); - - System.setProperty("zookeeper.admin.enableServer", "false"); - - zkServer.runFromConfig(configuration); - } catch (Exception e) { - if (errorHandler != null) { - errorHandler.handleError(e); - } else { - logger.error("Exception running embedded ZooKeeper", e); - } - } - } - } - - /** - * Workaround for SocketUtils.findRandomPort() deprecation. - * - * @param min min port - * @param max max port - * @return a random generated available port - */ - private static int findRandomPort(int min, int max) { - if (min < 1024) { - throw new IllegalArgumentException("Max port shouldn't be less than 1024."); - } - - if (max > 65535) { - throw new IllegalArgumentException("Max port shouldn't be greater than 65535."); - } - - if (min > max) { - throw new IllegalArgumentException("Min port shouldn't be greater than max port."); - } - - int port = 0; - int counter = 0; - - // Workaround for legacy JDK doesn't support Random.nextInt(min, max). - List randomInts = RANDOM.ints(min, max + 1) - .limit(max - min) - .mapToObj(Integer::valueOf) - .collect(Collectors.toList()); - - do { - if (counter > max - min) { - throw new IllegalStateException("Unable to find a port between " + min + "-" + max); - } - - port = randomInts.get(counter); - counter++; - } while (isPortInUse(port)); - - return port; - } - - private static boolean isPortInUse(int port) { - try (ServerSocket ignored = new ServerSocket(port)) { - return false; - } catch (IOException e) { - // continue - } - return true; - } -} diff --git a/2-advanced/dubbo-samples-triple-http3/pom.xml b/2-advanced/dubbo-samples-triple-http3/pom.xml index d2a43c03e8..b9c5be8e41 100644 --- a/2-advanced/dubbo-samples-triple-http3/pom.xml +++ b/2-advanced/dubbo-samples-triple-http3/pom.xml @@ -36,8 +36,7 @@ 17 UTF-8 - - 3.3.0-beta.6-SNAPSHOT + 3.3.1 3.2.3 1.7.1 diff --git a/2-advanced/dubbo-samples-triple-no-idl/pom.xml b/2-advanced/dubbo-samples-triple-no-idl/pom.xml index 8e8f89b648..8b75eb73aa 100644 --- a/2-advanced/dubbo-samples-triple-no-idl/pom.xml +++ b/2-advanced/dubbo-samples-triple-no-idl/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.19.6 2.20.0 diff --git a/2-advanced/dubbo-samples-triple-no-idl/src/main/java/org/apache/dubbo/samples/tri/noidl/util/EmbeddedZooKeeper.java b/2-advanced/dubbo-samples-triple-no-idl/src/main/java/org/apache/dubbo/samples/tri/noidl/util/EmbeddedZooKeeper.java deleted file mode 100644 index 159288761f..0000000000 --- a/2-advanced/dubbo-samples-triple-no-idl/src/main/java/org/apache/dubbo/samples/tri/noidl/util/EmbeddedZooKeeper.java +++ /dev/null @@ -1,309 +0,0 @@ - -/* - * Copyright 2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dubbo.samples.tri.streaming.util; - -import org.apache.zookeeper.server.ServerConfig; -import org.apache.zookeeper.server.ZooKeeperServerMain; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.SmartLifecycle; -import org.springframework.util.ErrorHandler; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.ServerSocket; -import java.util.List; -import java.util.Properties; -import java.util.Random; -import java.util.UUID; -import java.util.stream.Collectors; - -/** - * from: https://github.com/spring-projects/spring-xd/blob/v1.3.1.RELEASE/spring-xd-dirt/src/main/java/org/springframework/xd/dirt/zookeeper/ZooKeeperUtils.java - *

- * Helper class to start an embedded instance of standalone (non clustered) ZooKeeper. - *

- * NOTE: at least an external standalone server (if not an ensemble) are recommended, even for - * {@link org.springframework.xd.dirt.server.singlenode.SingleNodeApplication} - * - * @author Patrick Peralta - * @author Mark Fisher - * @author David Turanski - */ -public class EmbeddedZooKeeper implements SmartLifecycle { - - private static final Random RANDOM = new Random(); - - /** - * Logger. - */ - private static final Logger logger = LoggerFactory.getLogger(EmbeddedZooKeeper.class); - - /** - * ZooKeeper client port. This will be determined dynamically upon startup. - */ - private final int clientPort; - - /** - * Whether to auto-start. Default is true. - */ - private boolean autoStartup = true; - - /** - * Lifecycle phase. Default is 0. - */ - private int phase = 0; - - /** - * Thread for running the ZooKeeper server. - */ - private volatile Thread zkServerThread; - - /** - * ZooKeeper server. - */ - private volatile ZooKeeperServerMain zkServer; - - /** - * {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. - */ - private ErrorHandler errorHandler; - - private boolean daemon = true; - - /** - * Construct an EmbeddedZooKeeper with a random port. - */ - public EmbeddedZooKeeper() { - clientPort = findRandomPort(30000, 65535); - } - - /** - * Construct an EmbeddedZooKeeper with the provided port. - * - * @param clientPort port for ZooKeeper server to bind to - */ - public EmbeddedZooKeeper(int clientPort, boolean daemon) { - this.clientPort = clientPort; - this.daemon = daemon; - } - - /** - * Returns the port that clients should use to connect to this embedded server. - * - * @return dynamically determined client port - */ - public int getClientPort() { - return this.clientPort; - } - - /** - * Specify whether to start automatically. Default is true. - * - * @param autoStartup whether to start automatically - */ - public void setAutoStartup(boolean autoStartup) { - this.autoStartup = autoStartup; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isAutoStartup() { - return this.autoStartup; - } - - /** - * Specify the lifecycle phase for the embedded server. - * - * @param phase the lifecycle phase - */ - public void setPhase(int phase) { - this.phase = phase; - } - - /** - * {@inheritDoc} - */ - @Override - public int getPhase() { - return this.phase; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isRunning() { - return (zkServerThread != null); - } - - /** - * Start the ZooKeeper server in a background thread. - *

- * Register an error handler via {@link #setErrorHandler} in order to handle - * any exceptions thrown during startup or execution. - */ - @Override - public synchronized void start() { - if (zkServerThread == null) { - zkServerThread = new Thread(new ServerRunnable(), "ZooKeeper Server Starter"); - zkServerThread.setDaemon(daemon); - zkServerThread.start(); - } - } - - /** - * Shutdown the ZooKeeper server. - */ - @Override - public synchronized void stop() { - if (zkServerThread != null) { - // The shutdown method is protected...thus this hack to invoke it. - // This will log an exception on shutdown; see - // https://issues.apache.org/jira/browse/ZOOKEEPER-1873 for details. - try { - Method shutdown = ZooKeeperServerMain.class.getDeclaredMethod("shutdown"); - shutdown.setAccessible(true); - shutdown.invoke(zkServer); - } catch (Exception e) { - throw new RuntimeException(e); - } - - // It is expected that the thread will exit after - // the server is shutdown; this will block until - // the shutdown is complete. - try { - zkServerThread.join(5000); - zkServerThread = null; - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - logger.warn("Interrupted while waiting for embedded ZooKeeper to exit"); - // abandoning zk thread - zkServerThread = null; - } - } - } - - /** - * Stop the server if running and invoke the callback when complete. - */ - @Override - public void stop(Runnable callback) { - stop(); - callback.run(); - } - - /** - * Provide an {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. If none - * is provided, only error-level logging will occur. - * - * @param errorHandler the {@link ErrorHandler} to be invoked - */ - public void setErrorHandler(ErrorHandler errorHandler) { - this.errorHandler = errorHandler; - } - - /** - * Runnable implementation that starts the ZooKeeper server. - */ - private class ServerRunnable implements Runnable { - - @Override - public void run() { - try { - Properties properties = new Properties(); - File file = new File(System.getProperty("java.io.tmpdir") - + File.separator + UUID.randomUUID()); - file.deleteOnExit(); - properties.setProperty("dataDir", file.getAbsolutePath()); - properties.setProperty("clientPort", String.valueOf(clientPort)); - - QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig(); - quorumPeerConfig.parseProperties(properties); - - zkServer = new ZooKeeperServerMain(); - ServerConfig configuration = new ServerConfig(); - configuration.readFrom(quorumPeerConfig); - - System.setProperty("zookeeper.admin.enableServer", "false"); - - zkServer.runFromConfig(configuration); - } catch (Exception e) { - if (errorHandler != null) { - errorHandler.handleError(e); - } else { - logger.error("Exception running embedded ZooKeeper", e); - } - } - } - } - - /** - * Workaround for SocketUtils.findRandomPort() deprecation. - * - * @param min min port - * @param max max port - * @return a random generated available port - */ - private static int findRandomPort(int min, int max) { - if (min < 1024) { - throw new IllegalArgumentException("Max port shouldn't be less than 1024."); - } - - if (max > 65535) { - throw new IllegalArgumentException("Max port shouldn't be greater than 65535."); - } - - if (min > max) { - throw new IllegalArgumentException("Min port shouldn't be greater than max port."); - } - - int port = 0; - int counter = 0; - - // Workaround for legacy JDK doesn't support Random.nextInt(min, max). - List randomInts = RANDOM.ints(min, max + 1) - .limit(max - min) - .mapToObj(Integer::valueOf) - .collect(Collectors.toList()); - - do { - if (counter > max - min) { - throw new IllegalStateException("Unable to find a port between " + min + "-" + max); - } - - port = randomInts.get(counter); - counter++; - } while (isPortInUse(port)); - - return port; - } - - private static boolean isPortInUse(int port) { - try (ServerSocket ignored = new ServerSocket(port)) { - return false; - } catch (IOException e) { - // continue - } - return true; - } -} diff --git a/2-advanced/dubbo-samples-triple-rest/pom.xml b/2-advanced/dubbo-samples-triple-rest/pom.xml index 23bcd44cc8..4826d54178 100644 --- a/2-advanced/dubbo-samples-triple-rest/pom.xml +++ b/2-advanced/dubbo-samples-triple-rest/pom.xml @@ -37,8 +37,7 @@ 17 UTF-8 - 3.3.0-beta.5 - + 3.3.1 3.2.3 2.3.3-b02 diff --git a/2-advanced/dubbo-samples-triple-servlet/pom.xml b/2-advanced/dubbo-samples-triple-servlet/pom.xml index 718eccec54..78eada4f48 100644 --- a/2-advanced/dubbo-samples-triple-servlet/pom.xml +++ b/2-advanced/dubbo-samples-triple-servlet/pom.xml @@ -36,8 +36,7 @@ 17 UTF-8 - - 3.3.0-beta.6-SNAPSHOT + 3.3.1 3.2.3 1.7.1 diff --git a/2-advanced/dubbo-samples-triple-streaming/pom.xml b/2-advanced/dubbo-samples-triple-streaming/pom.xml index 92894b521f..c14d3e6281 100644 --- a/2-advanced/dubbo-samples-triple-streaming/pom.xml +++ b/2-advanced/dubbo-samples-triple-streaming/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.22.2 3.19.6 2.20.0 diff --git a/2-advanced/dubbo-samples-triple-streaming/src/main/java/org/apache/dubbo/samples/tri/streaming/TriStreamServer.java b/2-advanced/dubbo-samples-triple-streaming/src/main/java/org/apache/dubbo/samples/tri/streaming/TriStreamServer.java index 2073ca5436..2c0ed75600 100644 --- a/2-advanced/dubbo-samples-triple-streaming/src/main/java/org/apache/dubbo/samples/tri/streaming/TriStreamServer.java +++ b/2-advanced/dubbo-samples-triple-streaming/src/main/java/org/apache/dubbo/samples/tri/streaming/TriStreamServer.java @@ -23,7 +23,6 @@ import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.ServiceConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; -import org.apache.dubbo.samples.tri.streaming.util.EmbeddedZooKeeper; import org.apache.dubbo.samples.tri.streaming.util.TriSampleConstants; import java.io.IOException; @@ -31,7 +30,6 @@ public class TriStreamServer { public static void main(String[] args) throws IOException { - new EmbeddedZooKeeper(TriSampleConstants.ZK_PORT, false).start(); ServiceConfig service = new ServiceConfig<>(); service.setInterface(Greeter.class); service.setRef(new GreeterImpl("tri-stub")); diff --git a/2-advanced/dubbo-samples-triple-streaming/src/main/java/org/apache/dubbo/samples/tri/streaming/util/EmbeddedZooKeeper.java b/2-advanced/dubbo-samples-triple-streaming/src/main/java/org/apache/dubbo/samples/tri/streaming/util/EmbeddedZooKeeper.java deleted file mode 100644 index 159288761f..0000000000 --- a/2-advanced/dubbo-samples-triple-streaming/src/main/java/org/apache/dubbo/samples/tri/streaming/util/EmbeddedZooKeeper.java +++ /dev/null @@ -1,309 +0,0 @@ - -/* - * Copyright 2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dubbo.samples.tri.streaming.util; - -import org.apache.zookeeper.server.ServerConfig; -import org.apache.zookeeper.server.ZooKeeperServerMain; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.SmartLifecycle; -import org.springframework.util.ErrorHandler; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.ServerSocket; -import java.util.List; -import java.util.Properties; -import java.util.Random; -import java.util.UUID; -import java.util.stream.Collectors; - -/** - * from: https://github.com/spring-projects/spring-xd/blob/v1.3.1.RELEASE/spring-xd-dirt/src/main/java/org/springframework/xd/dirt/zookeeper/ZooKeeperUtils.java - *

- * Helper class to start an embedded instance of standalone (non clustered) ZooKeeper. - *

- * NOTE: at least an external standalone server (if not an ensemble) are recommended, even for - * {@link org.springframework.xd.dirt.server.singlenode.SingleNodeApplication} - * - * @author Patrick Peralta - * @author Mark Fisher - * @author David Turanski - */ -public class EmbeddedZooKeeper implements SmartLifecycle { - - private static final Random RANDOM = new Random(); - - /** - * Logger. - */ - private static final Logger logger = LoggerFactory.getLogger(EmbeddedZooKeeper.class); - - /** - * ZooKeeper client port. This will be determined dynamically upon startup. - */ - private final int clientPort; - - /** - * Whether to auto-start. Default is true. - */ - private boolean autoStartup = true; - - /** - * Lifecycle phase. Default is 0. - */ - private int phase = 0; - - /** - * Thread for running the ZooKeeper server. - */ - private volatile Thread zkServerThread; - - /** - * ZooKeeper server. - */ - private volatile ZooKeeperServerMain zkServer; - - /** - * {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. - */ - private ErrorHandler errorHandler; - - private boolean daemon = true; - - /** - * Construct an EmbeddedZooKeeper with a random port. - */ - public EmbeddedZooKeeper() { - clientPort = findRandomPort(30000, 65535); - } - - /** - * Construct an EmbeddedZooKeeper with the provided port. - * - * @param clientPort port for ZooKeeper server to bind to - */ - public EmbeddedZooKeeper(int clientPort, boolean daemon) { - this.clientPort = clientPort; - this.daemon = daemon; - } - - /** - * Returns the port that clients should use to connect to this embedded server. - * - * @return dynamically determined client port - */ - public int getClientPort() { - return this.clientPort; - } - - /** - * Specify whether to start automatically. Default is true. - * - * @param autoStartup whether to start automatically - */ - public void setAutoStartup(boolean autoStartup) { - this.autoStartup = autoStartup; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isAutoStartup() { - return this.autoStartup; - } - - /** - * Specify the lifecycle phase for the embedded server. - * - * @param phase the lifecycle phase - */ - public void setPhase(int phase) { - this.phase = phase; - } - - /** - * {@inheritDoc} - */ - @Override - public int getPhase() { - return this.phase; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isRunning() { - return (zkServerThread != null); - } - - /** - * Start the ZooKeeper server in a background thread. - *

- * Register an error handler via {@link #setErrorHandler} in order to handle - * any exceptions thrown during startup or execution. - */ - @Override - public synchronized void start() { - if (zkServerThread == null) { - zkServerThread = new Thread(new ServerRunnable(), "ZooKeeper Server Starter"); - zkServerThread.setDaemon(daemon); - zkServerThread.start(); - } - } - - /** - * Shutdown the ZooKeeper server. - */ - @Override - public synchronized void stop() { - if (zkServerThread != null) { - // The shutdown method is protected...thus this hack to invoke it. - // This will log an exception on shutdown; see - // https://issues.apache.org/jira/browse/ZOOKEEPER-1873 for details. - try { - Method shutdown = ZooKeeperServerMain.class.getDeclaredMethod("shutdown"); - shutdown.setAccessible(true); - shutdown.invoke(zkServer); - } catch (Exception e) { - throw new RuntimeException(e); - } - - // It is expected that the thread will exit after - // the server is shutdown; this will block until - // the shutdown is complete. - try { - zkServerThread.join(5000); - zkServerThread = null; - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - logger.warn("Interrupted while waiting for embedded ZooKeeper to exit"); - // abandoning zk thread - zkServerThread = null; - } - } - } - - /** - * Stop the server if running and invoke the callback when complete. - */ - @Override - public void stop(Runnable callback) { - stop(); - callback.run(); - } - - /** - * Provide an {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. If none - * is provided, only error-level logging will occur. - * - * @param errorHandler the {@link ErrorHandler} to be invoked - */ - public void setErrorHandler(ErrorHandler errorHandler) { - this.errorHandler = errorHandler; - } - - /** - * Runnable implementation that starts the ZooKeeper server. - */ - private class ServerRunnable implements Runnable { - - @Override - public void run() { - try { - Properties properties = new Properties(); - File file = new File(System.getProperty("java.io.tmpdir") - + File.separator + UUID.randomUUID()); - file.deleteOnExit(); - properties.setProperty("dataDir", file.getAbsolutePath()); - properties.setProperty("clientPort", String.valueOf(clientPort)); - - QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig(); - quorumPeerConfig.parseProperties(properties); - - zkServer = new ZooKeeperServerMain(); - ServerConfig configuration = new ServerConfig(); - configuration.readFrom(quorumPeerConfig); - - System.setProperty("zookeeper.admin.enableServer", "false"); - - zkServer.runFromConfig(configuration); - } catch (Exception e) { - if (errorHandler != null) { - errorHandler.handleError(e); - } else { - logger.error("Exception running embedded ZooKeeper", e); - } - } - } - } - - /** - * Workaround for SocketUtils.findRandomPort() deprecation. - * - * @param min min port - * @param max max port - * @return a random generated available port - */ - private static int findRandomPort(int min, int max) { - if (min < 1024) { - throw new IllegalArgumentException("Max port shouldn't be less than 1024."); - } - - if (max > 65535) { - throw new IllegalArgumentException("Max port shouldn't be greater than 65535."); - } - - if (min > max) { - throw new IllegalArgumentException("Min port shouldn't be greater than max port."); - } - - int port = 0; - int counter = 0; - - // Workaround for legacy JDK doesn't support Random.nextInt(min, max). - List randomInts = RANDOM.ints(min, max + 1) - .limit(max - min) - .mapToObj(Integer::valueOf) - .collect(Collectors.toList()); - - do { - if (counter > max - min) { - throw new IllegalStateException("Unable to find a port between " + min + "-" + max); - } - - port = randomInts.get(counter); - counter++; - } while (isPortInUse(port)); - - return port; - } - - private static boolean isPortInUse(int port) { - try (ServerSocket ignored = new ServerSocket(port)) { - return false; - } catch (IOException e) { - // continue - } - return true; - } -} diff --git a/2-advanced/dubbo-samples-validation/pom.xml b/2-advanced/dubbo-samples-validation/pom.xml index ad31f5b1ae..66829f4b02 100644 --- a/2-advanced/dubbo-samples-validation/pom.xml +++ b/2-advanced/dubbo-samples-validation/pom.xml @@ -32,7 +32,7 @@ 17 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 diff --git a/2-advanced/dubbo-samples-version/pom.xml b/2-advanced/dubbo-samples-version/pom.xml index bd010bd2fa..8438957372 100644 --- a/2-advanced/dubbo-samples-version/pom.xml +++ b/2-advanced/dubbo-samples-version/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-annotation/pom.xml b/3-extensions/configcenter/dubbo-samples-configcenter-annotation/pom.xml index e49fe369f0..e59d6043f2 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-annotation/pom.xml +++ b/3-extensions/configcenter/dubbo-samples-configcenter-annotation/pom.xml @@ -42,7 +42,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-api/pom.xml b/3-extensions/configcenter/dubbo-samples-configcenter-api/pom.xml index 788f7022a4..c1791bc01b 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-api/pom.xml +++ b/3-extensions/configcenter/dubbo-samples-configcenter-api/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-apollo/pom.xml b/3-extensions/configcenter/dubbo-samples-configcenter-apollo/pom.xml index 823530d3e5..435aa2dcd4 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-apollo/pom.xml +++ b/3-extensions/configcenter/dubbo-samples-configcenter-apollo/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/pom.xml b/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/pom.xml index 7cfacc575e..90c09008e7 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/pom.xml +++ b/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 1.5.22.RELEASE 3.29.2-GA 4.13.1 diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-multi-registries/pom.xml b/3-extensions/configcenter/dubbo-samples-configcenter-multi-registries/pom.xml index 474f2e00bb..225710a06b 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-multi-registries/pom.xml +++ b/3-extensions/configcenter/dubbo-samples-configcenter-multi-registries/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/pom.xml b/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/pom.xml index bc71c9a820..543ad56885 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/pom.xml +++ b/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-xml/pom.xml b/3-extensions/configcenter/dubbo-samples-configcenter-xml/pom.xml index aa6001e13d..fa87b11076 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-xml/pom.xml +++ b/3-extensions/configcenter/dubbo-samples-configcenter-xml/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/protocol/dubbo-samples-jetty/pom.xml b/3-extensions/protocol/dubbo-samples-jetty/pom.xml deleted file mode 100644 index f88a795e01..0000000000 --- a/3-extensions/protocol/dubbo-samples-jetty/pom.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - 4.0.0 - - org.apache.dubbo - dubbo-samples-jetty - 1.0-SNAPSHOT - - Dubbo Samples Jetty - Dubbo Samples Jetty - - - 1.8 - 1.8 - UTF-8 - - 3.2.6 - 1.5.22.RELEASE - 3.8.3 - 4.3.0 - 1.1.0.Final - 4.2.0.Final - 3.0.19.Final - 1.5.19 - 7.0.88 - 3.0.1 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - io.netty - netty-all - 4.1.56.Final - - - org.apache.dubbo - dubbo-bom - ${dubbo.version} - pom - import - - - org.apache.dubbo - dubbo - ${dubbo.version} - - - org.apache.dubbo - dubbo-rpc-rest - ${dubbo.version} - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - logback-classic - ch.qos.logback - - - logback-core - ch.qos.logback - - - * - io.netty - - - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.curator - curator-client - ${curator.version} - - - javax.validation - validation-api - ${validation-api.version} - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - org.jboss.resteasy - resteasy-jackson-provider - ${resteasy.version} - - - javax.servlet - javax.servlet-api - ${servlet.version} - - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - ${tomcat.version} - - - - io.swagger - swagger-annotations - ${swagger.version} - - - io.swagger - swagger-jaxrs - ${swagger.version} - - - - - - - org.apache.dubbo - dubbo - - - org.apache.dubbo - dubbo-configcenter-zookeeper - - - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-core - - - io.netty - netty-all - - - org.springframework - spring-context - - - junit - junit - 4.11 - test - - - - org.eclipse.jetty - jetty-server - 10.0.14 - - - org.eclipse.jetty - jetty-servlet - 9.4.11.v20180605 - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - maven-clean-plugin - 3.0.0 - - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.7.0 - - - maven-surefire-plugin - 2.20.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - - - diff --git a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/HelloWorld.java b/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/HelloWorld.java deleted file mode 100644 index 31e42a263c..0000000000 --- a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/HelloWorld.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.dubbo.samples.jetty; - -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.handler.AbstractHandler; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * use a simple HelloWorld handler to run the server - */ -public class HelloWorld extends AbstractHandler -{ - @Override - public void handle(String target, - Request baseRequest, - HttpServletRequest request, - HttpServletResponse response) - throws IOException, ServletException - { - response.setContentType("text/html;charset=utf-8"); - response.setStatus(HttpServletResponse.SC_OK); - baseRequest.setHandled(true); - response.getWriter().println("

Hello World

"); - } -} diff --git a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/JettyContainer.java b/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/JettyContainer.java deleted file mode 100644 index a569d67229..0000000000 --- a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/JettyContainer.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.dubbo.samples.jetty; - -import org.apache.dubbo.container.Container; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.Server; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Dubbo Container Extension, used to customize the load content. - */ -public class JettyContainer implements Container { - - private static final Logger logger = LoggerFactory.getLogger(JettyContainer.class); - - private static Server server = new Server(8080); - - public void setServerHandler(Handler handler){ - server.setHandler(handler); - } - - @Override - public void start() { - try { - server.start(); - server.join(); - } catch (Exception e) { - throw new IllegalStateException("Failed to start jetty" + e.getMessage(), e); - } - } - - @Override - public void stop() { - if (server != null) { - try { - server.stop(); - } catch (Exception e) { - logger.warn(e.getMessage(), e); - } - } - } -} diff --git a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/api/JettyService.java b/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/api/JettyService.java deleted file mode 100644 index e358b61d83..0000000000 --- a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/api/JettyService.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.dubbo.samples.jetty.api; - -public interface JettyService { - void sayHello(); -} diff --git a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/impl/JettyServiceImpl.java b/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/impl/JettyServiceImpl.java deleted file mode 100644 index 9cc8186615..0000000000 --- a/3-extensions/protocol/dubbo-samples-jetty/src/main/java/org/apache/dubbo/samples/jetty/impl/JettyServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.dubbo.samples.jetty.impl; - -import org.apache.dubbo.samples.jetty.HelloWorld; -import org.apache.dubbo.samples.jetty.JettyContainer; -import org.apache.dubbo.samples.jetty.api.JettyService; - -public class JettyServiceImpl implements JettyService { - - private static JettyContainer container = new JettyContainer(); - - @Override - public void sayHello() { - container.setServerHandler(new HelloWorld()); - - container.start(); - - container.stop(); - } - -} diff --git a/3-extensions/protocol/dubbo-samples-port-unification/pom.xml b/3-extensions/protocol/dubbo-samples-port-unification/pom.xml index 794e40c53c..1aba0f243f 100644 --- a/3-extensions/protocol/dubbo-samples-port-unification/pom.xml +++ b/3-extensions/protocol/dubbo-samples-port-unification/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.13.1 3.7.0 diff --git a/3-extensions/protocol/dubbo-samples-resilience4j/dubbo-samples-resilience4j-filter/pom.xml b/3-extensions/protocol/dubbo-samples-resilience4j/dubbo-samples-resilience4j-filter/pom.xml index fb3c227b29..84a512213d 100644 --- a/3-extensions/protocol/dubbo-samples-resilience4j/dubbo-samples-resilience4j-filter/pom.xml +++ b/3-extensions/protocol/dubbo-samples-resilience4j/dubbo-samples-resilience4j-filter/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 1.5.22.RELEASE 3.8.3 4.3.0 diff --git a/3-extensions/protocol/dubbo-samples-resilience4j/dubbo-samples-resilience4j-springboot2/pom.xml b/3-extensions/protocol/dubbo-samples-resilience4j/dubbo-samples-resilience4j-springboot2/pom.xml index 8881284aab..584562c199 100644 --- a/3-extensions/protocol/dubbo-samples-resilience4j/dubbo-samples-resilience4j-springboot2/pom.xml +++ b/3-extensions/protocol/dubbo-samples-resilience4j/dubbo-samples-resilience4j-springboot2/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.7.8 3.8.3 4.3.0 diff --git a/3-extensions/protocol/dubbo-samples-rest/pom.xml b/3-extensions/protocol/dubbo-samples-rest/pom.xml index 33363aa486..a6580f0821 100644 --- a/3-extensions/protocol/dubbo-samples-rest/pom.xml +++ b/3-extensions/protocol/dubbo-samples-rest/pom.xml @@ -158,10 +158,10 @@ resteasy-jackson-provider - org.apache.dubbo - dubbo-rpc-rest + org.apache.dubbo + dubbo-rpc-rest - + org.hibernate hibernate-validator diff --git a/3-extensions/protocol/dubbo-samples-rocketmq/pom.xml b/3-extensions/protocol/dubbo-samples-rocketmq/pom.xml index 54bd06b656..0f5bd9d772 100644 --- a/3-extensions/protocol/dubbo-samples-rocketmq/pom.xml +++ b/3-extensions/protocol/dubbo-samples-rocketmq/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 1.5.22.RELEASE 1.1.0.Final diff --git a/3-extensions/protocol/dubbo-samples-triple-reactor/pom.xml b/3-extensions/protocol/dubbo-samples-triple-reactor/pom.xml index 46b9acb672..0658f8acd0 100644 --- a/3-extensions/protocol/dubbo-samples-triple-reactor/pom.xml +++ b/3-extensions/protocol/dubbo-samples-triple-reactor/pom.xml @@ -39,7 +39,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 1.0.4 3.4.19 3.19.4 diff --git a/3-extensions/protocol/dubbo-samples-triple/pom.xml b/3-extensions/protocol/dubbo-samples-triple/pom.xml index 9d5fb6c0ab..bff0ac9577 100644 --- a/3-extensions/protocol/dubbo-samples-triple/pom.xml +++ b/3-extensions/protocol/dubbo-samples-triple/pom.xml @@ -39,7 +39,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 1.5.22.RELEASE 1.58.0 3.22.2 diff --git a/3-extensions/protocol/pom.xml b/3-extensions/protocol/pom.xml index 55a951fd02..293925a577 100644 --- a/3-extensions/protocol/pom.xml +++ b/3-extensions/protocol/pom.xml @@ -28,7 +28,6 @@ dubbo-samples-http - dubbo-samples-jetty dubbo-samples-port-unification dubbo-samples-resilience4j dubbo-samples-rest diff --git a/3-extensions/registry/dubbo-samples-kubernetes/dubbo-samples-kubernetes-dns/pom.xml b/3-extensions/registry/dubbo-samples-kubernetes/dubbo-samples-kubernetes-dns/pom.xml index 91f6334417..1d185d1110 100644 --- a/3-extensions/registry/dubbo-samples-kubernetes/dubbo-samples-kubernetes-dns/pom.xml +++ b/3-extensions/registry/dubbo-samples-kubernetes/dubbo-samples-kubernetes-dns/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-consumer/pom.xml b/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-consumer/pom.xml index 26f1c9cfc5..6b37ea9681 100644 --- a/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-consumer/pom.xml +++ b/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-consumer/pom.xml @@ -32,13 +32,12 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 4.13.1 1.58.0 3.24.3 3.24.3 - 0.0.4.1 3.7.0 @@ -202,7 +201,7 @@ dubbo org.apache.dubbo dubbo-compiler - ${dubbo.compiler.version} + ${dubbo.version} org.apache.dubbo.gen.tri.Dubbo3TripleGenerator diff --git a/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-provider/pom.xml b/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-provider/pom.xml index 84a0f9a1e5..600bd3ae09 100644 --- a/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-provider/pom.xml +++ b/3-extensions/registry/dubbo-samples-mesh-k8s/dubbo-samples-mesh-provider/pom.xml @@ -30,13 +30,12 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 1.58.0 3.24.3 3.24.3 4.13.1 - 0.0.4.1 2.17.2 3.7.0 @@ -201,7 +200,7 @@ dubbo org.apache.dubbo dubbo-compiler - ${dubbo.compiler.version} + ${dubbo.version} org.apache.dubbo.gen.tri.Dubbo3TripleGenerator diff --git a/3-extensions/registry/dubbo-samples-multi-registry/pom.xml b/3-extensions/registry/dubbo-samples-multi-registry/pom.xml index 6dc2767f31..3ef4397acb 100644 --- a/3-extensions/registry/dubbo-samples-multi-registry/pom.xml +++ b/3-extensions/registry/dubbo-samples-multi-registry/pom.xml @@ -38,7 +38,7 @@ 17 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/pom.xml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/pom.xml index c612377d77..f360338919 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/pom.xml +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/pom.xml @@ -35,7 +35,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml index 8cf579c720..8f83a2c1e8 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 1.0.11 4.3.30.RELEASE 2.20.0 diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-group/pom.xml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-group/pom.xml index a1be6ec9f1..ddd394484d 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-group/pom.xml +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-group/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml index d3033a9b84..f66fb23d20 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml index d5afa372d3..ca02f3221d 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml @@ -33,7 +33,7 @@ 17 UTF-8 - 3.3.0-beta.2 + 3.3.1 6.1.5 2.20.0 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/pom.xml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/pom.xml index 286a463774..8ee56693f5 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/pom.xml +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/pom.xml @@ -32,7 +32,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/pom.xml b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/pom.xml index 8f78cffe74..76c0e2ee2b 100644 --- a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/pom.xml +++ b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/pom.xml @@ -34,7 +34,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/pom.xml b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/pom.xml index 6cc55b164a..434b3da2c7 100644 --- a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/pom.xml +++ b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/pom.xml @@ -34,7 +34,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/pom.xml b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/pom.xml index a3f969110a..7310c00191 100644 --- a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/pom.xml +++ b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/pom.xml @@ -34,7 +34,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/pom.xml b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/pom.xml index dbfe8a8482..1efb87d0d6 100644 --- a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/pom.xml +++ b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/pom.xml @@ -34,7 +34,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/3-extensions/registry/dubbo-samples-zookeeper/pom.xml b/3-extensions/registry/dubbo-samples-zookeeper/pom.xml index 85d7ed9af0..27bcc69e00 100644 --- a/3-extensions/registry/dubbo-samples-zookeeper/pom.xml +++ b/3-extensions/registry/dubbo-samples-zookeeper/pom.xml @@ -33,7 +33,7 @@ 17 UTF-8 - 3.3.0-beta.2 + 3.3.1 3.2.3 5.10.1 diff --git a/3-extensions/serialization/dubbo-samples-prefer-serialization/pom.xml b/3-extensions/serialization/dubbo-samples-prefer-serialization/pom.xml index 787ee6ad28..fdbee6cf81 100644 --- a/3-extensions/serialization/dubbo-samples-prefer-serialization/pom.xml +++ b/3-extensions/serialization/dubbo-samples-prefer-serialization/pom.xml @@ -42,7 +42,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 1.9.3 diff --git a/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml b/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml index ffa97b6ecf..8d8b5580a2 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml +++ b/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml @@ -39,7 +39,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 3.24.3 4.13.1 diff --git a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java-3.3/pom.xml b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java-3.3/pom.xml index 9737c735c1..fef79269cb 100644 --- a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java-3.3/pom.xml +++ b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java-3.3/pom.xml @@ -45,7 +45,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.3.0 3.2.3 5.10.1 diff --git a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/pom.xml b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/pom.xml index dc71407ec0..dc02771ba5 100644 --- a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/pom.xml +++ b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/pom.xml @@ -45,7 +45,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 5.10.1 1.9.3 diff --git a/4-governance/dubbo-samples-applevel-override/pom.xml b/4-governance/dubbo-samples-applevel-override/pom.xml index f32c4a1a8f..33164b93eb 100644 --- a/4-governance/dubbo-samples-applevel-override/pom.xml +++ b/4-governance/dubbo-samples-applevel-override/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/4-governance/dubbo-samples-configconditionrouter/pom.xml b/4-governance/dubbo-samples-configconditionrouter/pom.xml index d93fc46aa9..614923dd52 100644 --- a/4-governance/dubbo-samples-configconditionrouter/pom.xml +++ b/4-governance/dubbo-samples-configconditionrouter/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/4-governance/dubbo-samples-meshrule-router/pom.xml b/4-governance/dubbo-samples-meshrule-router/pom.xml index dc91adc795..a8fa6d50ba 100644 --- a/4-governance/dubbo-samples-meshrule-router/pom.xml +++ b/4-governance/dubbo-samples-meshrule-router/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/4-governance/dubbo-samples-metrics-prometheus/case-versions.conf b/4-governance/dubbo-samples-metrics-prometheus/case-versions.conf index 387472e68f..82064895f8 100644 --- a/4-governance/dubbo-samples-metrics-prometheus/case-versions.conf +++ b/4-governance/dubbo-samples-metrics-prometheus/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # Spring app -dubbo.version[ >= 3.2.6 ] +dubbo.version[ >= 3.3.0 ] spring.version=4.*, 5.* java.version= [>= 8] diff --git a/4-governance/dubbo-samples-metrics-prometheus/pom.xml b/4-governance/dubbo-samples-metrics-prometheus/pom.xml index 479d54b2be..97fc0cec14 100644 --- a/4-governance/dubbo-samples-metrics-prometheus/pom.xml +++ b/4-governance/dubbo-samples-metrics-prometheus/pom.xml @@ -45,7 +45,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.7.8 4.13.1 4.5.13 @@ -132,7 +132,7 @@ org.apache.dubbo - dubbo-spring-boot-observability-starter + dubbo-observability-spring-boot-starter diff --git a/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf b/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf index d3f284b81d..3f8888d8e5 100644 --- a/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf +++ b/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # Spring app -dubbo.version=3.2.6 +dubbo.version=[>=3.3.0] spring.version=5.* java.version= [>= 8] diff --git a/4-governance/dubbo-samples-metrics-spring-boot/pom.xml b/4-governance/dubbo-samples-metrics-spring-boot/pom.xml index a44958d19c..ec64f69789 100644 --- a/4-governance/dubbo-samples-metrics-spring-boot/pom.xml +++ b/4-governance/dubbo-samples-metrics-spring-boot/pom.xml @@ -27,7 +27,7 @@ 4.0.0 org.apache.dubbo - dubbo-samples-metrics-springboot + dubbo-samples-metrics-spring-boot 1.0-SNAPSHOT Dubbo Samples Metrics SpringBoot @@ -38,9 +38,8 @@ 1.8 UTF-8 - 3.2.6 - 2.7.8 - 1.10.6 + 3.3.1 + 2.7.18 4.5.13 4.13.1 @@ -49,13 +48,6 @@ - - io.micrometer - micrometer-bom - ${micrometer.version} - pom - import - org.springframework.boot spring-boot-dependencies @@ -131,8 +123,8 @@ - org.apache.dubbo - dubbo-spring-boot-observability-starter + org.apache.dubbo + dubbo-observability-spring-boot-starter @@ -149,6 +141,18 @@ org.apache.dubbo dubbo-spring-boot-actuator + + io.micrometer + micrometer-registry-prometheus + + + io.prometheus + simpleclient + + + io.prometheus + simpleclient_pushgateway + org.springframework.boot spring-boot-starter @@ -226,6 +230,10 @@ snappy-java 1.1.10.5 + + org.awaitility + awaitility + diff --git a/4-governance/dubbo-samples-metrics-spring-boot/src/test/java/org/apache/dubbo/samples/metrics/prometheus/ProviderMetricsIT.java b/4-governance/dubbo-samples-metrics-spring-boot/src/test/java/org/apache/dubbo/samples/metrics/prometheus/ProviderMetricsIT.java index 3ea86c50b8..5af3e99579 100644 --- a/4-governance/dubbo-samples-metrics-spring-boot/src/test/java/org/apache/dubbo/samples/metrics/prometheus/ProviderMetricsIT.java +++ b/4-governance/dubbo-samples-metrics-spring-boot/src/test/java/org/apache/dubbo/samples/metrics/prometheus/ProviderMetricsIT.java @@ -21,12 +21,14 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import org.awaitility.Awaitility; import org.junit.Assert; import org.junit.Test; @@ -34,14 +36,19 @@ public class ProviderMetricsIT { @Test public void test() throws Exception { - try (CloseableHttpClient client = HttpClients.createDefault()) { - HttpGet request = new HttpGet("http://" + System.getProperty("provider", "localhost") + ":18081/management/prometheus"); - CloseableHttpResponse response = client.execute(request); - InputStream inputStream = response.getEntity().getContent(); - String text = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines().collect(Collectors.joining("\n")); - Assert.assertTrue(text.contains("jvm_gc_memory_promoted_bytes_total")); - } catch (Exception e) { - Assert.fail(e.getMessage()); - } + Awaitility.await() + .atMost(3, TimeUnit.MINUTES) + .untilAsserted(()->{ + try (CloseableHttpClient client = HttpClients.createDefault()) { + HttpGet request = new HttpGet("http://" + System.getProperty("provider", "localhost") + ":18081/management/prometheus"); + CloseableHttpResponse response = client.execute(request); + InputStream inputStream = response.getEntity().getContent(); + String text = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines().collect(Collectors.joining("\n")); + Assert.assertTrue(text.contains("jvm_gc_memory_promoted_bytes_total")); + Assert.assertTrue(text.contains("dubbo_application_info_total")); + } catch (Exception e) { + Assert.fail(e.getMessage()); + } + }); } } diff --git a/4-governance/dubbo-samples-sentinel/dubbo-samples-sentinel-consumer/pom.xml b/4-governance/dubbo-samples-sentinel/dubbo-samples-sentinel-consumer/pom.xml index 2a682e2436..736a0a4507 100644 --- a/4-governance/dubbo-samples-sentinel/dubbo-samples-sentinel-consumer/pom.xml +++ b/4-governance/dubbo-samples-sentinel/dubbo-samples-sentinel-consumer/pom.xml @@ -39,7 +39,7 @@ UTF-8 1.8.6 - 3.3.0-beta.1 + 3.3.1 2.2.0 diff --git a/4-governance/dubbo-samples-sentinel/dubbo-samples-sentinel-provider/pom.xml b/4-governance/dubbo-samples-sentinel/dubbo-samples-sentinel-provider/pom.xml index 88dddbf87b..da6a087986 100644 --- a/4-governance/dubbo-samples-sentinel/dubbo-samples-sentinel-provider/pom.xml +++ b/4-governance/dubbo-samples-sentinel/dubbo-samples-sentinel-provider/pom.xml @@ -37,7 +37,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.1 2.2.0 1.8.6 diff --git a/4-governance/dubbo-samples-servicelevel-override/pom.xml b/4-governance/dubbo-samples-servicelevel-override/pom.xml index 2ae49e1cc8..57b31b6189 100644 --- a/4-governance/dubbo-samples-servicelevel-override/pom.xml +++ b/4-governance/dubbo-samples-servicelevel-override/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml b/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml index 03d5579195..649211a59f 100644 --- a/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml +++ b/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 2.3.12.RELEASE 2.2.10.RELEASE 3.29.2-GA diff --git a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/pom.xml b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/pom.xml index 610ad509e5..64bbbfefc4 100644 --- a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/pom.xml +++ b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/pom.xml @@ -44,7 +44,7 @@ 17 UTF-8 - 3.2.6 + 3.3.1 3.0.5 2.2.0 1.10.6 diff --git a/4-governance/dubbo-samples-spring-boot3-tracing/pom.xml b/4-governance/dubbo-samples-spring-boot3-tracing/pom.xml index 0aa78c0222..32a2cb9cd3 100644 --- a/4-governance/dubbo-samples-spring-boot3-tracing/pom.xml +++ b/4-governance/dubbo-samples-spring-boot3-tracing/pom.xml @@ -46,7 +46,7 @@ 17 UTF-8 - 3.3.0-beta.1 + 3.3.1 3.2.3 2.2.0 1.10.6 diff --git a/4-governance/dubbo-samples-spring-hystrix/pom.xml b/4-governance/dubbo-samples-spring-hystrix/pom.xml index df2431c75f..ab5ed6d989 100644 --- a/4-governance/dubbo-samples-spring-hystrix/pom.xml +++ b/4-governance/dubbo-samples-spring-hystrix/pom.xml @@ -33,7 +33,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 1.9.20.1 3.29.2-GA diff --git a/4-governance/dubbo-samples-ssl/pom.xml b/4-governance/dubbo-samples-ssl/pom.xml index d5e1b00ebb..ba534257fd 100644 --- a/4-governance/dubbo-samples-ssl/pom.xml +++ b/4-governance/dubbo-samples-ssl/pom.xml @@ -38,7 +38,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/4-governance/dubbo-samples-tagrouter/pom.xml b/4-governance/dubbo-samples-tagrouter/pom.xml index 401295fdf6..1637665872 100644 --- a/4-governance/dubbo-samples-tagrouter/pom.xml +++ b/4-governance/dubbo-samples-tagrouter/pom.xml @@ -35,7 +35,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing/provider/Application.java b/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing/provider/Application.java index 88deb22e90..e9db575297 100644 --- a/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing/provider/Application.java +++ b/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing/provider/Application.java @@ -30,8 +30,6 @@ public class Application { private static final String ZOOKEEPER_ADDRESS = "zookeeper://" + ZOOKEEPER_HOST + ":" + ZOOKEEPER_PORT; public static void main(String[] args) { - new EmbeddedZooKeeper(2181, false).start(); - ServiceConfig service = new ServiceConfig<>(); service.setInterface(GreetingsService.class); service.setRef(new GreetingsServiceImpl()); diff --git a/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing/provider/EmbeddedZooKeeper.java b/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing/provider/EmbeddedZooKeeper.java deleted file mode 100644 index 648b643fd7..0000000000 --- a/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing/provider/EmbeddedZooKeeper.java +++ /dev/null @@ -1,309 +0,0 @@ - -/* - * Copyright 2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dubbo.tracing.provider; - -import org.apache.zookeeper.server.ServerConfig; -import org.apache.zookeeper.server.ZooKeeperServerMain; -import org.apache.zookeeper.server.quorum.QuorumPeerConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.SmartLifecycle; -import org.springframework.util.ErrorHandler; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.ServerSocket; -import java.util.List; -import java.util.Properties; -import java.util.Random; -import java.util.UUID; -import java.util.stream.Collectors; - -/** - * from: https://github.com/spring-projects/spring-xd/blob/v1.3.1.RELEASE/spring-xd-dirt/src/main/java/org/springframework/xd/dirt/zookeeper/ZooKeeperUtils.java - *

- * Helper class to start an embedded instance of standalone (non clustered) ZooKeeper. - *

- * NOTE: at least an external standalone server (if not an ensemble) are recommended, even for - * {@link org.springframework.xd.dirt.server.singlenode.SingleNodeApplication} - * - * @author Patrick Peralta - * @author Mark Fisher - * @author David Turanski - */ -public class EmbeddedZooKeeper implements SmartLifecycle { - - private static final Random RANDOM = new Random(); - - /** - * Logger. - */ - private static final Logger logger = LoggerFactory.getLogger(EmbeddedZooKeeper.class); - - /** - * ZooKeeper client port. This will be determined dynamically upon startup. - */ - private final int clientPort; - - /** - * Whether to auto-start. Default is true. - */ - private boolean autoStartup = true; - - /** - * Lifecycle phase. Default is 0. - */ - private int phase = 0; - - /** - * Thread for running the ZooKeeper server. - */ - private volatile Thread zkServerThread; - - /** - * ZooKeeper server. - */ - private volatile ZooKeeperServerMain zkServer; - - /** - * {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. - */ - private ErrorHandler errorHandler; - - private boolean daemon = true; - - /** - * Construct an EmbeddedZooKeeper with a random port. - */ - public EmbeddedZooKeeper() { - clientPort = findRandomPort(30000, 65535); - } - - /** - * Construct an EmbeddedZooKeeper with the provided port. - * - * @param clientPort port for ZooKeeper server to bind to - */ - public EmbeddedZooKeeper(int clientPort, boolean daemon) { - this.clientPort = clientPort; - this.daemon = daemon; - } - - /** - * Returns the port that clients should use to connect to this embedded server. - * - * @return dynamically determined client port - */ - public int getClientPort() { - return this.clientPort; - } - - /** - * Specify whether to start automatically. Default is true. - * - * @param autoStartup whether to start automatically - */ - public void setAutoStartup(boolean autoStartup) { - this.autoStartup = autoStartup; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isAutoStartup() { - return this.autoStartup; - } - - /** - * Specify the lifecycle phase for the embedded server. - * - * @param phase the lifecycle phase - */ - public void setPhase(int phase) { - this.phase = phase; - } - - /** - * {@inheritDoc} - */ - @Override - public int getPhase() { - return this.phase; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isRunning() { - return (zkServerThread != null); - } - - /** - * Start the ZooKeeper server in a background thread. - *

- * Register an error handler via {@link #setErrorHandler} in order to handle - * any exceptions thrown during startup or execution. - */ - @Override - public synchronized void start() { - if (zkServerThread == null) { - zkServerThread = new Thread(new ServerRunnable(), "ZooKeeper Server Starter"); - zkServerThread.setDaemon(daemon); - zkServerThread.start(); - } - } - - /** - * Shutdown the ZooKeeper server. - */ - @Override - public synchronized void stop() { - if (zkServerThread != null) { - // The shutdown method is protected...thus this hack to invoke it. - // This will log an exception on shutdown; see - // https://issues.apache.org/jira/browse/ZOOKEEPER-1873 for details. - try { - Method shutdown = ZooKeeperServerMain.class.getDeclaredMethod("shutdown"); - shutdown.setAccessible(true); - shutdown.invoke(zkServer); - } catch (Exception e) { - throw new RuntimeException(e); - } - - // It is expected that the thread will exit after - // the server is shutdown; this will block until - // the shutdown is complete. - try { - zkServerThread.join(5000); - zkServerThread = null; - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - logger.warn("Interrupted while waiting for embedded ZooKeeper to exit"); - // abandoning zk thread - zkServerThread = null; - } - } - } - - /** - * Stop the server if running and invoke the callback when complete. - */ - @Override - public void stop(Runnable callback) { - stop(); - callback.run(); - } - - /** - * Provide an {@link ErrorHandler} to be invoked if an Exception is thrown from the ZooKeeper server thread. If none - * is provided, only error-level logging will occur. - * - * @param errorHandler the {@link ErrorHandler} to be invoked - */ - public void setErrorHandler(ErrorHandler errorHandler) { - this.errorHandler = errorHandler; - } - - /** - * Runnable implementation that starts the ZooKeeper server. - */ - private class ServerRunnable implements Runnable { - - @Override - public void run() { - try { - Properties properties = new Properties(); - File file = new File(System.getProperty("java.io.tmpdir") - + File.separator + UUID.randomUUID()); - file.deleteOnExit(); - properties.setProperty("dataDir", file.getAbsolutePath()); - properties.setProperty("clientPort", String.valueOf(clientPort)); - - QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig(); - quorumPeerConfig.parseProperties(properties); - - zkServer = new ZooKeeperServerMain(); - ServerConfig configuration = new ServerConfig(); - configuration.readFrom(quorumPeerConfig); - - System.setProperty("zookeeper.admin.enableServer", "false"); - - zkServer.runFromConfig(configuration); - } catch (Exception e) { - if (errorHandler != null) { - errorHandler.handleError(e); - } else { - logger.error("Exception running embedded ZooKeeper", e); - } - } - } - } - - /** - * Workaround for SocketUtils.findRandomPort() deprecation. - * - * @param min min port - * @param max max port - * @return a random generated available port - */ - private static int findRandomPort(int min, int max) { - if (min < 1024) { - throw new IllegalArgumentException("Max port shouldn't be less than 1024."); - } - - if (max > 65535) { - throw new IllegalArgumentException("Max port shouldn't be greater than 65535."); - } - - if (min > max) { - throw new IllegalArgumentException("Min port shouldn't be greater than max port."); - } - - int port = 0; - int counter = 0; - - // Workaround for legacy JDK doesn't support Random.nextInt(min, max). - List randomInts = RANDOM.ints(min, max + 1) - .limit(max - min) - .mapToObj(Integer::valueOf) - .collect(Collectors.toList()); - - do { - if (counter > max - min) { - throw new IllegalStateException("Unable to find a port between " + min + "-" + max); - } - - port = randomInts.get(counter); - counter++; - } while (isPortInUse(port)); - - return port; - } - - private static boolean isPortInUse(int port) { - try (ServerSocket ignored = new ServerSocket(port)) { - return false; - } catch (IOException e) { - // continue - } - return true; - } -} diff --git a/4-governance/dubbo-samples-tracing/pom.xml b/4-governance/dubbo-samples-tracing/pom.xml index 29d4589aaf..09d24260e2 100644 --- a/4-governance/dubbo-samples-tracing/pom.xml +++ b/4-governance/dubbo-samples-tracing/pom.xml @@ -46,7 +46,7 @@ 1.8 UTF-8 - 3.3.0-beta.1 + 3.3.1 2.7.8 1.10.6 1.0.5 diff --git a/4-governance/dubbo-samples-zipkin/pom.xml b/4-governance/dubbo-samples-zipkin/pom.xml index e06859ed35..12fbaa0c84 100644 --- a/4-governance/dubbo-samples-zipkin/pom.xml +++ b/4-governance/dubbo-samples-zipkin/pom.xml @@ -32,7 +32,7 @@ 1.8 UTF-8 - 3.2.6 + 3.3.1 4.3.30.RELEASE 2.20.0 4.13.1 diff --git a/online_bontique_demo/pom.xml b/online_bontique_demo/pom.xml index 9be1fa40f2..1244686a3f 100644 --- a/online_bontique_demo/pom.xml +++ b/online_bontique_demo/pom.xml @@ -44,7 +44,7 @@ 17 UTF-8 - 3.3.0-beta.4 + 3.3.1 3.2.3