(dubbo-samples) branch master updated: fix dubbo filter provider (#1184)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new a1feb1f0f fix dubbo filter provider (#1184) a1feb1f0f is described below commit a1feb1f0f9f6de0188dc05ba0e28d5ac1e1dba74 Author: 钱一辉 <42443276+617076...@users.noreply.github.com> AuthorDate: Thu Oct 10 09:41:14 2024 +0800 fix dubbo filter provider (#1184) --- .../dubbo/samples/extensibility/filter/provider/AppendedFilter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-provider/src/main/java/org/apache/dubbo/samples/extensibility/filter/provider/AppendedFilter.java b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-provider/src/main/java/org/apache/dubbo/samples/extensibility/filter/provider/AppendedFilter.java index d302ea6f4..19a661f4e 100644 --- a/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-provider/src/main/java/org/apache/dubbo/samples/extensibility/filter/provider/AppendedFilter.java +++ b/10-task/dubbo-samples-extensibility/dubbo-samples-extensibility-filter-provider/src/main/java/org/apache/dubbo/samples/extensibility/filter/provider/AppendedFilter.java @@ -31,7 +31,9 @@ public class AppendedFilter implements Filter { // Obtain the returned value Result appResponse = ((AsyncRpcResult) result).getAppResponse(); // Appended value -appResponse.setValue(appResponse.getValue()+"'s customized AppendedFilter"); +if (appResponse.getValue() instanceof String) { +appResponse.setValue(appResponse.getValue() + "'s customized AppendedFilter"); +} return result; } } - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: same host run provider and consumer lead to qos (#1183)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 532e4793f same host run provider and consumer lead to qos (#1183) 532e4793f is described below commit 532e4793f2385932ad43e542307a61c060d405de Author: Ash Andrew AuthorDate: Fri Sep 27 16:37:38 2024 +0800 same host run provider and consumer lead to qos (#1183) conflict --- .../src/main/java/org/apache/dubbo/samples/client/Application.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java b/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java index 28354bccd..338258299 100644 --- a/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java +++ b/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java @@ -21,6 +21,7 @@ import java.io.IOException; import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; +import org.apache.dubbo.config.bootstrap.builders.ApplicationBuilder; import org.apache.dubbo.config.bootstrap.builders.ReferenceBuilder; import org.apache.dubbo.samples.api.GreetingsService; @@ -31,7 +32,10 @@ public class Application { .interfaceClass(GreetingsService.class) .url("tri://localhost:50052") .build(); -DubboBootstrap.getInstance().reference(reference).start(); + +DubboBootstrap.getInstance() + .application(ApplicationBuilder.newBuilder().qosPort(3).build()) +.reference(reference).start(); GreetingsService service = reference.get(); String message = service.sayHi("dubbo"); - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: fix shop doc (#1179)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new a361d4569 fix shop doc (#1179) a361d4569 is described below commit a361d456982bf4936799a30d097d0994ba238a45 Author: heliang666s <147408835+heliang6...@users.noreply.github.com> AuthorDate: Thu Aug 29 10:39:09 2024 +0800 fix shop doc (#1179) * add shop doc and images * fix doc --- online_bontique_demo/doc/local-startup.md| 6 +++--- online_bontique_demo/doc/local-startup.zh.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/online_bontique_demo/doc/local-startup.md b/online_bontique_demo/doc/local-startup.md index 42ef5e1a0..43c129611 100644 --- a/online_bontique_demo/doc/local-startup.md +++ b/online_bontique_demo/doc/local-startup.md @@ -42,10 +42,10 @@ To ensure the correct startup of the system, the services should be started in t 6. Start `productCatalogsService` 7. Start `recommendationService` 8. Start `shippingService` -9. Start `checkoutService` last -10. Start `fronted` last +9. Start `checkoutService` +10. Start `fronted` -**Note: `checkoutService` and `fronted` must be started last.** +**Note: The module boot order is reversible.** ## Accessing the Frontend Page diff --git a/online_bontique_demo/doc/local-startup.zh.md b/online_bontique_demo/doc/local-startup.zh.md index e3d517e63..25d230d25 100644 --- a/online_bontique_demo/doc/local-startup.zh.md +++ b/online_bontique_demo/doc/local-startup.zh.md @@ -42,10 +42,10 @@ 6. 启动 `productCatalogsService` 7. 启动 `recommendationService` 8. 启动 `shippingService` -9. 最后启动 `checkoutService` -10. 最后启动 `fronted` +9. 启动 `checkoutService` +10. 启动 `fronted` -**注意:`checkoutService` 和 `fronted` 必须最后启动。** +**注意:模块启动顺序可调换。** ## 访问前端页面 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: add shop doc and images (#1178)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new eefb349bd add shop doc and images (#1178) eefb349bd is described below commit eefb349bdd83510552cb37e94e2fa73ea1f0338e Author: heliang666s <147408835+heliang6...@users.noreply.github.com> AuthorDate: Tue Aug 27 14:13:31 2024 +0800 add shop doc and images (#1178) --- .../doc/img/architecture-diagram.png | Bin 0 -> 357188 bytes .../doc/img/jaeger-dependencies.png| Bin 0 -> 291131 bytes online_bontique_demo/doc/img/memorystore.png | Bin 0 -> 170870 bytes .../doc/img/online-boutique-frontend-1.png | Bin 0 -> 4721773 bytes .../doc/img/online-boutique-frontend-2.png | Bin 0 -> 679496 bytes online_bontique_demo/doc/local-startup.md | 64 + online_bontique_demo/doc/local-startup.zh.md | 64 + 7 files changed, 128 insertions(+) diff --git a/online_bontique_demo/doc/img/architecture-diagram.png b/online_bontique_demo/doc/img/architecture-diagram.png new file mode 100644 index 0..af64f52f5 Binary files /dev/null and b/online_bontique_demo/doc/img/architecture-diagram.png differ diff --git a/online_bontique_demo/doc/img/jaeger-dependencies.png b/online_bontique_demo/doc/img/jaeger-dependencies.png new file mode 100644 index 0..b96a1a132 Binary files /dev/null and b/online_bontique_demo/doc/img/jaeger-dependencies.png differ diff --git a/online_bontique_demo/doc/img/memorystore.png b/online_bontique_demo/doc/img/memorystore.png new file mode 100644 index 0..470bdc6bf Binary files /dev/null and b/online_bontique_demo/doc/img/memorystore.png differ diff --git a/online_bontique_demo/doc/img/online-boutique-frontend-1.png b/online_bontique_demo/doc/img/online-boutique-frontend-1.png new file mode 100644 index 0..b63776a08 Binary files /dev/null and b/online_bontique_demo/doc/img/online-boutique-frontend-1.png differ diff --git a/online_bontique_demo/doc/img/online-boutique-frontend-2.png b/online_bontique_demo/doc/img/online-boutique-frontend-2.png new file mode 100644 index 0..b0121663e Binary files /dev/null and b/online_bontique_demo/doc/img/online-boutique-frontend-2.png differ diff --git a/online_bontique_demo/doc/local-startup.md b/online_bontique_demo/doc/local-startup.md new file mode 100644 index 0..42ef5e1a0 --- /dev/null +++ b/online_bontique_demo/doc/local-startup.md @@ -0,0 +1,64 @@ +# Project Startup Document + +## Project Name + +**Dubbo Microservices Mall** + +## Project Background + +This project aims to build a microservices mall system based on Java and Dubbo. By adopting a modular design, different business functions are divided into independent services, enhancing the maintainability and scalability of the system. The system includes core business modules such as advertisements, shopping cart, currency conversion, email notifications, payments, product catalogs, recommendations, logistics, and checkout. + +## Project Goals + +The goals of this project are: + +1. Build a fully functional and scalable microservices mall system. +2. Ensure efficient communication between service modules through Dubbo, guaranteeing system stability and high availability. +3. Provide a user-friendly interface, allowing users to access the frontend page via a web browser and perform shopping operations. +4. Support multiple currency conversions and online payment functions. + +## Service Module Overview + +1. **adService**: Advertisement service, responsible for managing and displaying advertisement content. +2. **cartService**: Shopping cart service, responsible for handling user shopping cart operations, such as adding and removing items. +3. **currencyService**: Currency service, responsible for providing conversion functions between multiple currencies. +4. **emailService**: Email service, responsible for sending order confirmations, promotional information, and other email notifications. +5. **paymentService**: Payment service, responsible for processing user online payment operations. +6. **productCatalogsService**: Product catalog service, responsible for managing product classifications and information display. +7. **recommendationService**: Recommendation service, providing product recommendations based on user behavior. +8. **shippingService**: Logistics service, handling order logistics information and delivery services. +9. **checkoutService**: Checkout service, summarizing the contents of the shopping cart, generating orders, and handling the checkout process. +10. **fronted**: Frontend service, providing the user interface for browsing and shopping. + +## Service Startup Order + +To ensure the correct startup of the system, the services shou
(dubbo-samples) branch master updated: fix pom.xml (#1171)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 0ef8eaeb5 fix pom.xml (#1171) 0ef8eaeb5 is described below commit 0ef8eaeb534fdeb0158e07229b4cb01cb4b21918 Author: heliang666s <147408835+heliang6...@users.noreply.github.com> AuthorDate: Wed Jul 24 14:01:00 2024 +0800 fix pom.xml (#1171) --- .../dubbo-samples-gateway-higress-dubbo-interface/pom.xml | 2 ++ .../dubbo-samples-gateway-higress-triple-interface/pom.xml | 2 ++ .../dubbo-samples-triple-rest-springmvc/pom.xml | 1 + 3-extensions/protocol/dubbo-samples-rest/pom.xml| 2 ++ 4 files changed, 7 insertions(+) diff --git a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-dubbo/dubbo-samples-gateway-higress-dubbo-interface/pom.xml b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-dubbo/dubbo-samples-gateway-higress-dubbo-interface/pom.xml index 89cdaee0c..3610a4c41 100644 --- a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-dubbo/dubbo-samples-gateway-higress-dubbo-interface/pom.xml +++ b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-dubbo/dubbo-samples-gateway-higress-dubbo-interface/pom.xml @@ -33,6 +33,7 @@ 17 17 UTF-8 + 1.0.11 @@ -44,6 +45,7 @@ com.alibaba.spring spring-context-support +${spring-context-support.verison} org.springframework diff --git a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-triple/dubbo-samples-gateway-higress-triple-interface/pom.xml b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-triple/dubbo-samples-gateway-higress-triple-interface/pom.xml index 58fabbb81..bcf7490c4 100644 --- a/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-triple/dubbo-samples-gateway-higress-triple-interface/pom.xml +++ b/2-advanced/dubbo-samples-gateway/dubbo-samples-gateway-higress/dubbo-samples-gateway-higress-triple/dubbo-samples-gateway-higress-triple-interface/pom.xml @@ -33,6 +33,7 @@ 17 17 UTF-8 + 1.0.11 @@ -44,6 +45,7 @@ com.alibaba.spring spring-context-support +${spring-context-support.verison} org.springframework diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/pom.xml b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/pom.xml index 033f9ea10..02afc0554 100644 --- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/pom.xml +++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/pom.xml @@ -51,6 +51,7 @@ com.alibaba.spring spring-context-support +1.0.11 diff --git a/3-extensions/protocol/dubbo-samples-rest/pom.xml b/3-extensions/protocol/dubbo-samples-rest/pom.xml index f5965f417..33363aa48 100644 --- a/3-extensions/protocol/dubbo-samples-rest/pom.xml +++ b/3-extensions/protocol/dubbo-samples-rest/pom.xml @@ -41,6 +41,7 @@ 1.5.19 8.0.53 3.8.3 + 1.0.11 @@ -187,6 +188,7 @@ com.alibaba.spring spring-context-support +${alibaba-spring-context-support.version} - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: Add rest jaxrs path mapping sample cases (#1165)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new c1677f235 Add rest jaxrs path mapping sample cases (#1165) c1677f235 is described below commit c1677f235886252cd40f72c0e5fae7a8c407cee1 Author: fanlobu <74862058+fanl...@users.noreply.github.com> AuthorDate: Mon Jul 22 18:45:09 2024 +0800 Add rest jaxrs path mapping sample cases (#1165) * add(): add rest jaxrs path mapping sample cases * fix(): fix licensed * fix(): fix ci * fix(): fix case error * fix(): fix ci * fix and del some error cases * fix(): fix ci --- .../dubbo-samples-triple-rest-jaxrs/pom.xml| 6 + .../Color.java}| 38 +- .../demo/routine/BasicParamRequestService.java | 124 +- .../demo/routine/BasicParamRequestServiceImpl.java | 142 ++- .../rest/demo/routine/MappingRequestService.java | 90 + .../demo/routine/MappingRequestServiceImpl.java| 100 + .../dubbo/rest/demo/test/BasicParamRequestIT.java | 417 - .../rest/demo/test/MappingRequestServiceIT.java| 220 +++ 8 files changed, 1086 insertions(+), 51 deletions(-) diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/pom.xml b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/pom.xml index b788899f6..b3e17ff3d 100644 --- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/pom.xml +++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/pom.xml @@ -94,6 +94,12 @@ org.springframework spring-web + + +com.fasterxml.jackson.datatype +jackson-datatype-jsr310 +2.12.5 + diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/routine/BasicParamRequestServiceImpl.java b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/pojo/Color.java similarity index 54% copy from 2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/routine/BasicParamRequestServiceImpl.java copy to 2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/pojo/Color.java index ea3ceac84..cb8aa2313 100644 --- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/routine/BasicParamRequestServiceImpl.java +++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/pojo/Color.java @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,37 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rest.demo.routine; - -import org.apache.dubbo.config.annotation.DubboService; - -@DubboService -public class BasicParamRequestServiceImpl implements BasicParamRequestService{ - -@Override -public int primitiveInt(int a, int b) { -return a + b; -} - -@Override -public long primitiveLong(long a, Long b) { -return a + b; -} - -@Override -public byte primitiveByte(byte a, byte b) { -return (byte) (a + b); -} - - -@Override -public double primitiveDouble(double a, double b) { -return a + b; -} - -@Override -public String primitiveString(String a, String b) { -return a + b; -} +package org.apache.dubbo.rest.demo.pojo; +public enum Color { +RED, +GREEN, +BLUE } diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/routine/BasicParamRequestService.java b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/routine/BasicParamRequestService.java index cc48eb107..274bbeac7 100644 --- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/routine/BasicParamRequestService.java +++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/java/org/apache/dubbo/rest/demo/routine/BasicParamRequestService.java @@ -18,15 +18,27 @@ package org.apache.dubbo.rest.demo.routine; +import org.apache.dubbo.rest.demo.pojo.Color; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; - +import java.math.BigDecimal; +
(dubbo-samples) branch master updated: Update jacoco version to 0.8.12 (#1161)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 3374ffcfb Update jacoco version to 0.8.12 (#1161) 3374ffcfb is described below commit 3374ffcfbc3b0659b40b133bec9f1781c24e6183 Author: Sean Yang AuthorDate: Thu Jun 20 09:31:46 2024 +0800 Update jacoco version to 0.8.12 (#1161) --- test/dubbo-test-jacoco-merger/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/dubbo-test-jacoco-merger/pom.xml b/test/dubbo-test-jacoco-merger/pom.xml index 21c6996c8..0574ad675 100644 --- a/test/dubbo-test-jacoco-merger/pom.xml +++ b/test/dubbo-test-jacoco-merger/pom.xml @@ -32,7 +32,7 @@ org.jacoco org.jacoco.cli -0.8.8 +0.8.12 - \ No newline at end of file + - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: ObservationConfiguration add fix code (#1160)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new b1bdde29f ObservationConfiguration add fix code (#1160) b1bdde29f is described below commit b1bdde29f404e85ae6cacfd04dc13b6bd4093ab3 Author: xiaozhigang <32813378+xiaozhig...@users.noreply.github.com> AuthorDate: Tue Jun 11 10:29:11 2024 +0800 ObservationConfiguration add fix code (#1160) --- .../springboot/skywalking/consumer/ObservationConfiguration.java | 5 - .../skywalking/demo/provider/ObservationConfiguration.java | 5 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-consumer/src/main/java/org/apache/dubbo/springboot/skywalking/consumer/ObservationConfiguration.java b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-consumer/src/main/java/org/apache/dubbo/springboot/skywalking/consumer/ObservationConfiguration.java index f3ce46ca7..e39bb7eed 100644 --- a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-consumer/src/main/java/org/apache/dubbo/springboot/skywalking/consumer/ObservationConfiguration.java +++ b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-consumer/src/main/java/org/apache/dubbo/springboot/skywalking/consumer/ObservationConfiguration.java @@ -25,14 +25,17 @@ import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingDefaultTracingHandler; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingReceiverTracingHandler; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingSenderTracingHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration public class ObservationConfiguration { +@ConditionalOnBean(ObservationRegistry.class) @Bean -ApplicationModel applicationModel(ObservationRegistry observationRegistry) { +ApplicationModel applicationModel(@Autowired ObservationRegistry observationRegistry) { ApplicationModel applicationModel = ApplicationModel.defaultModel(); observationRegistry.observationConfig() .observationHandler(new ObservationHandler.FirstMatchingCompositeObservationHandler( diff --git a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-provider/src/main/java/org/apache/dubbo/springboot/skywalking/demo/provider/ObservationConfiguration.java b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-provider/src/main/java/org/apache/dubbo/springboot/skywalking/demo/provider/ObservationConfiguration.java index ef81645fc..d7cd9b1f4 100644 --- a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-provider/src/main/java/org/apache/dubbo/springboot/skywalking/demo/provider/ObservationConfiguration.java +++ b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-provider/src/main/java/org/apache/dubbo/springboot/skywalking/demo/provider/ObservationConfiguration.java @@ -25,13 +25,16 @@ import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingDefaultTracingHandler; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingReceiverTracingHandler; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingSenderTracingHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration public class ObservationConfiguration { +@ConditionalOnBean(ObservationRegistry.class) @Bean -ApplicationModel applicationModel(ObservationRegistry observationRegistry) { +ApplicationModel applicationModel(@Autowired ObservationRegistry observationRegistry) { ApplicationModel applicationModel = ApplicationModel.defaultModel(); observationRegistry.observationConfig() .observationHandler(new ObservationHandler.FirstMatchingCompositeObservationHandler( - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.o
(dubbo-samples) branch master updated: fix hyperlink (#1155)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new ad26b446f fix hyperlink (#1155) ad26b446f is described below commit ad26b446f29b9ef43c9020f50e8be4365e8e3e76 Author: heliang666s <147408835+heliang6...@users.noreply.github.com> AuthorDate: Tue Jun 4 11:37:34 2024 +0800 fix hyperlink (#1155) * fix hyperlink * fix hyperlink again --- README.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d5dc4d2df..6f9500ba7 100644 --- a/README.md +++ b/README.md @@ -180,9 +180,9 @@ spring-boot.version=2.* For more details, please refer to the following case configurations: - * [dubbo-samples-annotation](dubbo-samples-annotation/case-configuration.yml) : A simple provider service with builtin zookeeper. - * [dubbo-samples-api](dubbo-samples-api/case-configuration.yml) : A simple provider service with external zookeeper. - * [dubbo-samples-chain](dubbo-samples-chain/case-configuration.yml) : A multiple services with external zookeeper. - * [dubbo-samples-migration](dubbo-samples-migration/README.md) : A compatibility test with the provider and consumer have different dubbo version. + * [dubbo-samples-annotation](2-advanced/dubbo-samples-annotation/case-configuration.yml) : A simple provider service with builtin zookeeper. + * [dubbo-samples-api](1-basic/dubbo-samples-api/case-configuration.yml) : A simple provider service with external zookeeper. + * [dubbo-samples-chain](2-advanced/dubbo-samples-chain/case-configuration.yml) : A multiple services with external zookeeper. + * [dubbo-samples-migration](2-advanced/dubbo-samples-migration/README.md) : A compatibility test with the provider and consumer have different dubbo verison. That's it, then feel free to add more integration test for the Dubbo project, have fun. - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: chore: fix readme badge (#1152)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 00510c8ad chore: fix readme badge (#1152) 00510c8ad is described below commit 00510c8ad9e030e7f3a1284eba3ad741d188c934 Author: YuLuo AuthorDate: Mon Jun 3 09:58:14 2024 +0800 chore: fix readme badge (#1152) * chore: fix readme badge Signed-off-by: yuluo-yx * fix Signed-off-by: yuluo-yx - Signed-off-by: yuluo-yx --- README.md | 36 +--- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 437e633d1..d5dc4d2df 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ Samples for Apache Dubbo. -![Build Status](https://github.com/apache/dubbo-samples/workflows/Dubbo%202/badge.svg) +![Build Status](https://github.com/apache/dubbo-samples/workflows/Dubbo%203.2/badge.svg) +![Build Status](https://github.com/apache/dubbo-samples/workflows/Dubbo%203.3/badge.svg) ![license](https://img.shields.io/github/license/apache/dubbo-samples.svg) This repository contains a number of projects to illustrate various usages of Dubbo from basic to advanced, pls. check README in each individual sub projects. It is also helpful to cross reference to [Dubbo User Manual](https://dubbo.apache.org/zh-cn/overview/tasks/) to understand the features demoed in this project. @@ -30,9 +31,9 @@ This project is also used for integration tests for dubbo. If you are just learn **How to build and run a integration test** -Dubbo integration test base on docker container, and relies on an image used to run the provider application and test cases. +Dubbo integration test base on docker container, and relies on an image used to run the provider application and test cases. -Integration test leverages [docker](https://docs.docker.com/get-started/) to setup test environment, more accurately, to start dubbo provider instance, and any other supporting systems like registry center if necessary, in docker. +Integration test leverages [docker](https://docs.docker.com/get-started/) to setup test environment, more accurately, to start dubbo provider instance, and any other supporting systems like registry center if necessary, in docker. Please install `docker` and `docker-compose` first, then build the test image `dubbo/sample-test`. @@ -41,7 +42,7 @@ cd dubbo-samples ./test/build-test-image.sh ``` -Use a debian mirror through env `DEBIAN_MIRROR` if apt download files slowly, +Use a debian mirror through env `DEBIAN_MIRROR` if apt download files slowly, the following example uses aliyun mirror server [http://mirrors.aliyun.com/ubuntu/](http://mirrors.aliyun.com/ubuntu/) : ```bash @@ -57,25 +58,24 @@ Then we use the `run-tests.sh` script to run the test cases. cd dubbo-samples ./test/run-tests.sh ``` - + For example, run the `dubbo-samples-annotation` test case: - + ``` ./test/run-tests.sh 2-advanced/dubbo-samples-annotation ``` - + * Run all test cases ```bash cd dubbo-samples - ./test/run-tests.sh + ./test/run-tests.sh ``` If docker container fails to startup successfully in any case, you can check log files in directory `${project.basedir}/target/logs` to understand what happens. Pls. note integration tests rely on a Docker environment, make sure the docker environment is available before running them. - **How to add more integration test** If you are interested in contributing more integration test for dubbo, pls. read further to understand how to enable integration test for one particular sample from the scratch. @@ -84,7 +84,7 @@ Please follow the steps below: 1. Add a file named `case-configuration.yml` to test project. - This file is used to configure the test modules and environment, including dubbo provider / test services, + This file is used to configure the test modules and environment, including dubbo provider / test services, dependent third-party services. 2. Add a file named `case-versions.conf` to test project. @@ -119,10 +119,10 @@ services: - dubbo-samples-annotation ``` -The project contains a dubbo provider `AnnotationProviderBootstrap` and an embedded zookeeper server, +The project contains a dubbo provider `AnnotationProviderBootstrap` and an embedded zookeeper server, as well as a test class `AnnotationServicesIT`. -Therefore, we have to define two services, one service runs `AnnotationProviderBootstrap`, +Therefore, we have to define two services, one service runs `AnnotationProviderBootstrap`, and the other service runs test classes. The service `type` of running dubbo provider is `app`, and the service `type` of running test is `test`. @@ -134,7 +134,7 @@ Use hostname to access between
(dubbo-samples) branch master updated: fix ci (#1151)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 0366886de fix ci (#1151) 0366886de is described below commit 0366886deea97d6724a079a6c8e84dd8929a31d1 Author: 王聪洋 <56506697+wcy666...@users.noreply.github.com> AuthorDate: Tue May 28 10:49:55 2024 +0800 fix ci (#1151) --- .../pom.xml| 14 ++ .../pom.xml| 14 ++ .../dubbo-samples-migration-case-application/pom.xml | 4 2-advanced/dubbo-samples-spring-xml/pom.xml| 7 +++ 4 files changed, 39 insertions(+) diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml index d77b374bb..7220fcded 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml @@ -30,6 +30,7 @@ 1.8 UTF-8 +5.3.25 3.2.6 2.20.0 4.13.1 @@ -39,6 +40,13 @@ + +org.springframework +spring-framework-bom +${spring.version} +pom +import + org.apache.logging.log4j log4j-bom @@ -93,6 +101,12 @@ dubbo + +org.springframework +spring-context-support +${spring.version} + + com.google.protobuf protobuf-java diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml index 91226b9bf..304e4236c 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml @@ -30,6 +30,7 @@ 1.8 UTF-8 +5.3.25 3.0.7 2.20.0 4.13.1 @@ -39,6 +40,13 @@ + +org.springframework +spring-framework-bom +${spring.version} +pom +import + org.apache.logging.log4j log4j-bom @@ -93,6 +101,12 @@ dubbo + +org.springframework +spring-context-support +${spring.version} + + com.google.protobuf protobuf-java diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/pom.xml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/pom.xml index dc48b8ecd..c7a06337c 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/pom.xml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/pom.xml @@ -26,6 +26,10 @@ 1.0-SNAPSHOT pom + +5.3.25 + + dubbo-samples-migration-case-application-api dubbo-samples-migration-case-application-provider diff --git a/2-advanced/dubbo-samples-spring-xml/pom.xml b/2-advanced/dubbo-samples-spring-xml/pom.xml index 4f9ccb362..5b56bd38a 100644 --- a/2-advanced/dubbo-samples-spring-xml/pom.xml +++ b/2-advanced/dubbo-samples-spring-xml/pom.xml @@ -92,6 +92,13 @@ org.apache.dubbo dubbo + + +org.springframework +spring-context-support +${spring.version} + + org.apache.dubbo dubbo-dependencies-zookeeper-curator5 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: Fix springxml related ci (#1150)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new b442728a7 Fix springxml related ci (#1150) b442728a7 is described below commit b442728a79c7ce6230dc5b02740e0d2c36d7b27a Author: 王聪洋 <56506697+wcy666...@users.noreply.github.com> AuthorDate: Mon May 27 14:15:38 2024 +0800 Fix springxml related ci (#1150) * first test * test * add disable * Revert "add disable" This reverts commit 58279c5bf73d4fcdd2b054062f77ec1a530e93a8. * test * fix ci --- 2-advanced/dubbo-samples-annotation/pom.xml | 5 + .../dubbo-samples-async-generated-future/pom.xml | 1 + .../dubbo-samples-async-original-future/pom.xml | 1 + .../dubbo-samples-async/dubbo-samples-async-provider/pom.xml | 6 ++ .../dubbo-samples-async/dubbo-samples-async-simple/pom.xml | 6 ++ .../dubbo-samples-chain/dubbo-samples-chain-backend/pom.xml | 1 + 2-advanced/dubbo-samples-chain/pom.xml | 1 + 2-advanced/dubbo-samples-compatible/pom.xml | 1 + 2-advanced/dubbo-samples-context/pom.xml | 1 + .../dubbo-samples-generic-call-consumer/pom.xml | 1 + .../dubbo-samples-generic-call-provider/pom.xml | 1 + .../dubbo-samples-generic-impl-consumer/pom.xml | 6 ++ .../dubbo-samples-generic-impl-provider/pom.xml | 5 + .../dubbo-samples-generic/dubbo-samples-generic-type/pom.xml | 6 ++ 2-advanced/dubbo-samples-local/pom.xml | 1 + .../dubbo-samples-migration-case-default-consumer/pom.xml| 1 + .../dubbo-samples-migration-case-default-provider/pom.xml| 1 + 2-advanced/dubbo-samples-spi-compatible/pom.xml | 1 + 2-advanced/dubbo-samples-version/pom.xml | 1 + .../configcenter/dubbo-samples-configcenter-apollo/pom.xml | 6 ++ .../dubbo-samples-configcenter-multi-registries/pom.xml | 5 + .../dubbo-samples-configcenter-multiprotocol/pom.xml | 6 ++ .../configcenter/dubbo-samples-configcenter-xml/pom.xml | 6 ++ 3-extensions/protocol/dubbo-samples-triple-reactor/pom.xml | 1 + 3-extensions/protocol/dubbo-samples-triple/pom.xml | 1 + .../dubbo-samples-mesh-consumer/pom.xml | 1 + .../dubbo-samples-mesh-provider/pom.xml | 1 + .../dubbo-samples-nacos-configcenter/pom.xml | 3 ++- .../dubbo-samples-nacos/dubbo-samples-nacos-group/pom.xml| 6 ++ .../dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml | 6 ++ .../dubbo-samples-nacos-tagrouter/pom.xml| 6 ++ .../dubbo-samples-simplified-registry-annotation/pom.xml | 6 ++ .../dubbo-samples-simplified-registry-nosimple/pom.xml | 1 + .../dubbo-samples-simplified-registry-properties/pom.xml | 5 + .../dubbo-samples-simplified-registry-xml/pom.xml| 6 ++ .../protobuf-json-serialization-demo/pom.xml | 5 + 4-governance/dubbo-samples-applevel-override/pom.xml | 6 ++ 4-governance/dubbo-samples-configconditionrouter/pom.xml | 1 + 4-governance/dubbo-samples-meshrule-router/pom.xml | 1 + 4-governance/dubbo-samples-servicelevel-override/pom.xml | 6 ++ 4-governance/dubbo-samples-spring-hystrix/pom.xml| 1 + .../dubbo-samples-ssl/dubbo-samples-ssl-provider/pom.xml | 12 4-governance/dubbo-samples-tagrouter/pom.xml | 6 ++ 4-governance/dubbo-samples-zipkin/pom.xml| 6 ++ 44 files changed, 156 insertions(+), 1 deletion(-) diff --git a/2-advanced/dubbo-samples-annotation/pom.xml b/2-advanced/dubbo-samples-annotation/pom.xml index 86212ed4b..44e0fe47b 100644 --- a/2-advanced/dubbo-samples-annotation/pom.xml +++ b/2-advanced/dubbo-samples-annotation/pom.xml @@ -89,6 +89,11 @@ org.apache.dubbo dubbo + +org.springframework +spring-context-support +${spring.version} + org.apache.dubbo dubbo-dependencies-zookeeper-curator5 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 124440310..26b7f9c05 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 @@ -103,6 +103,7 @@ org.springframework spring-context-support + ${spring.version}
(dubbo-samples) branch master updated: Fix springxml related ci (#1148)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 0ce75120a Fix springxml related ci (#1148) 0ce75120a is described below commit 0ce75120ae5b244690958ada4852185d04c0fc07 Author: 王聪洋 <56506697+wcy666...@users.noreply.github.com> AuthorDate: Fri May 24 09:53:08 2024 +0800 Fix springxml related ci (#1148) * first test * test * add disable * Revert "add disable" This reverts commit 58279c5bf73d4fcdd2b054062f77ec1a530e93a8. * test --- .../dubbo-samples-async-generated-future/pom.xml | 5 + .../dubbo-samples-async-original-future/pom.xml | 5 + .../dubbo-samples-async-simple/pom.xml | 5 + .../dubbo-samples-chain-backend/pom.xml | 5 + 2-advanced/dubbo-samples-chain/pom.xml | 4 2-advanced/dubbo-samples-compatible/pom.xml | 4 2-advanced/dubbo-samples-context/pom.xml | 4 2-advanced/dubbo-samples-docker/pom.xml | 5 + .../dubbo-samples-generic-call-consumer/pom.xml | 4 .../dubbo-samples-generic-call-provider/pom.xml | 4 2-advanced/dubbo-samples-local/pom.xml | 4 .../pom.xml | 13 - .../pom.xml | 13 - 2-advanced/dubbo-samples-spi-compatible/pom.xml | 5 + 2-advanced/dubbo-samples-version/pom.xml | 4 .../dubbo-samples-configcenter-multiprotocol/pom.xml | 4 .../protocol/dubbo-samples-triple-reactor/pom.xml| 19 ++- 3-extensions/protocol/dubbo-samples-triple/pom.xml | 20 ++-- .../dubbo-samples-mesh-consumer/pom.xml | 5 + .../dubbo-samples-mesh-provider/pom.xml | 5 + .../pom.xml | 4 .../dubbo-samples-configconditionrouter/pom.xml | 5 + 4-governance/dubbo-samples-meshrule-router/pom.xml | 5 + 4-governance/dubbo-samples-spring-hystrix/pom.xml| 5 + 24 files changed, 151 insertions(+), 5 deletions(-) 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 0853100cb..124440310 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 @@ -100,6 +100,11 @@ dubbo + +org.springframework +spring-context-support + + org.apache.dubbo dubbo-dependencies-zookeeper-curator5 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 9b4da2756..ff3e6b7be 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 @@ -100,6 +100,11 @@ dubbo + +org.springframework +spring-context-support + + org.apache.dubbo dubbo-dependencies-zookeeper-curator5 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 ae3868ea9..83d2aa113 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 @@ -61,6 +61,11 @@ import + +org.springframework +spring-context-support + + org.apache.dubbo dubbo-dependencies-zookeeper-curator5 diff --git a/2-advanced/dubbo-samples-chain/dubbo-samples-chain-backend/pom.xml b/2-advanced/dubbo-samples-chain/dubbo-samples-chain-backend/pom.xml index 56f5b098e..19d9fca4e 100644 --- a/2-advanced/dubbo-samples-chain/dubbo-samples-chain-backend/pom.xml +++ b/2-advanced/dubbo-samples-chain/dubbo-samples-chain-backend/pom.xml @@ -38,6 +38,11 @@ dubbo-samples-chain-api ${project.version} + + +org.springframework +spring-context-support + diff --git a/2-advanced/dubbo-samples-chain/pom.xml b/2-advanced/dubbo-samples-chain/pom.xml index ff054c897..326e4b894 100644 --- a/2-advanced/dubbo-samples-chain/pom.xml +++ b/2-advanced/dubbo-samples-chain/pom.xml @@ -99,6 +99,10 @@ dubbo + +org
(dubbo-samples) branch master updated: Add filter for dubbo-samples-benchmark
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new fce381c2c Add filter for dubbo-samples-benchmark fce381c2c is described below commit fce381c2c11f87805dede48c4f18a8e336698c1a Author: Albumen Kevin AuthorDate: Tue May 21 14:46:02 2024 +0800 Add filter for dubbo-samples-benchmark --- 10-task/dubbo-samples-benchmark/case-versions.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/10-task/dubbo-samples-benchmark/case-versions.conf b/10-task/dubbo-samples-benchmark/case-versions.conf index 5b2f9102c..3f4112392 100644 --- a/10-task/dubbo-samples-benchmark/case-versions.conf +++ b/10-task/dubbo-samples-benchmark/case-versions.conf @@ -23,3 +23,4 @@ dubbo.version=3.3.* spring.version=5.* java.version=8 +dubbo.benchmark=1.* - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: Feat/curator5 zookeeper transporter remove (#1131)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 800cf2882 Feat/curator5 zookeeper transporter remove (#1131) 800cf2882 is described below commit 800cf28827cfedc5b08b2d6aa741c335bfc6eeb9 Author: stellar <137587347+stellar1...@users.noreply.github.com> AuthorDate: Tue May 14 11:52:45 2024 +0800 Feat/curator5 zookeeper transporter remove (#1131) * feat:update all old zookeeper version -> curator5 * feat:when 3.3.0-beta.2-SNAPSHOT Curator5ZookeeperTransporter renamed ZookeeperClientManager - Co-authored-by: huazhongming --- 2-advanced/dubbo-samples-spi-compatible/case-versions.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2-advanced/dubbo-samples-spi-compatible/case-versions.conf b/2-advanced/dubbo-samples-spi-compatible/case-versions.conf index b03fb1ae4..7aa967d8e 100644 --- a/2-advanced/dubbo-samples-spi-compatible/case-versions.conf +++ b/2-advanced/dubbo-samples-spi-compatible/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # Spring app -dubbo.version=3.* +dubbo.version=[ ">=3.0 <3.3.0" ] spring.version=4.*, 5.* java.version= [>= 8] - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: feat: bump spring boot(3.2.3) and JDK17 in 2-advanced example module … (#1136)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new ede24dfcd feat: bump spring boot(3.2.3) and JDK17 in 2-advanced example module … (#1136) ede24dfcd is described below commit ede24dfcde582ddec279fd2e2d2516b272bb8b3c Author: shenyao AuthorDate: Fri May 10 10:05:43 2024 +0800 feat: bump spring boot(3.2.3) and JDK17 in 2-advanced example module … (#1136) * feat: bump spring boot(3.2.3) and JDK17 in 2-advanced example module & tools module * feat: bump spring boot(3.2.3) and JDK17 in 2-advanced example module & tools module * feat: bump spring boot(3.2.3) and JDK17 in 2-advanced example module & tools module - Co-authored-by: yao.s...@hstong.com --- 2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml | 2 +- 2-advanced/dubbo-samples-merge/case-versions.conf | 6 +++--- 2-advanced/dubbo-samples-merge/pom.xml | 5 ++--- 2-advanced/dubbo-samples-native-image/pom.xml | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) 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 42f4a1ee5..d5c2930b4 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 @@ -36,7 +36,7 @@ UTF-8 3.2.6 -1.5.22.RELEASE +3.2.3 1.1.0.Final 6.0.23.Final 3.0.19.Final diff --git a/2-advanced/dubbo-samples-merge/case-versions.conf b/2-advanced/dubbo-samples-merge/case-versions.conf index f7373a530..2450378b2 100644 --- a/2-advanced/dubbo-samples-merge/case-versions.conf +++ b/2-advanced/dubbo-samples-merge/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # Spring app -dubbo.version=2.7*, 3.* -spring.version=4.*, 5.* -java.version= [>= 8] +dubbo.version=[ >= 3.3.0 ] +spring-boot.version=3.2.* +java.version= [ >= 17] diff --git a/2-advanced/dubbo-samples-merge/pom.xml b/2-advanced/dubbo-samples-merge/pom.xml index 382b0569f..e2eeb76f3 100644 --- a/2-advanced/dubbo-samples-merge/pom.xml +++ b/2-advanced/dubbo-samples-merge/pom.xml @@ -48,9 +48,8 @@ 1.8 UTF-8 -3.2.6 -4.3.30.RELEASE -2.7.8 +3.3.0-beta.1 +3.2.3 4.13.1 diff --git a/2-advanced/dubbo-samples-native-image/pom.xml b/2-advanced/dubbo-samples-native-image/pom.xml index 415a4df1a..89c393e3b 100644 --- a/2-advanced/dubbo-samples-native-image/pom.xml +++ b/2-advanced/dubbo-samples-native-image/pom.xml @@ -30,7 +30,7 @@ UTF-8 3.3.0-beta.1 -3.0.5 +3.2.3 3.19.6 3.10.1 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: Update scenarioTimeout to 600 (#1129)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new f82f23f3f Update scenarioTimeout to 600 (#1129) f82f23f3f is described below commit f82f23f3fbb4a47eaeba8b7eecfef85318adf6db Author: Albumen Kevin AuthorDate: Wed Apr 10 11:13:37 2024 +0800 Update scenarioTimeout to 600 (#1129) --- 2-advanced/dubbo-samples-seata/case-configuration.yml | 2 +- .../dubbo-servicediscovery-migration/case-configuration.yml | 2 +- .../dubbo-samples-configcenter-apollo/case-configuration.yml| 2 +- .../dubbo-samples-nacos-conditionrouter/case-configuration.yml | 2 +- .../dubbo-samples-nacos-configcenter/case-configuration.yml | 2 +- .../dubbo-samples-nacos-override/case-configuration.yml | 2 +- .../dubbo-samples-nacos-registry/case-configuration.yml | 2 +- .../dubbo-samples-nacos-tagrouter/case-configuration.yml| 2 +- .../main/java/org/apache/dubbo/scenario/builder/ConfigurationImpl.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/2-advanced/dubbo-samples-seata/case-configuration.yml b/2-advanced/dubbo-samples-seata/case-configuration.yml index 7a18160a5..cebeae6a2 100644 --- a/2-advanced/dubbo-samples-seata/case-configuration.yml +++ b/2-advanced/dubbo-samples-seata/case-configuration.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -timeout: 300 +timeout: 600 # global system props for all service systemProps: diff --git a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/case-configuration.yml b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/case-configuration.yml index a5c3ab13d..771badc0a 100644 --- a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/case-configuration.yml +++ b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/case-configuration.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -timeout: 240 +timeout: 600 services: zookeeper: diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-configuration.yml b/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-configuration.yml index 4a47be43f..ad1e1ccb2 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-configuration.yml +++ b/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-configuration.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -timeout: 300 +timeout: 600 services: dubbo-samples-configcenter-apollo: diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-configuration.yml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-configuration.yml index fa3465c85..b48c734db 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-configuration.yml +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-configuration.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -timeout: 300 +timeout: 600 services: nacos: diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-configuration.yml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-configuration.yml index 67bc3ba67..649bc7d2d 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-configuration.yml +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-configuration.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -timeout: 300 +timeout: 600 services: nacos: diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/case-configuration.yml b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/case-configuration.yml index 4c4201c9d..42a028a33 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/case-configuration.yml +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/case-configuration.yml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -timeout: 300 +timeout: 600 services: nacos: diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case
(dubbo-samples) branch master updated: Update dubbo-samples-callback springboot3 and JDK17 (#1125)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 6ddb0a743 Update dubbo-samples-callback springboot3 and JDK17 (#1125) 6ddb0a743 is described below commit 6ddb0a7431ef7be6d31831f2395a8134d6fbc3e9 Author: SSSugarman <61129238+sssugar...@users.noreply.github.com> AuthorDate: Sun Apr 7 14:06:04 2024 +0800 Update dubbo-samples-callback springboot3 and JDK17 (#1125) Co-authored-by: hujiajia --- .../dubbo-samples-callback/case-versions.conf | 6 ++-- .../dubbo-samples-callback-consumer/pom.xml| 5 +-- .../dubbo-samples-callback-provider/pom.xml| 5 +-- 2-advanced/dubbo-samples-callback/pom.xml | 39 +++--- 4 files changed, 13 insertions(+), 42 deletions(-) diff --git a/2-advanced/dubbo-samples-callback/case-versions.conf b/2-advanced/dubbo-samples-callback/case-versions.conf index 0a8a7738f..82aeb4560 100644 --- a/2-advanced/dubbo-samples-callback/case-versions.conf +++ b/2-advanced/dubbo-samples-callback/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # Spring app -dubbo.version=2.7*, 3.* -spring-boot.version=2.* -java.version= [>= 8] +dubbo.version=3.3.* +spring.version=6.* +java.version= [>= 17] 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 3e8879f49..1f660ae46 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,11 +35,12 @@ org.apache.dubbo dubbo-spring-boot-starter +3.3.0-beta.1 org.apache.dubbo -dubbo-dependencies-zookeeper-curator5 -pom + dubbo-zookeeper-curator5-spring-boot-starter +3.2.3 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 a408d2f3b..3587c63b3 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,11 +36,12 @@ org.apache.dubbo dubbo-spring-boot-starter +3.3.0-beta.1 org.apache.dubbo -dubbo-dependencies-zookeeper-curator5 -pom + dubbo-zookeeper-curator5-spring-boot-starter +3.2.3 diff --git a/2-advanced/dubbo-samples-callback/pom.xml b/2-advanced/dubbo-samples-callback/pom.xml index db8473b10..957c3380d 100644 --- a/2-advanced/dubbo-samples-callback/pom.xml +++ b/2-advanced/dubbo-samples-callback/pom.xml @@ -35,12 +35,12 @@ Dubbo Samples Callback -1.8 -1.8 +17 +17 UTF-8 -3.2.6 -2.7.8 +3.3.0-beta.1 +3.2.3 4.13.1 @@ -72,37 +72,6 @@ - -org.apache.dubbo -dubbo-bom -${dubbo.version} -pom -import - - -org.apache.dubbo -dubbo-dependencies-zookeeper-curator5 -${dubbo.version} -pom - - -logback-classic -ch.qos.logback - - -logback-core -ch.qos.logback - - -log4j -log4j - - -slf4j-log4j12 -org.slf4j - - - junit junit - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: feat:update all old zookeeper version -> curator5 (#1124)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 9c40d1824 feat:update all old zookeeper version -> curator5 (#1124) 9c40d1824 is described below commit 9c40d18244d8586f046134479c6563d79e1abee0 Author: stellar <137587347+stellar1...@users.noreply.github.com> AuthorDate: Sun Apr 7 14:02:59 2024 +0800 feat:update all old zookeeper version -> curator5 (#1124) --- .../dubbo-samples-migration-case-application-consumer/pom.xml | 6 +++--- .../java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java | 4 ++-- 4-governance/dubbo-samples-zipkin/pom.xml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml index 46beb3fdc..d77b374bb 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml @@ -30,7 +30,7 @@ 1.8 UTF-8 -2.7.13 +3.2.6 2.20.0 4.13.1 @@ -55,7 +55,7 @@ org.apache.dubbo -dubbo-dependencies-zookeeper +dubbo-dependencies-zookeeper-curator5 ${dubbo.consumer.version} pom @@ -100,7 +100,7 @@ org.apache.dubbo -dubbo-dependencies-zookeeper +dubbo-dependencies-zookeeper-curator5 pom diff --git a/2-advanced/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java b/2-advanced/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java index dab9af66e..2530cdc68 100644 --- a/2-advanced/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java +++ b/2-advanced/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleRegistry.java @@ -18,7 +18,7 @@ package org.apache.dubbo.samples.basic.spi; import org.apache.dubbo.registry.zookeeper.ZookeeperRegistryFactory; import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter; -import org.apache.dubbo.remoting.zookeeper.curator.CuratorZookeeperTransporter; +import org.apache.dubbo.remoting.zookeeper.curator5.Curator5ZookeeperTransporter; import com.alibaba.dubbo.common.URL; import com.alibaba.dubbo.registry.NotifyListener; @@ -34,7 +34,7 @@ public class CompatibleRegistry implements Registry { public CompatibleRegistry(URL url) { this.url = url; -ZookeeperTransporter transporter = new CuratorZookeeperTransporter(); +ZookeeperTransporter transporter = new Curator5ZookeeperTransporter(); ZookeeperRegistryFactory registryFactory = new ZookeeperRegistryFactory(); registryFactory.setZookeeperTransporter(transporter); delegate = registryFactory.createRegistry(url.setProtocol("zookeeper")); diff --git a/4-governance/dubbo-samples-zipkin/pom.xml b/4-governance/dubbo-samples-zipkin/pom.xml index d556e4b06..d1018eda6 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 -2.7.13 +3.2.6 4.3.30.RELEASE 2.20.0 4.13.1 @@ -70,7 +70,7 @@ org.apache.dubbo -dubbo-dependencies-zookeeper +dubbo-dependencies-zookeeper-curator5 ${dubbo.version} pom @@ -131,7 +131,7 @@ org.apache.dubbo -dubbo-dependencies-zookeeper +dubbo-dependencies-zookeeper-curator5 pom - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: add native test quick start (#1122)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 305c77e36 add native test quick start (#1122) 305c77e36 is described below commit 305c77e3681a687928f8a04e3f6fd532b21be1b6 Author: foghost AuthorDate: Tue Apr 2 14:22:04 2024 +0800 add native test quick start (#1122) --- test/README-NATIVE.md | 134 ++ test/README.md| 1 + 2 files changed, 135 insertions(+) diff --git a/test/README-NATIVE.md b/test/README-NATIVE.md new file mode 100644 index 0..3343e7a23 --- /dev/null +++ b/test/README-NATIVE.md @@ -0,0 +1,134 @@ + +## Dubbo Native Integration Test Quick Start + +### Building Test Image + +```shell +cd dubbo-samples +./test/build-native-test-image.sh +``` + +For users in China, mirror acceleration can be utilized: + +```shell +docker pull ghcr.m.daocloud.io/graalvm/native-image-community:17-ol7 +docker tag ghcr.m.daocloud.io/graalvm/native-image-community:17-ol7 ghcr.io/graalvm/native-image-community:17-ol7 +cd dubbo-samples +./test/build-native-test-image.sh +``` + +### Running Test Cases + +The script `run-native-tests.sh` is used to execute a single test case, a list of test cases, or all test cases. + +The script `kill-tests.sh` is used to forcefully terminate all test cases, stop all dubbo containers, and all processes of run-native-tests.sh and scenario.sh. + +Note: After interrupting the execution of run-native-tests.sh with Ctrl+C, the kill-tests.sh script should be executed. + + Running Methods + +* Running a Single Test Case + + ``` shell + ./test/run-native-tests.sh + ``` + + For example, to run the dubbo-samples-native-image-registry test case: + + ```shell + ./test/run-native-tests.sh 2-advanced/dubbo-samples-native-image-registry + ``` + +* Running a Specified List of Test Cases + + ```shell + TEST_CASE_FILE=testcases1.txt ./test/run-native-tests.sh + ``` + +* Running All Test Cases + + ```shell + ./test/run-native-tests.sh + ``` + +The principle behind running all test cases with run-native-tests.sh: +1. Search for all `native-case-configuration.yml` files. +2. Fork multiple processes to run the test cases sequentially. + +### Adding Test Cases + +Ensure that the versions in case-versions.conf are correct: `dubbo.version=3.3.*, spring.version=6.*, java.version= >= 17`. + +The test case configuration file should be named native-case-configuration.yml and placed in the basedir of each project that requires testing. + +The basic usage should remain consistent with the [quick-start](./quick-start_cn.md) guide, +with details directly referable to the official documentation on [Support for GraalVM Native Image](https://cn.dubbo.apache.org/zh-cn/overview/mannual/java-sdk/advanced-features-and-usage/performance/support-graalvm/). + +Note: + +* The `native-case-configuration.yml` file should add config `timeout: 600` because native testing requires packaging a native Image, which is time-consuming. The default timeout may not be sufficient for the packaging process, leading to premature timeouts. +* Ensure that project dependencies meet the minimum version requirements. Use the latest version of maven-compiler-plugin to prevent unnecessary issues, and use the latest version of native-maven-plugin for better support. Refer to the example in 2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider for version details. +* For normal application main startup classes, the pom.xml must include a profile named native, which will be used during the packaging and compilation phase. Projects that require running unit tests should have a nativeTest profile. Refer to the example in 2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer. +* The matching rule for test classes (includes) is "*IT.java",The default matching rule is:"**/*IT.class". In the native test scenario, this is activated through the configuration of the test plugin. +```xml + +org.apache.maven.plugins +maven-surefire-plugin +3.1.2 + + +${env.TEST_PATTERNS} + + + +``` + Corresponding to the native-case-configuration.yml configuration is + ```yaml + dubbo-samples-native-image-registry-test: + type: nativeTest + basedir: dubbo-samples-native-image-registry-consumer + tests: + - "**/*IT.class" // Configure the matching rules of the test class, this is also the default value + ``` +If the unit test runs incompletely you need to check these configurations + +* Examples that rely on zookeeper need to configure the zookeeper address in the native-maven-plugin channel, otherwise the actual zookee
(dubbo-samples) branch master updated: Update cache moudle jdk17 and springboot3 (#1055)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 21cb3d745 Update cache moudle jdk17 and springboot3 (#1055) 21cb3d745 is described below commit 21cb3d745c8feaa97ff3a21bb3e8ff6d0bc17e6e Author: hqbfz <125714719+3424672...@users.noreply.github.com> AuthorDate: Thu Mar 14 17:08:29 2024 +0800 Update cache moudle jdk17 and springboot3 (#1055) --- 2-advanced/dubbo-samples-cache/case-versions.conf | 6 ++-- .../dubbo-samples-cache-consumer/pom.xml | 3 +- .../src/main/resources/log4j2.xml | 29 .../dubbo-samples-cache-provider/pom.xml | 3 +- .../dubbo/samples/cache/impl/CacheServiceImpl.java | 1 + .../src/main/resources/log4j2.xml | 29 2-advanced/dubbo-samples-cache/pom.xml | 32 +++--- 7 files changed, 10 insertions(+), 93 deletions(-) diff --git a/2-advanced/dubbo-samples-cache/case-versions.conf b/2-advanced/dubbo-samples-cache/case-versions.conf index f7373a530..82aeb4560 100644 --- a/2-advanced/dubbo-samples-cache/case-versions.conf +++ b/2-advanced/dubbo-samples-cache/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # Spring app -dubbo.version=2.7*, 3.* -spring.version=4.*, 5.* -java.version= [>= 8] +dubbo.version=3.3.* +spring.version=6.* +java.version= [>= 17] diff --git a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/pom.xml b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/pom.xml index 9caccb265..126530a33 100644 --- a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/pom.xml +++ b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/pom.xml @@ -33,8 +33,7 @@ org.apache.dubbo -dubbo-dependencies-zookeeper-curator5 -pom + dubbo-zookeeper-curator5-spring-boot-starter diff --git a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/src/main/resources/log4j2.xml b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/src/main/resources/log4j2.xml deleted file mode 100644 index 69e1321d2..0 --- a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/src/main/resources/log4j2.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - diff --git a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/pom.xml b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/pom.xml index fc9613ce0..64bff55fd 100644 --- a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/pom.xml +++ b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/pom.xml @@ -41,8 +41,7 @@ org.apache.dubbo -dubbo-dependencies-zookeeper-curator5 -pom + dubbo-zookeeper-curator5-spring-boot-starter diff --git a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/java/org/apache/dubbo/samples/cache/impl/CacheServiceImpl.java b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/java/org/apache/dubbo/samples/cache/impl/CacheServiceImpl.java index 9c5fc261d..b4051b9ce 100644 --- a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/java/org/apache/dubbo/samples/cache/impl/CacheServiceImpl.java +++ b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/java/org/apache/dubbo/samples/cache/impl/CacheServiceImpl.java @@ -29,6 +29,7 @@ public class CacheServiceImpl implements CacheService { private final AtomicInteger i = new AtomicInteger(); +@Override public String findCache(String id) { return "request: " + id + ", response: " + i.getAndIncrement(); } diff --git a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/resources/log4j2.xml b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/resources/log4j2.xml deleted file mode 100644 index 69e1321d2..0 --- a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/resources/log4j2.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - diff --git a/2-advanced/dubbo-samples-cache/pom.xml b/2-advanced/dubbo-samples-cache/pom.xml index 6d4ae6d77..059e78e05 100644 --- a/2-advanced/dubbo-samples-cache/pom.xml +++ b/2-advanced/dubbo-samples-cache/pom.xml @@ -36,12 +36,12 @@ Dubbo Samples Cache -1.8 -1.8 +17 +17 UTF-8 -3.2.6 -2.7.8 +3.3.0-beta.1 +3.2.3 4.13.1 @@ -82,30
(dubbo-samples) branch master updated: upgrade jdk17 and spring3 (#1048)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 0bf62a6b8 upgrade jdk17 and spring3 (#1048) 0bf62a6b8 is described below commit 0bf62a6b8e3fcf66581790dc51450a87432e1600 Author: Tritone AuthorDate: Tue Mar 12 17:37:25 2024 +0800 upgrade jdk17 and spring3 (#1048) --- 1-basic/dubbo-samples-spring-boot/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/1-basic/dubbo-samples-spring-boot/pom.xml b/1-basic/dubbo-samples-spring-boot/pom.xml index 5f77445f1..74087ebc2 100644 --- a/1-basic/dubbo-samples-spring-boot/pom.xml +++ b/1-basic/dubbo-samples-spring-boot/pom.xml @@ -36,12 +36,12 @@ Dubbo Samples Spring Boot -1.8 -1.8 +17 +17 UTF-8 3.3.0-beta.1 -2.7.8 +3.2.0 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: default qos-port:22222 conflict when start consumer application and provider application,change consumer qos-port to 33333 . (#1047)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 0d17f871e default qos-port:2 conflict when start consumer application and provider application,change consumer qos-port to 3 . (#1047) 0d17f871e is described below commit 0d17f871eafd0a5d7ad3cc1f7a942b78c26b8736 Author: Tritone AuthorDate: Mon Mar 11 15:14:56 2024 +0800 default qos-port:2 conflict when start consumer application and provider application,change consumer qos-port to 3 . (#1047) Co-authored-by: tritone --- .../src/main/resources/application.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1-basic/dubbo-samples-spring-boot/dubbo-samples-spring-boot-consumer/src/main/resources/application.yml b/1-basic/dubbo-samples-spring-boot/dubbo-samples-spring-boot-consumer/src/main/resources/application.yml index 631228afe..1fd2a81e8 100644 --- a/1-basic/dubbo-samples-spring-boot/dubbo-samples-spring-boot-consumer/src/main/resources/application.yml +++ b/1-basic/dubbo-samples-spring-boot/dubbo-samples-spring-boot-consumer/src/main/resources/application.yml @@ -16,6 +16,7 @@ dubbo: application: -name: dubbo-springboot-demo-consumer + name: dubbo-springboot-demo-consumer + qos-port: 3 registry: address: zookeeper://${zookeeper.address:127.0.0.1}:2181 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: Add issue template
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 1df9c6458 Add issue template 1df9c6458 is described below commit 1df9c6458b0f41add8a58445fcb6a4f8050d781d Author: Albumen Kevin AuthorDate: Mon Mar 11 14:48:51 2024 +0800 Add issue template --- .github/ISSUE_TEMPLATE/config.yml | 22 ++ 1 file changed, 22 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0..bd06c1c3b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,22 @@ +# +# 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. +# + +blank_issues_enabled: false +contact_links: + - name: Question & FAQ & Proposal +url: https://github.com/apache/dubbo/issues/new/choose +about: Please submit the issue or discussion to the apache/dubbo repository. - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated (44b9b14c9 -> b67f6a8c4)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 44b9b14c9 Merge pull request #1043 from FoghostCn/native add b67f6a8c4 upgrade docker compose to 2.x (#1044) No new revisions were added by this update. Summary of changes: .../src/main/resources/scenario.sh | 27 ++ 1 file changed, 17 insertions(+), 10 deletions(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: :fire: remove unused samples metrics (#1037)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new c9d20e0d3 :fire: remove unused samples metrics (#1037) c9d20e0d3 is described below commit c9d20e0d3deeb1f4771c6c2b93041045ab37566b Author: xiaosheng AuthorDate: Thu Dec 21 10:21:41 2023 +0800 :fire: remove unused samples metrics (#1037) * :fire: remove unused samples metrics * :fire: remove unused samples metrics --- 4-governance/dubbo-samples-metrics/README.md | 26 -- 4-governance/dubbo-samples-metrics/pom.xml | 173 .../dubbo/samples/metrics/EmbeddedZooKeeper.java | 309 - .../dubbo/samples/metrics/MetricsConsumer.java | 59 .../dubbo/samples/metrics/MetricsProvider.java | 51 .../dubbo/samples/metrics/api/DemoService.java | 51 .../samples/metrics/impl/DemoServiceImpl.java | 88 -- .../apache/dubbo/samples/metrics/model/Result.java | 69 - .../apache/dubbo/samples/metrics/model/User.java | 66 - .../src/main/resources/log4j2.xml | 29 -- .../main/resources/spring/dubbo-demo-consumer.xml | 32 --- .../main/resources/spring/dubbo-demo-provider.xml | 38 --- .../dubbo/samples/metrics/MetricsServiceIT.java| 63 - 4-governance/pom.xml | 1 - 14 files changed, 1055 deletions(-) diff --git a/4-governance/dubbo-samples-metrics/README.md b/4-governance/dubbo-samples-metrics/README.md deleted file mode 100644 index 433a7fd68..0 --- a/4-governance/dubbo-samples-metrics/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# 使用Metrics模块进行数据采集 -Dubbo使用开源的[Dubbo Metrics](https://github.com/alibaba/metrics)进行数据埋点,并且通过服务暴露,使用的时候,首先需要进行配置: - -* 依赖(其中dubbo版本在2.7.2及以后) -```xml - -org.apache.dubbo -dubbo-monitor-default -${dubbo.version} - -``` -* 服务端 -```xml - - -``` - -* 客户端 -```xml - - -``` -其中,``的配置指定了metrics暴露的协议和端口,这些信息会被放在元数据里面,而``和``则在服务端和客户端分别激活了metrics的filter,如果你的服务分别含有服务端和客户端,选择在一端激活就可以。 - -* dubbo admin -完成这些配置后,获取[dubbo admin](https://github.com/apache/dubbo-admin)在`develop`分支的最新代码,启动后,在左侧Metrics(统计)标签输入目标机器的IP,可以看到调用,线程池等Metrics信息 diff --git a/4-governance/dubbo-samples-metrics/pom.xml b/4-governance/dubbo-samples-metrics/pom.xml deleted file mode 100644 index 06277e60f..0 --- a/4-governance/dubbo-samples-metrics/pom.xml +++ /dev/null @@ -1,173 +0,0 @@ - - -http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - -org.apache -apache -23 - - -4.0.0 - -org.apache.dubbo -dubbo-samples-metrics -1.0-SNAPSHOT - -Dubbo Samples Metrics -Dubbo Samples Metrics - - -1.8 -1.8 -UTF-8 - -3.2.6 -4.3.30.RELEASE -2.20.0 -4.13.1 - -3.7.0 - - - - - -org.springframework -spring-framework-bom -${spring.version} -pom -import - - -org.apache.dubbo -dubbo-bom -${dubbo.version} -pom -import - - -org.apache.dubbo -dubbo-dependencies-zookeeper-curator5 -${dubbo.version} -pom - - -logback-classic -ch.qos.logback - - -logback-core -ch.qos.logback - - -log4j -log4j - - -slf4j-log4j12 -org.slf4j - - - - - - - - -org.apache.dubbo -dubbo - - - -org.apache.dubbo -dubbo-metrics-default - - - -org.apache.dubbo -dubbo-dependencies-zookeeper-curator5 -pom - - - -org.apache.logging.log4j -log4j-slf4j-impl -${log4j2.version} - - - -junit -junit -${junit.version} -test - - - -org.springframework -spring-test -test - - - -com.alibaba -fastjson -1.2.83 - - - - -io.dropwizard.metri
(dubbo-samples) branch master updated (96289a33c -> 1e5a88555)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 96289a33c Merge pull request #1031 from CrazyHZM/feat/remove_monitor add 1e5a88555 Add test cases to verify apache/dubbo#13436 (#1027) No new revisions were added by this update. Summary of changes: .../case-configuration.yml | 15 +++--- .../case-versions.conf | 0 .../dubbo-samples-test-13436-1-api}/pom.xml| 6 ++- .../apache/dubbo/samples/test}/DemoService.java| 6 +-- .../java/org/apache/dubbo/samples/test/User.java | 8 +--- .../dubbo-samples-test-13436-1-consumer}/pom.xml | 55 +++--- .../java/org/apache/dubbo/samples/FakeMain.java| 0 .../org/apache/dubbo/samples/test/ConsumerIT.java} | 39 +++ .../src/test/resources/log4j.properties| 12 +++-- .../dubbo-samples-test-13436-1-provider}/pom.xml | 50 +++- .../dubbo/samples/test}/DemoServiceImpl.java | 8 ++-- .../apache/dubbo/samples/test/DubboProvider.java} | 27 ++- .../src/main/resources/log4j.properties| 12 +++-- .../pom.xml| 55 +++--- .../case-configuration.yml | 15 +++--- .../case-versions.conf | 0 .../dubbo-samples-test-13436-2-api}/pom.xml| 6 ++- .../apache/dubbo/samples/test}/DemoService.java| 6 +-- .../java/org/apache/dubbo/samples/test/User.java | 8 +--- .../dubbo-samples-test-13436-2-consumer}/pom.xml | 54 +++-- .../java/org/apache/dubbo/samples/FakeMain.java| 0 .../org/apache/dubbo/samples/test/ConsumerIT.java | 33 ++--- .../src/test/resources/log4j.properties| 12 +++-- .../dubbo-samples-test-13436-2-provider}/pom.xml | 51 ++-- .../apache/dubbo/samples/test/DubboProvider.java | 30 ++-- .../dubbo/samples/test/GenericServiceImpl.java | 17 --- .../src/main/resources/log4j.properties| 12 +++-- .../pom.xml| 55 +++--- .../case-configuration.yml | 15 +++--- .../case-versions.conf | 0 .../dubbo-samples-test-13436-3-api}/pom.xml| 6 ++- .../apache/dubbo/samples/test}/DemoService.java| 6 +-- .../java/org/apache/dubbo/samples/test/User.java | 8 +--- .../dubbo-samples-test-13436-3-consumer}/pom.xml | 55 +++--- .../java/org/apache/dubbo/samples/FakeMain.java| 0 .../org/apache/dubbo/samples/test/ConsumerIT.java} | 39 +++ .../src/test/resources/log4j.properties| 12 +++-- .../dubbo-samples-test-13436-3-provider}/pom.xml | 51 ++-- .../apache/dubbo/samples/test/DubboProvider.java | 30 ++-- .../dubbo/samples/test/GenericServiceImpl.java | 17 --- .../src/main/resources/log4j.properties| 12 +++-- .../pom.xml| 55 +++--- .../case-configuration.yml | 15 +++--- .../case-versions.conf | 0 .../dubbo-samples-test-13436-4-api}/pom.xml| 6 ++- .../apache/dubbo/samples/test}/DemoService.java| 6 +-- .../java/org/apache/dubbo/samples/test/User.java | 8 +--- .../dubbo-samples-test-13436-4-consumer}/pom.xml | 54 +++-- .../java/org/apache/dubbo/samples/FakeMain.java| 0 .../org/apache/dubbo/samples/test/ConsumerIT.java | 33 ++--- .../src/test/resources/log4j.properties| 12 +++-- .../dubbo-samples-test-13436-4-provider}/pom.xml | 50 +++- .../dubbo/samples/test}/DemoServiceImpl.java | 8 ++-- .../apache/dubbo/samples/test/DubboProvider.java} | 27 ++- .../src/main/resources/log4j.properties| 12 +++-- .../pom.xml| 55 +++--- 99-integration/pom.xml | 4 ++ 57 files changed, 480 insertions(+), 708 deletions(-) copy 99-integration/{dubbo-samples-memory-tri-server => dubbo-samples-test-13436-1}/case-configuration.yml (79%) copy 99-integration/{dubbo-samples-prefer-serialization-test => dubbo-samples-test-13436-1}/case-versions.conf (100%) copy {4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-interface => 99-integration/dubbo-samples-test-13436-1/dubbo-samples-test-13436-1-api}/pom.xml (81%) copy {10-task/dubbo-samples-rpc-basic/dubbo-samples-rpc-basic-api/src/main/java/org/apache/dubbo/samples => 99-integration/dubbo-samples-test-13436-1/dubbo-samples-test-13436-1-api/src/main/java/org/apache/dubbo/samples/test}/DemoService.java (92%) copy 2-advanced/dubbo-samples-migration/d
(dubbo-samples) branch master updated: Ignore nacos 2.3.0 for instance test
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new ca91985f2 Ignore nacos 2.3.0 for instance test ca91985f2 is described below commit ca91985f2dde8a29aef82054dfc276d0cd4738c2 Author: Albumen Kevin AuthorDate: Tue Dec 12 10:38:38 2023 +0800 Ignore nacos 2.3.0 for instance test Ref https://github.com/alibaba/nacos/issues/11493 --- .../dubbo-samples-registry-test-nacos-instance/case-versions.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/99-integration/dubbo-samples-registry-test-nacos-instance/case-versions.conf b/99-integration/dubbo-samples-registry-test-nacos-instance/case-versions.conf index 8eb77acd7..15e32767e 100644 --- a/99-integration/dubbo-samples-registry-test-nacos-instance/case-versions.conf +++ b/99-integration/dubbo-samples-registry-test-nacos-instance/case-versions.conf @@ -22,4 +22,4 @@ dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* java.version= [ >= 8 ] -nacos.version="!*-BETA","!*-ALPHA*",2.* +nacos.version="!*-BETA","!*-ALPHA*","!2.3.0",2.* - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: Add async methods to Greeter implementations (#1026)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 7aaf25bfa Add async methods to Greeter implementations (#1026) 7aaf25bfa is described below commit 7aaf25bfa6c556f59136adb6c26a0a51f9cac0dd Author: Sean Yang AuthorDate: Thu Nov 30 11:28:21 2023 +0800 Add async methods to Greeter implementations (#1026) --- .../dubbo/sample/tri/manual/ManualGreeterImpl.java | 32 .../sample/tri/metadata/MetadataGreeterImpl.java | 34 +- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/manual/ManualGreeterImpl.java b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/manual/ManualGreeterImpl.java index d55dcd1ed..a92ef7daf 100644 --- a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/manual/ManualGreeterImpl.java +++ b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/manual/ManualGreeterImpl.java @@ -23,6 +23,8 @@ import org.apache.dubbo.sample.tri.GreeterReply; import org.apache.dubbo.sample.tri.GreeterRequest; import org.apache.dubbo.sample.tri.stub.GreeterImpl; +import java.util.concurrent.CompletableFuture; + public class ManualGreeterImpl implements Greeter { private final Greeter delegate; @@ -35,31 +37,61 @@ public class ManualGreeterImpl implements Greeter { return delegate.greet(request); } +@Override +public CompletableFuture greetAsync(GreeterRequest request) { +return delegate.greetAsync(request); +} + @Override public GreeterReply upperCaseGreet(GreeterRequest request) { return delegate.upperCaseGreet(request); } +@Override +public CompletableFuture upperCaseGreetAsync(GreeterRequest request) { +return delegate.upperCaseGreetAsync(request); +} + @Override public GreeterReply greetWithAttachment(GreeterRequest request) { return delegate.greetWithAttachment(request); } +@Override +public CompletableFuture greetWithAttachmentAsync(GreeterRequest request) { +return delegate.greetWithAttachmentAsync(request); +} + @Override public GreeterReply greetReturnBigAttachment(GreeterRequest request) { return delegate.greetReturnBigAttachment(request); } +@Override +public CompletableFuture greetReturnBigAttachmentAsync(GreeterRequest request) { +return delegate.greetReturnBigAttachmentAsync(request); +} + @Override public GreeterReply greetException(GreeterRequest request) { return delegate.greetException(request); } +@Override +public CompletableFuture greetExceptionAsync(GreeterRequest request) { +return delegate.greetExceptionAsync(request); +} + @Override public GreeterReply queryCancelResult(GreeterRequest request) { return delegate.queryCancelResult(request); } +@Override +public CompletableFuture queryCancelResultAsync(GreeterRequest request) { +return delegate.queryCancelResultAsync(request); +} + @Override public void greetServerStream(GreeterRequest request, StreamObserver responseObserver) { delegate.greetServerStream(request, responseObserver); diff --git a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/metadata/MetadataGreeterImpl.java b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/metadata/MetadataGreeterImpl.java index 164a3d3f6..1729421ea 100644 --- a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/metadata/MetadataGreeterImpl.java +++ b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/metadata/MetadataGreeterImpl.java @@ -23,6 +23,8 @@ import org.apache.dubbo.sample.tri.GreeterReply; import org.apache.dubbo.sample.tri.GreeterRequest; import org.apache.dubbo.sample.tri.stub.GreeterImpl; +import java.util.concurrent.CompletableFuture; + public class MetadataGreeterImpl implements Greeter { private final Greeter delegate; @@ -35,31 +37,61 @@ public class MetadataGreeterImpl implements Greeter { return delegate.greet(request); } +@Override +public CompletableFuture greetAsync(GreeterRequest request) { +return CompletableFuture.completedFuture(greet(request)); +} + @Override public GreeterReply upperCaseGreet(GreeterRequest request) { return delegate.upperCaseGreet(request); } +@Override +public CompletableFuture upperCaseGreetAsync(GreeterRequest request) { +return CompletableFuture.completedFuture
(dubbo-samples) branch master updated (cc07b7e9b -> 2bb29dd7c)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from cc07b7e9b fix triple grpc interop (#1023) add 2bb29dd7c feat(logging): #13378 Uniformly uses log4j2 as the logging component (#1024) No new revisions were added by this update. Summary of changes: .editorconfig | 46 +++ 1-basic/dubbo-samples-api/pom.xml | 8 +- .../src/main/resources/log4j.properties| 25 -- .../src/main/resources/log4j2.xml | 31 1-basic/dubbo-samples-idl/pom.xml | 16 +++- .../src/main/resources/log4j.properties| 30 --- .../src/main/resources/log4j2.xml | 34 .../dubbo-samples-spring-boot-consumer/pom.xml | 5 ++ .../dubbo-samples-spring-boot-provider/pom.xml | 4 + 1-basic/dubbo-samples-spring-boot/pom.xml | 23 +- .../dubbo-samples-develop-api/pom.xml | 2 +- .../dubbo-samples-develop-consumer/pom.xml | 11 +++ .../dubbo-samples-develop-provider/pom.xml | 11 +++ .../dubbo-samples-extensibility-filter-api/pom.xml | 1 + .../pom.xml| 11 +++ .../pom.xml| 11 +++ .../pom.xml| 1 + .../pom.xml| 11 +++ .../pom.xml| 11 +++ .../dubbo-samples-extensibility-router-api/pom.xml | 1 + .../pom.xml| 11 +++ .../pom.xml| 11 +++ .../dubbo-samples-metrics-demo-comment-api/pom.xml | 1 + .../dubbo-samples-metrics-demo-comment-v1/pom.xml | 11 +++ .../dubbo-samples-metrics-demo-comment-v2/pom.xml | 11 +++ .../dubbo-samples-metrics-demo-detail-api/pom.xml | 1 + .../dubbo-samples-metrics-demo-detail-v1/pom.xml | 11 +++ .../dubbo-samples-metrics-demo-detail-v2/pom.xml | 11 +++ .../pom.xml| 1 + .../dubbo-samples-metrics-demo-frontend/pom.xml| 11 +++ .../dubbo-samples-metrics-demo-order-api/pom.xml | 1 + .../dubbo-samples-metrics-demo-order-v1/pom.xml| 11 +++ .../dubbo-samples-metrics-demo-order-v2/pom.xml| 11 +++ .../dubbo-samples-metrics-demo-user-api/pom.xml| 1 + .../dubbo-samples-metrics-demo-user/pom.xml| 11 +++ .../dubbo-samples-rpc-advanced-api-a/pom.xml | 1 + .../dubbo-samples-rpc-advanced-api-b/pom.xml | 1 + .../dubbo-samples-rpc-advanced-api-c/pom.xml | 1 + .../dubbo-samples-rpc-advanced-api-d/pom.xml | 1 + .../dubbo-samples-rpc-advanced-app-a/pom.xml | 11 +++ .../dubbo-samples-rpc-advanced-app-b-v1/pom.xml| 11 +++ .../dubbo-samples-rpc-advanced-app-b-v2/pom.xml| 11 +++ .../dubbo-samples-rpc-advanced-app-c/pom.xml | 11 +++ .../dubbo-samples-rpc-advanced-app-d/pom.xml | 11 +++ .../dubbo-samples-rpc-basic-api/pom.xml| 1 + .../dubbo-samples-rpc-basic-consumer/pom.xml | 11 +++ .../dubbo-samples-rpc-basic-provider/pom.xml | 11 +++ .../dubbo-samples-shop-comment-api/pom.xml | 1 + .../dubbo-samples-shop-comment-gray/pom.xml| 11 +++ .../dubbo-samples-shop-comment-v1/pom.xml | 11 +++ .../dubbo-samples-shop-comment-v2/pom.xml | 11 +++ .../dubbo-samples-shop-detail-api/pom.xml | 1 + .../dubbo-samples-shop-detail-gray/pom.xml | 11 +++ .../dubbo-samples-shop-detail-v1/pom.xml | 11 +++ .../dubbo-samples-shop-detail-v2/pom.xml | 11 +++ .../dubbo-samples-shop-frontend-api/pom.xml| 1 + .../dubbo-samples-shop-frontend/pom.xml| 11 +++ .../dubbo-samples-shop-order-api/pom.xml | 1 + .../dubbo-samples-shop-order-gray/pom.xml | 11 +++ .../dubbo-samples-shop-order-v1/pom.xml| 11 +++ .../dubbo-samples-shop-order-v2/pom.xml| 11 +++ .../dubbo-samples-shop-user-api/pom.xml| 1 + .../dubbo-samples-shop-user-gray/pom.xml | 11 +++ .../dubbo-samples-shop-user/pom.xml| 11 +++ 2-advanced/dubbo-samples-annotation/pom.xml| 16 +++- .../src/main/resources/log4j.properties| 25 -- .../src/main/resources/log4j2.xml} | 31 2-advanced/dubbo-samples-api-with-registry/pom.xml | 16 +++- .../src/main/resources/log4j.properties| 25 -- .../src/main/resources/log4j2.xml} | 31 .../pom.xml| 14 ++-- .../pom.xml| 91 -- .../pom.xml| 30 +++ .../pom.xml| 5 ++ .../pom.xml| 4
(dubbo-samples) branch master updated: Enhance test cases (#1019)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 87ffc190d Enhance test cases (#1019) 87ffc190d is described below commit 87ffc190d5b527b779da68f1db3b4d6fc53d043c Author: Albumen Kevin AuthorDate: Mon Nov 20 20:38:28 2023 +0800 Enhance test cases (#1019) * Enhance test cases * fix script --- .../src/main/java/org/apache/dubbo/samples/App1.java | 4 .../src/main/java/org/apache/dubbo/samples/App2.java | 4 .../src/main/java/org/apache/dubbo/samples/App3.java | 4 .../src/main/java/org/apache/dubbo/samples/App4.java | 4 .../src/main/java/org/apache/dubbo/samples/App5.java | 4 .../src/main/java/org/apache/dubbo/samples/App6.java | 4 .../src/main/java/org/apache/dubbo/samples/App1.java | 4 .../src/main/java/org/apache/dubbo/samples/App2.java | 4 .../src/main/java/org/apache/dubbo/samples/App3.java | 4 .../src/main/java/org/apache/dubbo/samples/App4.java | 4 .../src/main/java/org/apache/dubbo/samples/App5.java | 4 .../src/main/java/org/apache/dubbo/samples/App6.java | 4 .../src/main/java/org/apache/dubbo/samples/App1.java | 4 .../src/main/java/org/apache/dubbo/samples/App2.java | 4 .../src/main/java/org/apache/dubbo/samples/App3.java | 4 .../src/main/java/org/apache/dubbo/samples/App4.java | 4 .../src/main/java/org/apache/dubbo/samples/App5.java | 4 .../src/main/java/org/apache/dubbo/samples/App6.java | 4 .../src/main/java/org/apache/dubbo/samples/App1.java | 4 .../src/main/java/org/apache/dubbo/samples/App2.java | 4 .../src/main/java/org/apache/dubbo/samples/App3.java | 3 +++ .../src/main/java/org/apache/dubbo/samples/App4.java | 4 .../src/main/java/org/apache/dubbo/samples/App5.java | 4 .../src/main/java/org/apache/dubbo/samples/App6.java | 4 .../src/main/java/org/apache/dubbo/samples/App1.java | 3 +++ .../src/main/java/org/apache/dubbo/samples/App2.java | 4 .../src/main/java/org/apache/dubbo/samples/App3.java | 4 .../src/main/java/org/apache/dubbo/samples/App4.java | 4 .../src/main/java/org/apache/dubbo/samples/App5.java | 4 .../src/main/java/org/apache/dubbo/samples/App6.java | 4 .../src/main/java/org/apache/dubbo/samples/App1.java | 4 .../src/main/java/org/apache/dubbo/samples/App2.java | 4 .../src/main/java/org/apache/dubbo/samples/App3.java | 4 .../src/main/java/org/apache/dubbo/samples/App4.java | 4 .../src/main/java/org/apache/dubbo/samples/App5.java | 4 .../src/main/java/org/apache/dubbo/samples/App6.java | 4 36 files changed, 142 insertions(+) diff --git a/99-integration/dubbo-samples-registry-test-curator-instance/src/main/java/org/apache/dubbo/samples/App1.java b/99-integration/dubbo-samples-registry-test-curator-instance/src/main/java/org/apache/dubbo/samples/App1.java index 713aeb25e..060bd282d 100644 --- a/99-integration/dubbo-samples-registry-test-curator-instance/src/main/java/org/apache/dubbo/samples/App1.java +++ b/99-integration/dubbo-samples-registry-test-curator-instance/src/main/java/org/apache/dubbo/samples/App1.java @@ -49,21 +49,25 @@ public class App1 { ServiceConfig serviceConfig1 = new ServiceConfig<>(); serviceConfig1.setInterface(DemoService1.class); serviceConfig1.setRef(new DemoService1Impl("App1")); +serviceConfig1.setWarmup(0); ServiceConfig serviceConfig2 = new ServiceConfig<>(); serviceConfig2.setInterface(DemoService2.class); serviceConfig2.setRef(new DemoService2Impl("App1")); serviceConfig2.setDelay(-1); +serviceConfig2.setWarmup(0); ServiceConfig serviceConfig3 = new ServiceConfig<>(); serviceConfig3.setInterface(DemoService3.class); serviceConfig3.setRef(new DemoService3Impl("App1")); serviceConfig3.setDelay(-1); +serviceConfig3.setWarmup(0); ServiceConfig serviceConfig = new ServiceConfig<>(); serviceConfig.setInterface(ControlService.class); serviceConfig.setRef(new ControlServiceImpl()); serviceConfig.
(dubbo-samples) branch master updated: Add test cases to verify apache/dubbo#13360 (#1018)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 5e684c666 Add test cases to verify apache/dubbo#13360 (#1018) 5e684c666 is described below commit 5e684c666fb6b092271ea38f861f741ca4d6205d Author: Albumen Kevin AuthorDate: Thu Nov 16 15:04:44 2023 +0800 Add test cases to verify apache/dubbo#13360 (#1018) * Add test cases to verify apache/dubbo#13360 * fix script * fix script --- .../dubbo-call-sc/case-versions.conf | 2 +- .../sc-call-dubbo/case-versions.conf | 2 +- .../case-configuration.yml | 43 +++ .../case-versions.conf | 7 +- .../dubbo-samples-test-13360-32x/pom.xml | 137 + .../apache/dubbo/samples/api/GreetingsService.java | 22 .../apache/dubbo/samples/provider/Application.java | 32 + .../samples/provider/GreetingsServiceImpl.java | 29 + .../src/main/resources/application.properties | 8 ++ .../dubbo/samples/client/GreetingServiceIT.java| 40 ++ .../case-configuration.yml | 43 +++ .../case-versions.conf | 7 +- .../dubbo-samples-test-13360-33x/pom.xml | 137 + .../apache/dubbo/samples/api/GreetingsService.java | 22 .../apache/dubbo/samples/provider/Application.java | 32 + .../samples/provider/GreetingsServiceImpl.java | 29 + .../src/main/resources/application.properties | 8 ++ .../dubbo/samples/client/GreetingServiceIT.java| 40 ++ 99-integration/pom.xml | 2 + 19 files changed, 632 insertions(+), 10 deletions(-) diff --git a/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/case-versions.conf b/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/case-versions.conf index 2d57f160e..c38d08828 100644 --- a/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/case-versions.conf +++ b/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # SpringBoot/SpringCloud app -dubbo.version=3.3.* +dubbo.version=[ >= 3.3.0 ] spring-boot.version=2.7.* java.version= [ >= 8] diff --git a/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf b/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf index 375204847..b8cf2f718 100644 --- a/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf +++ b/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # SpringBoot/SpringCloud app -dubbo.version=3.3.* +dubbo.version=[ >= 3.3.0 ] spring-boot.version=2.7.* java.version= [>= 8] diff --git a/99-integration/dubbo-samples-test-13360-32x/case-configuration.yml b/99-integration/dubbo-samples-test-13360-32x/case-configuration.yml new file mode 100644 index 0..404179f5f --- /dev/null +++ b/99-integration/dubbo-samples-test-13360-32x/case-configuration.yml @@ -0,0 +1,43 @@ +# 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. + +services: + zookeeper: +image: zookeeper:latest + + provider: +type: app +basedir: . +mainClass: org.apache.dubbo.samples.provider.Application +systemProps: + - zookeeper.address=zookeeper +waitPortsBeforeRun: + - zookeeper:2181 +checkLog: "Dubbo application started." +depends_on: + - zookeeper + + test: +type: test +basedir: . +tests: + - "**/*IT.class" +systemProps: + - zookeeper.address=zookeeper +waitPortsBeforeRun: + - zookeeper:2181 +depends_on: + - zookeeper diff --git a/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf b/99-integration/dubbo-samples-test-13360-32x/case-versions.conf similarity index 89% copy from 2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf copy to 99-integration/dubbo-sampl
(dubbo-samples) branch master updated: Add test cases to verify apache/dubbo#13224 (#1006)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 7774c9df Add test cases to verify apache/dubbo#13224 (#1006) 7774c9df is described below commit 7774c9df92d29fec75249ad4841172e85b0424bc Author: Albumen Kevin AuthorDate: Wed Nov 15 10:12:51 2023 +0800 Add test cases to verify apache/dubbo#13224 (#1006) --- .../case-configuration.yml | 23 +++ .../dubbo-samples-test-13224/case-versions.conf| 24 +++ 99-integration/dubbo-samples-test-13224/pom.xml| 108 + .../apache/dubbo/samples/api/GreetingsService.java | 22 +++ .../dubbo/samples/api/SerializationTypeWrap.java | 40 + .../apache/dubbo/samples/provider/Application.java | 53 +++ .../samples/provider/GreetingsServiceImpl.java | 30 .../samples/provider/SerializationSetWrapper.java | 172 + ...org.apache.dubbo.common.serialize.Serialization | 1 + .../src/main/resources/log4j.properties| 25 +++ .../src/main/resources/logback.xml | 30 .../dubbo/samples/client/GreetingServiceIT.java| 162 +++ ...org.apache.dubbo.common.serialize.Serialization | 1 + 99-integration/pom.xml | 1 + 14 files changed, 692 insertions(+) diff --git a/99-integration/dubbo-samples-test-13224/case-configuration.yml b/99-integration/dubbo-samples-test-13224/case-configuration.yml new file mode 100644 index ..a1389deb --- /dev/null +++ b/99-integration/dubbo-samples-test-13224/case-configuration.yml @@ -0,0 +1,23 @@ +# 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. + +from: app-external-zookeeper.yml + +props: + project_name: dubbo-samples-test-13224 + main_class: org.apache.dubbo.samples.provider.Application + dubbo_port: 50051 + check_log: "DubboBootstrap awaiting ..." diff --git a/99-integration/dubbo-samples-test-13224/case-versions.conf b/99-integration/dubbo-samples-test-13224/case-versions.conf new file mode 100644 index ..3f3f58a0 --- /dev/null +++ b/99-integration/dubbo-samples-test-13224/case-versions.conf @@ -0,0 +1,24 @@ +# +# +# 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. +# + + +# Supported component versions of the test case + +# Spring app +dubbo.version=3.* +java.version= [ >= 8 ] diff --git a/99-integration/dubbo-samples-test-13224/pom.xml b/99-integration/dubbo-samples-test-13224/pom.xml new file mode 100644 index ..18ea6748 --- /dev/null +++ b/99-integration/dubbo-samples-test-13224/pom.xml @@ -0,0 +1,108 @@ + + + +http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + +org.apache +apache +23 + + + +org.apache.dubbo +1.0-SNAPSHOT + +4.0.0 + +dubbo-samples-test-13224 +Dubbo Samples Test for 13078 +Dubbo Samples Test for 13078 + + +3.2.8-SNAPSHOT +5.9.2 +1.8 +1.8 +1.7.33 +4.2.0 + + + + +org.apache.dubbo +dubbo +${dubbo.version} + + +
(dubbo-samples) branch master updated: Add test cases to verify apache/dubbo#13078 (#1005)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new c467ae75 Add test cases to verify apache/dubbo#13078 (#1005) c467ae75 is described below commit c467ae75753bce9160a4b4f383338512552bc593 Author: Albumen Kevin AuthorDate: Wed Nov 15 10:12:08 2023 +0800 Add test cases to verify apache/dubbo#13078 (#1005) * Add test cases to verify apache/dubbo#13078 * update * update port * Fix log --- .github/workflows/dubbo-3_2.yml| 3 + .github/workflows/dubbo-3_3.yml| 3 + .../case-configuration.yml | 23 + .../dubbo-samples-test-13078/case-versions.conf| 24 + 99-integration/dubbo-samples-test-13078/pom.xml| 108 + .../apache/dubbo/samples/api/GreetingsService.java | 22 + .../apache/dubbo/samples/provider/Application.java | 44 + .../samples/provider/GreetingsServiceImpl.java | 27 ++ .../src/main/resources/log4j.properties| 25 + .../src/main/resources/logback.xml | 30 ++ .../dubbo/samples/client/GreetingServiceIT.java| 74 ++ .../dubbo/samples/client/WireProtocolWrapper.java | 79 +++ .../org.apache.dubbo.remoting.api.WireProtocol | 1 + 99-integration/pom.xml | 1 + 14 files changed, 464 insertions(+) diff --git a/.github/workflows/dubbo-3_2.yml b/.github/workflows/dubbo-3_2.yml index 8bbb59f3..6c91df24 100644 --- a/.github/workflows/dubbo-3_2.yml +++ b/.github/workflows/dubbo-3_2.yml @@ -51,6 +51,9 @@ jobs: - name: Build with Maven run: | ./mvnw $BUILD_OPTS + - name: Clean with Maven +run: | + ./mvnw --batch-mode --no-snapshot-updates --no-transfer-progress --settings ${{github.workspace}}/.mvn/settings.xml clean build-dubbo: runs-on: ubuntu-latest diff --git a/.github/workflows/dubbo-3_3.yml b/.github/workflows/dubbo-3_3.yml index c6daccd2..177b6181 100644 --- a/.github/workflows/dubbo-3_3.yml +++ b/.github/workflows/dubbo-3_3.yml @@ -51,6 +51,9 @@ jobs: - name: Build with Maven run: | ./mvnw $BUILD_OPTS + - name: Clean with Maven +run: | + ./mvnw --batch-mode --no-snapshot-updates --no-transfer-progress --settings ${{github.workspace}}/.mvn/settings.xml clean build-dubbo: runs-on: ubuntu-latest diff --git a/99-integration/dubbo-samples-test-13078/case-configuration.yml b/99-integration/dubbo-samples-test-13078/case-configuration.yml new file mode 100644 index ..a739955d --- /dev/null +++ b/99-integration/dubbo-samples-test-13078/case-configuration.yml @@ -0,0 +1,23 @@ +# 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. + +from: app-external-zookeeper.yml + +props: + project_name: dubbo-samples-test-13078 + main_class: org.apache.dubbo.samples.provider.Application + dubbo_port: 50051 + check_log: "DubboBootstrap awaiting ..." diff --git a/99-integration/dubbo-samples-test-13078/case-versions.conf b/99-integration/dubbo-samples-test-13078/case-versions.conf new file mode 100644 index ..5610cf33 --- /dev/null +++ b/99-integration/dubbo-samples-test-13078/case-versions.conf @@ -0,0 +1,24 @@ +# +# +# 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 f
(dubbo-samples) branch master updated: Enhance test cases (#1016)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new e88738a7 Enhance test cases (#1016) e88738a7 is described below commit e88738a76115adf04027081c9349d8519116b91f Author: Albumen Kevin AuthorDate: Tue Nov 14 21:06:57 2023 +0800 Enhance test cases (#1016) --- .../case-configuration.yml | 14 +++--- .../pom.xml | 2 +- .../org/apache/dubbo/migration/api/GreeterService.java | 0 .../java/org/apache/dubbo/migration/api/HelloReply.java | 0 .../org/apache/dubbo/migration/api/HelloRequest.java| 0 .../pom.xml | 4 ++-- .../src/main/resources/log4j.properties | 0 .../apache/dubbo/migration/consumer/ApiConsumerIT.java | 2 +- .../pom.xml | 4 ++-- .../org/apache/dubbo/migration/EmbeddedZooKeeper.java | 0 .../org/apache/dubbo/migration/GreeterServiceImpl.java | 0 .../apache/dubbo/migration/provider/ApiProvider.java| 2 +- .../src/main/resources/log4j.properties | 0 .../dubbo-samples-migration-case-application/pom.xml| 12 ++-- .../case-configuration.yml | 14 +++--- .../dubbo-samples-migration-case-default-api}/pom.xml | 2 +- .../org/apache/dubbo/migration/api/GreeterService.java | 0 .../java/org/apache/dubbo/migration/api/HelloReply.java | 0 .../org/apache/dubbo/migration/api/HelloRequest.java| 0 .../pom.xml | 4 ++-- .../src/main/resources/log4j.properties | 0 .../apache/dubbo/migration/consumer/ApiConsumerIT.java | 2 +- .../pom.xml | 4 ++-- .../org/apache/dubbo/migration/EmbeddedZooKeeper.java | 0 .../org/apache/dubbo/migration/GreeterServiceImpl.java | 0 .../apache/dubbo/migration/provider/ApiProvider.java| 2 +- .../src/main/resources/log4j.properties | 0 .../dubbo-samples-migration-case-default/pom.xml| 12 ++-- 2-advanced/dubbo-samples-migration/pom.xml | 9 - test/run-tests.sh | 17 + 30 files changed, 61 insertions(+), 45 deletions(-) diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-configuration.yml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-configuration.yml index 10450471..8edbdeaa 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-configuration.yml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-configuration.yml @@ -15,16 +15,16 @@ # limitations under the License. props: - app_provider: dubbo-samples-migration-provider + app_provider: dubbo-samples-migration-case-application-provider app_provider_main_class: org.apache.dubbo.migration.provider.ApiProvider - app_consumer: dubbo-samples-migration-consumer + app_consumer: dubbo-samples-migration-case-application-consumer zookeeper_port: 2181 dubbo_port: 50051 - + services: ${app_provider}: type: app -basedir: ../${app_provider} +basedir: ${app_provider} mainClass: ${app_provider_main_class} systemProps: - dubbo.current.protocol=tri @@ -34,10 +34,10 @@ services: - ${zookeeper_port} - ${dubbo_port} checkLog: "dubbo service started" - + ${app_consumer}-test: type: test -basedir: ../${app_consumer} +basedir: ${app_consumer} tests: - "**/*IT.class" systemProps: @@ -48,4 +48,4 @@ services: - ${app_provider}:${zookeeper_port} - ${app_provider}:${dubbo_port} depends_on: - - ${app_provider} \ No newline at end of file + - ${app_provider} diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/pom.xml b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/pom.xml similarity index 95% copy from 2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/pom.xml copy to 2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/pom.xml index 5c6f223c..8c00528e 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/pom.xml +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.apache.dubbo -dubbo-samples-migration-api +dubbo-samples-migration-case-application-api 1.0-SNAPSHOT diff --git a/2-ad
(dubbo-samples) branch master updated: chore: update dubbo version to 3.3.0-beta.1 in tracing demo (#1009)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 11f340fb chore: update dubbo version to 3.3.0-beta.1 in tracing demo (#1009) 11f340fb is described below commit 11f340fbd66b793e21fb3c75e862192f6f253308 Author: conghuhu <56248584+congh...@users.noreply.github.com> AuthorDate: Mon Nov 6 02:38:10 2023 -0600 chore: update dubbo version to 3.3.0-beta.1 in tracing demo (#1009) --- .../dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/pom.xml | 2 +- .../dubbo-samples-spring-boot-tracing-otel-otlp/consumer/pom.xml | 2 +- .../dubbo-samples-spring-boot-tracing-otel-otlp/provider/pom.xml | 2 +- .../dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml | 2 +- .../dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml | 2 +- 4-governance/dubbo-samples-tracing/pom.xml | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/pom.xml b/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/pom.xml index 8ea6a33f..d26612c8 100644 --- a/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/pom.xml +++ b/4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/pom.xml @@ -1,3 +1,4 @@ + diff --git a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml index ce2eeaae..0d54b604 100644 --- a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml +++ b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml @@ -59,7 +59,7 @@ org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter diff --git a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml index db31e6f0..c7524206 100644 --- a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml +++ b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml @@ -60,7 +60,7 @@ org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter diff --git a/4-governance/dubbo-samples-tracing/pom.xml b/4-governance/dubbo-samples-tracing/pom.xml index 7a5a5767..6669313b 100644 --- a/4-governance/dubbo-samples-tracing/pom.xml +++ b/4-governance/dubbo-samples-tracing/pom.xml @@ -36,6 +36,7 @@ Dubbo Samples Tracing +dubbo-sample-api-tracing-otel-zipkin dubbo-samples-spring-boot-tracing-zipkin dubbo-samples-spring-boot-tracing-otel-otlp @@ -45,7 +46,7 @@ 1.8 UTF-8 -3.2.6 +3.3.0-beta.1 2.7.8 1.10.6 1.0.5 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: Fix logback-classic conflict in dubbo-samples-attachment (#1013)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new acf36cff Fix logback-classic conflict in dubbo-samples-attachment (#1013) acf36cff is described below commit acf36cff214492ce7eeb82b95eb6e170f2d0e449 Author: Sean Yang AuthorDate: Sat Nov 4 20:34:13 2023 +0800 Fix logback-classic conflict in dubbo-samples-attachment (#1013) --- 2-advanced/dubbo-samples-attachment/pom.xml | 12 1 file changed, 12 insertions(+) diff --git a/2-advanced/dubbo-samples-attachment/pom.xml b/2-advanced/dubbo-samples-attachment/pom.xml index 39b0607d..e62d9483 100644 --- a/2-advanced/dubbo-samples-attachment/pom.xml +++ b/2-advanced/dubbo-samples-attachment/pom.xml @@ -87,6 +87,18 @@ + +org.springframework.boot +spring-boot-starter-logging +${spring-boot.version} + + +logback-classic +ch.qos.logback + + + + junit junit - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: Fix dubbo version
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 7ef00447 Fix dubbo version 7ef00447 is described below commit 7ef00447d9a884d9e15dcee2b7f96ae153e31093 Author: Albumen Kevin AuthorDate: Wed Nov 1 20:23:23 2023 +0800 Fix dubbo version --- 2-advanced/dubbo-samples-spring-xml/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2-advanced/dubbo-samples-spring-xml/pom.xml b/2-advanced/dubbo-samples-spring-xml/pom.xml index cdf05700..d8c69bdc 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-SNAPSHOT +3.3.0-beta.1 5.3.25 1.7.33 4.13.1 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated: Bump org.apache.zookeeper:zookeeper (#1012)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 6b4f4d6d Bump org.apache.zookeeper:zookeeper (#1012) 6b4f4d6d is described below commit 6b4f4d6d13ac175f2e964fe4823abd12d80ef4cf Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Nov 1 20:21:48 2023 +0800 Bump org.apache.zookeeper:zookeeper (#1012) Bumps org.apache.zookeeper:zookeeper from 3.8.1 to 3.8.3. --- updated-dependencies: - dependency-name: org.apache.zookeeper:zookeeper dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 4-governance/dubbo-samples-spring-boot-hystrix/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml b/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml index bec18392..59b70868 100644 --- a/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml +++ b/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml @@ -38,7 +38,7 @@ 2.2.10.RELEASE 3.29.2-GA 32.0.0-jre -3.8.1 +3.8.3 4.13.1 3.7.0 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated (13fb5b6d -> adc074b6)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 13fb5b6d Exclude unnecessary transitive dependencies for zookeeper & refine pom (#1010) add adc074b6 Bump org.apache.zookeeper:zookeeper (#1011) No new revisions were added by this update. Summary of changes: 4-governance/dubbo-samples-spring-hystrix/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
(dubbo-samples) branch master updated (f505fd66 -> 13fb5b6d)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from f505fd66 Update sample for 3.3.0 beta.1 (#1008) add 13fb5b6d Exclude unnecessary transitive dependencies for zookeeper & refine pom (#1010) No new revisions were added by this update. Summary of changes: .github/workflows/dubbo-3_2.yml| 1 + .github/workflows/dubbo-3_3.yml| 1 + 1-basic/dubbo-samples-api/pom.xml | 13 +- 1-basic/dubbo-samples-idl/pom.xml | 72 ++-- .../samples/tri/unary/util/EmbeddedZooKeeper.java | 2 + .../dubbo-samples-spring-boot-consumer/pom.xml | 11 +- .../dubbo-samples-spring-boot-interface/pom.xml| 1 - .../dubbo-samples-spring-boot-provider/pom.xml | 10 - 1-basic/dubbo-samples-spring-boot/pom.xml | 43 +- .../dubbo-samples-develop-api/pom.xml | 2 +- .../dubbo-samples-develop-consumer/pom.xml | 10 +- .../dubbo-samples-develop-provider/pom.xml | 10 +- .../dubbo-samples-extensibility-filter-api/pom.xml | 1 - .../pom.xml| 10 +- .../pom.xml| 9 +- .../pom.xml| 2 - .../pom.xml| 5 +- .../pom.xml| 10 +- .../pom.xml| 10 +- .../dubbo-samples-extensibility-router-api/pom.xml | 2 - .../pom.xml| 10 +- .../pom.xml| 9 +- .../dubbo-samples-metrics-demo-comment-v1/pom.xml | 11 +- .../dubbo-samples-metrics-demo-comment-v2/pom.xml | 11 +- .../dubbo-samples-metrics-demo-detail-v1/pom.xml | 11 +- .../dubbo-samples-metrics-demo-detail-v2/pom.xml | 11 +- .../dubbo-samples-metrics-demo-frontend/pom.xml| 11 +- .../dubbo-samples-metrics-demo-order-api/pom.xml | 1 - .../dubbo-samples-metrics-demo-order-v1/pom.xml| 11 +- .../dubbo-samples-metrics-demo-order-v2/pom.xml| 11 +- .../dubbo-samples-metrics-demo-user-api/pom.xml| 1 - .../dubbo-samples-metrics-demo-user/pom.xml| 11 +- .../dubbo-samples-rpc-advanced-app-a/pom.xml | 10 +- .../dubbo-samples-rpc-advanced-app-b-v1/pom.xml| 10 +- .../dubbo-samples-rpc-advanced-app-b-v2/pom.xml| 10 +- .../dubbo-samples-rpc-advanced-app-c/pom.xml | 10 +- .../dubbo-samples-rpc-advanced-app-d/pom.xml | 10 +- .../dubbo-samples-rpc-basic-consumer/pom.xml | 10 +- .../dubbo-samples-rpc-basic-provider/pom.xml | 10 +- .../dubbo-samples-shop-comment-gray/pom.xml| 10 +- .../dubbo-samples-shop-comment-v1/pom.xml | 10 +- .../dubbo-samples-shop-comment-v2/pom.xml | 10 +- .../dubbo-samples-shop-detail-gray/pom.xml | 10 +- .../dubbo-samples-shop-detail-v1/pom.xml | 10 +- .../dubbo-samples-shop-detail-v2/pom.xml | 10 +- .../dubbo-samples-shop-frontend/pom.xml| 10 +- .../dubbo-samples-shop-order-gray/pom.xml | 10 +- .../dubbo-samples-shop-order-v1/pom.xml| 10 +- .../dubbo-samples-shop-order-v2/pom.xml| 10 +- .../dubbo-samples-shop-user-gray/pom.xml | 10 +- .../dubbo-samples-shop-user/pom.xml| 10 +- 2-advanced/dubbo-samples-annotation/pom.xml| 95 ++--- .../samples/annotation/EmbeddedZooKeeper.java | 2 + 2-advanced/dubbo-samples-api-with-registry/pom.xml | 23 +- .../pom.xml| 11 +- .../pom.xml| 3 - .../pom.xml| 11 - .../pom.xml| 12 +- .../pom.xml| 1 - .../pom.xml| 10 +- .../pom.xml| 9 +- .../pom.xml| 16 +- .../dubbo-samples-async-generated-future/pom.xml | 67 ++- .../dubbo/samples/async/EmbeddedZooKeeper.java | 2 + .../dubbo-samples-async-onerror/pom.xml| 90 ++-- .../samples/governance/EmbeddedZooKeeper.java | 2 + .../dubbo-samples-async-original-future/pom.xml| 69 ++-- .../dubbo/samples/async/EmbeddedZooKeeper.java | 2 + .../dubbo-samples-async-provider/pom.xml | 70 ++-- .../dubbo/samples/async/EmbeddedZooKeeper.java | 2 + .../pom.xml| 35 +- .../pom.xml| 12 +- .../pom.xml| 43 +- .../async/boot/provider/EmbeddedZooKeeper.java | 2 + .../dubbo-samples-async-simple-boot/pom.xml| 16 +- .../dubbo-samples-a
(dubbo-samples) branch refactor/kubernetes updated: [OSPP] Unified test platform based on Kubernetes (#991)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch refactor/kubernetes in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/refactor/kubernetes by this push: new 58ddd6c2 [OSPP] Unified test platform based on Kubernetes (#991) 58ddd6c2 is described below commit 58ddd6c23a9d6c82bed851ba782b4f6ff162005a Author: Phix AuthorDate: Tue Oct 31 11:16:00 2023 +0800 [OSPP] Unified test platform based on Kubernetes (#991) --- .github/workflows/dubbo-3_2.yml| 10 + .github/workflows/dubbo-3_3.yml| 10 + .github/workflows/nightly-dubbo-3.yml | 2 + .gitignore | 1 - .../case-configuration.yml | 4 + .../case-configuration.yml | 4 + .../case-configuration.yml | 4 + .../case-configuration.yml | 6 + .../case-configuration.yml | 4 + .../case-configuration.yml | 4 + .../dubbo-samples-autowire/case-configuration.yml | 5 + .../dubbo-samples-cache/case-configuration.yml | 3 + .../dubbo-samples-callback/case-configuration.yml | 5 + .../dubbo-samples-chain/case-configuration.yml | 6 + .../dubbo-call-scdubbo}/case-configuration.yml | 51 +++-- .../dubbo-samples-echo/case-configuration.yml | 3 + .../dubbo-samples-merge/case-configuration.yml | 5 + .../case-configuration.yml | 5 +- .../case-configuration.yml | 5 +- .../dubbo-samples-notify/case-configuration.yml| 4 + .../case-configuration.yml | 6 + .../dubbo-samples-seata/case-configuration.yml | 29 ++- .../case-configuration.yml | 6 + .../case-configuration.yml | 6 + .../case-configuration.yml | 6 + .../case-configuration.yml | 3 + .../dubbo-call-sc/case-configuration.yml | 4 + .../sc-call-dubbo/case-configuration.yml | 6 + .../dubbo-samples-stub/case-configuration.yml | 4 + .../dubbo-samples-tengine/case-configuration.yml | 4 + .../dubbo-samples-version/case-configuration.yml | 6 + .../case-configuration.yml | 40 +++- .../case-configuration.yml | 8 + .../dubbo-samples-http/case-configuration.yml | 6 + .../case-configuration.yml | 3 + .../dubbo-samples-triple/case-configuration.yml| 4 + .../dubbo-samples-consul/case-configuration.yml| 4 + .../case-configuration.yml | 5 + .../case-configuration.yml | 6 + .../case-configuration.yml | 6 + .../case-configuration.yml | 4 + .../case-configuration.yml | 4 + .../case-configuration.yml | 4 + .../case-configuration.yml | 4 + .../case-configuration.yml | 6 + .../dubbo-samples-zookeeper/case-configuration.yml | 4 + .../case-configuration.yml | 6 + .../case-configuration.yml | 6 + .../case-configuration.yml | 6 + .../case-configuration.yml | 4 + .../case-configuration.yml | 6 + .../dubbo-samples-monitor/case-configuration.yml | 6 + .../dubbo-samples-sentinel/case-configuration.yml | 4 + .../dubbo-samples-ssl/case-configuration.yml | 5 +- .../dubbo-samples-tagrouter/case-configuration.yml | 6 + .../dubbo-samples-zipkin/case-configuration.yml| 9 +- .../case-configuration.yml | 21 +- .../dubbo-samples-hibernate/case-configuration.yml | 4 + .../case-configuration.yml | 2 + .../case-configuration.yml | 4 + .../case-configuration.yml | 4 + .../case-configuration.yml | 4 + .../dubbo-samples-mybatis/case-configuration.yml | 4 + .../case-configuration.yml | 6 + .../case-configuration.yml | 7 +- .../case-configuration.yml | 4 + .../case-configuration.yml | 4 + .../case-configuration.yml | 2 + .../case-configuration.yml | 2 + .../case-configuration.yml | 2 + .../case-configuration.yml | 22 +- .../case-configuration.yml | 21 +- .../case-configuration.yml | 25 ++- .../case-configuration.yml
(dubbo-samples) branch refactor/kubernetes created (now f505fd66)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch refactor/kubernetes in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git at f505fd66 Update sample for 3.3.0 beta.1 (#1008) No new revisions were added by this update. - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Provide different QoS addresses for consumers and producers to prevent errors when starting both on the same machine.(#1003) (#1004)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 43896488 Provide different QoS addresses for consumers and producers to prevent errors when starting both on the same machine.(#1003) (#1004) 43896488 is described below commit 4389648847212b1a1cecc4d096dd65e9e1a97c99 Author: stellar <137587347+stellar1...@users.noreply.github.com> AuthorDate: Tue Oct 17 16:27:27 2023 +0800 Provide different QoS addresses for consumers and producers to prevent errors when starting both on the same machine.(#1003) (#1004) --- .../java/org/apache/dubbo/samples/client/AlwaysApplication.java | 6 +- .../src/main/java/org/apache/dubbo/samples/client/Application.java | 6 +- .../main/java/org/apache/dubbo/samples/provider/Application.java| 6 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/AlwaysApplication.java b/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/AlwaysApplication.java index 36d5b836..b54e3754 100644 --- a/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/AlwaysApplication.java +++ b/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/AlwaysApplication.java @@ -20,6 +20,7 @@ package org.apache.dubbo.samples.client; import java.io.IOException; import java.util.Date; +import org.apache.dubbo.config.ApplicationConfig; import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; @@ -31,11 +32,14 @@ public class AlwaysApplication { private static final String ZOOKEEPER_ADDRESS = "zookeeper://" + ZOOKEEPER_HOST + ":" + ZOOKEEPER_PORT; public static void main(String[] args) throws IOException { +ApplicationConfig applicationConfig = new ApplicationConfig("first-dubbo-consumer"); +applicationConfig.setQosPort(2); + ReferenceConfig reference = new ReferenceConfig<>(); reference.setInterface(GreetingsService.class); DubboBootstrap.getInstance() -.application("first-dubbo-consumer") +.application(applicationConfig) .registry(new RegistryConfig(ZOOKEEPER_ADDRESS)) .reference(reference) .start(); diff --git a/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java b/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java index 2e2d44df..73e551f5 100644 --- a/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java +++ b/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/client/Application.java @@ -19,6 +19,7 @@ package org.apache.dubbo.samples.client; import java.io.IOException; +import org.apache.dubbo.config.ApplicationConfig; import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; @@ -30,11 +31,14 @@ public class Application { private static final String ZOOKEEPER_ADDRESS = "zookeeper://" + ZOOKEEPER_HOST + ":" + ZOOKEEPER_PORT; public static void main(String[] args) throws IOException { +ApplicationConfig applicationConfig = new ApplicationConfig("first-dubbo-consumer"); +applicationConfig.setQosPort(2); + ReferenceConfig reference = new ReferenceConfig<>(); reference.setInterface(GreetingsService.class); DubboBootstrap.getInstance() -.application("first-dubbo-consumer") +.application(applicationConfig) .registry(new RegistryConfig(ZOOKEEPER_ADDRESS)) .reference(reference) .start(); diff --git a/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/Application.java b/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/Application.java index e9343fcd..7d0b3d0c 100644 --- a/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/Application.java +++ b/1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/Application.java @@ -17,6 +17,7 @@ package org.apache.dubbo.samples.provider; +import org.apache.dubbo.config.ApplicationConfig; import org.apache.dubbo.config.ProtocolConfig; import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.ServiceConfig; @@ -29,12 +30,15 @@ public class Application { private static final String ZOOKEEPER_ADDRESS = "zookeeper://" + ZOOKEEPER_HOST + ":" + ZOOKEEPER_PORT;
[dubbo-samples] branch master updated (c291cde5 -> c544d9cd)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from c291cde5 Bump org.apache.zookeeper:zookeeper (#1001) add c544d9cd Bump org.apache.zookeeper:zookeeper (#1002) No new revisions were added by this update. Summary of changes: .../dubbo-samples-resilience4j-filter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (84f7f055 -> c291cde5)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 84f7f055 Bump org.apache.zookeeper:zookeeper (#1000) add c291cde5 Bump org.apache.zookeeper:zookeeper (#1001) No new revisions were added by this update. Summary of changes: .../dubbo-samples-resilience4j-springboot2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (4387d2f2 -> 84f7f055)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 4387d2f2 Enable test on jdk 21 (#998) add 84f7f055 Bump org.apache.zookeeper:zookeeper (#1000) No new revisions were added by this update. Summary of changes: 3-extensions/protocol/dubbo-samples-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (74048d7d -> 4387d2f2)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 74048d7d Add test case to verify async (#997) add 4387d2f2 Enable test on jdk 21 (#998) No new revisions were added by this update. Summary of changes: .github/workflows/dubbo-3_3.yml| 5 ++- .../dubbo-samples-spring-boot/case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../dubbo-samples-async-onerror/case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../dubbo-samples-async-simple/case-versions.conf | 2 +- .../dubbo-samples-attachment/case-versions.conf| 2 +- .../dubbo-samples-autowire/case-versions.conf | 2 +- 2-advanced/dubbo-samples-cache/case-versions.conf | 2 +- .../dubbo-samples-callback/case-versions.conf | 2 +- 2-advanced/dubbo-samples-chain/case-versions.conf | 2 +- .../dubbo-samples-compatible/case-versions.conf| 2 +- .../dubbo-samples-context/case-versions.conf | 2 +- 2-advanced/dubbo-samples-direct/case-versions.conf | 2 +- 2-advanced/dubbo-samples-docker/case-versions.conf | 2 +- 2-advanced/dubbo-samples-echo/case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../dubbo-samples-generic-call/case-versions.conf | 2 +- .../dubbo-samples-generic-impl/case-versions.conf | 2 +- .../dubbo-samples-generic-type/case-versions.conf | 2 +- 2-advanced/dubbo-samples-group/case-versions.conf | 2 +- 2-advanced/dubbo-samples-local/case-versions.conf | 2 +- 2-advanced/dubbo-samples-local/pom.xml | 24 + .../apache/dubbo/samples/local/DemoServiceIT.java | 35 +-- 2-advanced/dubbo-samples-merge/case-versions.conf | 2 +- 2-advanced/dubbo-samples-mock/case-versions.conf | 2 +- 2-advanced/dubbo-samples-notify/case-versions.conf | 2 +- 2-advanced/dubbo-samples-scala/case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../servicediscovery-transfer/case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../dubbo-call-sc/case-versions.conf | 2 +- .../sc-call-dubbo/case-versions.conf | 2 +- 2-advanced/dubbo-samples-stub/case-versions.conf | 2 +- .../dubbo-samples-tengine/case-versions.conf | 2 +- .../dubbo-samples-validation/case-versions.conf| 2 +- .../dubbo-samples-version/case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../pom.xml| 7 .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../protocol/dubbo-samples-rest/case-versions.conf | 2 +- 3-extensions/protocol/dubbo-samples-rest/pom.xml | 7 .../dubbo-samples-thrift/case-versions.conf| 2 +- .../case-versions.conf | 2 +- .../dubbo-samples-triple/case-versions.conf| 2 +- .../dubbo/sample/tri/util/TriSampleConstants.java | 4 ++- .../dubbo-samples-webservice/case-versions.conf| 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../dubbo-samples-nacos-group/case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../dubbo-samples-zookeeper/case-versions.conf | 2 +- .../case-versions.conf | 2 +- .../dubbo-samples-protobuf-json/case-versions.conf | 4 +-- .../dubbo-samples-protobuf-json/pom.xml| 4 +-- .../protobuf-json-serialization-demo/pom.xml | 2 +- .../dubbo-samples-protobuf/case-versions.conf | 2 +- .../dubbo-samples-protostuff/case-versions.conf| 2 +- .../case-versions.conf
[dubbo-samples] branch master updated (c9fcfeb1 -> 74048d7d)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from c9fcfeb1 Bump org.apache.tomcat.embed:tomcat-embed-core (#996) add 74048d7d Add test case to verify async (#997) No new revisions were added by this update. Summary of changes: 99-integration/dubbo-samples-test-11782/pom.xml| 6 ++- .../dubbo/samples/client/ConsumerFilter.java | 46 -- .../apache/dubbo/samples/provider/Application.java | 4 +- .../samples/provider/GreetingsServiceImpl.java | 35 .../dubbo/samples/client/GreetingServiceIT.java| 4 +- 5 files changed, 46 insertions(+), 49 deletions(-) delete mode 100644 99-integration/dubbo-samples-test-11782/src/main/java/org/apache/dubbo/samples/client/ConsumerFilter.java - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (c9af41ad -> c9fcfeb1)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from c9af41ad Add test case to verify async (#995) add c9fcfeb1 Bump org.apache.tomcat.embed:tomcat-embed-core (#996) No new revisions were added by this update. Summary of changes: .../dubbo-samples-resilience4j-springboot2/pom.xml| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Add test case to verify async (#995)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new c9af41ad Add test case to verify async (#995) c9af41ad is described below commit c9af41ade1884a9f5de0a089a3a3cbedffba2c1c Author: Albumen Kevin AuthorDate: Wed Sep 27 09:48:11 2023 +0800 Add test case to verify async (#995) --- .../case-configuration.yml | 23 +++ .../case-versions.conf | 25 +++ .../dubbo-samples-test-abc-async/pom.xml | 186 + .../org/apache/dubbo/samples/test/Provider.java| 35 .../apache/dubbo/samples/test/api/DemoService.java | 28 .../dubbo/samples/test/api/DemoService2.java | 28 .../dubbo/samples/test/impl/DemoService2Impl.java | 39 + .../dubbo/samples/test/impl/DemoServiceImpl.java | 116 + .../src/main/resources/log4j.properties| 26 +++ .../src/main/resources/spring/provider.xml | 43 + .../org/apache/dubbo/samples/test/ConsumerIT.java | 58 +++ .../src/test/resources/spring/consumer.xml | 33 99-integration/pom.xml | 1 + 13 files changed, 641 insertions(+) diff --git a/99-integration/dubbo-samples-test-abc-async/case-configuration.yml b/99-integration/dubbo-samples-test-abc-async/case-configuration.yml new file mode 100644 index ..14ca2d98 --- /dev/null +++ b/99-integration/dubbo-samples-test-abc-async/case-configuration.yml @@ -0,0 +1,23 @@ +# 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. + +from: app-external-zookeeper.yml + +props: + project_name: dubbo-samples-test-abc-async + main_class: org.apache.dubbo.samples.test.Provider + dubbo_port: 20880 + check_log: "dubbo service started" diff --git a/99-integration/dubbo-samples-test-abc-async/case-versions.conf b/99-integration/dubbo-samples-test-abc-async/case-versions.conf new file mode 100644 index ..5ab45abb --- /dev/null +++ b/99-integration/dubbo-samples-test-abc-async/case-versions.conf @@ -0,0 +1,25 @@ +# +# +# 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. +# + + +# Supported component versions of the test case + +# Spring app +dubbo.version=2.7*, 3.* +spring.version=4.*, 5.*, 6.* +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-test-abc-async/pom.xml b/99-integration/dubbo-samples-test-abc-async/pom.xml new file mode 100644 index ..6b517a77 --- /dev/null +++ b/99-integration/dubbo-samples-test-abc-async/pom.xml @@ -0,0 +1,186 @@ + + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +4.0.0 + +org.apache +apache +23 + + + +org.apache.dubbo +dubbo-samples-test-abc-async +1.0-SNAPSHOT + +Dubbo Samples Test for abc-async +Dubbo Samples Test for abc-async + + +1.8 +1.8 +3.2.6 +5.3.25 +3.8.1 +4.13.1 + + + + + +org.springframework +spring-framework-bom +${spring.version} +pom +
[dubbo-samples] branch master updated (b9e8aeb4 -> c93a4b3b)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from b9e8aeb4 Support compile on jdk21 aarch (#992) add c93a4b3b Add test cases to verify apache/dubbo#13133 (#994) No new revisions were added by this update. Summary of changes: .../case-configuration.yml | 2 +- .../dubbo-samples-test-13133}/case-versions.conf | 4 ++-- .../pom.xml| 16 - .../org/apache/dubbo/samples/test/Provider.java| 17 ++ .../apache/dubbo/samples/test/api/DemoService.java | 0 .../dubbo/samples/test/impl/DemoServiceImpl.java | 0 .../src/main/resources/log4j.properties| 0 .../src/main/resources/spring/provider.xml | 7 +++--- .../org/apache/dubbo/samples/test/ConsumerIT.java | 27 +- .../src/test/resources/spring/consumer.xml}| 9 ++-- 99-integration/pom.xml | 1 + test/run-tests.sh | 4 ++-- 12 files changed, 54 insertions(+), 33 deletions(-) copy 99-integration/{dubbo-samples-test-12697 => dubbo-samples-test-13133}/case-configuration.yml (95%) copy {2-advanced/dubbo-samples-async/dubbo-samples-async-onerror => 99-integration/dubbo-samples-test-13133}/case-versions.conf (94%) copy 99-integration/{dubbo-samples-test-12697 => dubbo-samples-test-13133}/pom.xml (94%) copy 99-integration/{dubbo-samples-test-12697 => dubbo-samples-test-13133}/src/main/java/org/apache/dubbo/samples/test/Provider.java (60%) copy 99-integration/{dubbo-samples-test-12697 => dubbo-samples-test-13133}/src/main/java/org/apache/dubbo/samples/test/api/DemoService.java (100%) copy 99-integration/{dubbo-samples-test-12697 => dubbo-samples-test-13133}/src/main/java/org/apache/dubbo/samples/test/impl/DemoServiceImpl.java (100%) copy {1-basic/dubbo-samples-spring-xml => 99-integration/dubbo-samples-test-13133}/src/main/resources/log4j.properties (100%) copy 1-basic/dubbo-samples-spring-xml/src/main/resources/spring/dubbo-demo-provider.xml => 99-integration/dubbo-samples-test-13133/src/main/resources/spring/provider.xml (86%) copy 99-integration/{dubbo-samples-test-12697 => dubbo-samples-test-13133}/src/test/java/org/apache/dubbo/samples/test/ConsumerIT.java (72%) copy 99-integration/{dubbo-samples-switch-serialization-thread/src/main/resources/spring/serialization-switch-thread-consumer.xml => dubbo-samples-test-13133/src/test/resources/spring/consumer.xml} (81%) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (dc281a3e -> 4b98c856)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from dc281a3e Bump org.springframework:spring-framework-bom (#985) add 4b98c856 Fix scala netty dependencies No new revisions were added by this update. Summary of changes: 2-advanced/dubbo-samples-scala/pom.xml | 5 - 1 file changed, 5 deletions(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Bump org.springframework:spring-framework-bom (#985)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new dc281a3e Bump org.springframework:spring-framework-bom (#985) dc281a3e is described below commit dc281a3e072999db2ef024e66249288ae35b5367 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Aug 9 19:10:53 2023 +0800 Bump org.springframework:spring-framework-bom (#985) Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 4.3.29.RELEASE to 4.3.30.RELEASE. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v4.3.29.RELEASE...v4.3.30.RELEASE) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 99-integration/dubbo-samples-test-12697/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/99-integration/dubbo-samples-test-12697/pom.xml b/99-integration/dubbo-samples-test-12697/pom.xml index cc0a94e2..41ed6a07 100644 --- a/99-integration/dubbo-samples-test-12697/pom.xml +++ b/99-integration/dubbo-samples-test-12697/pom.xml @@ -37,7 +37,7 @@ 1.8 1.8 3.2.3 -4.3.29.RELEASE +4.3.30.RELEASE 3.8.1 4.13.1 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (c8a35b10 -> 7ccccb7c)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from c8a35b10 Update Spring framework version add 7b7c Add test cases to verify apache/dubbo#12697 (#876) No new revisions were added by this update. Summary of changes: .../case-configuration.yml | 5 ++- .../dubbo-samples-test-12697}/case-versions.conf | 0 .../pom.xml| 10 +++--- .../org/apache/dubbo/samples/test/Provider.java| 7 ++-- .../apache/dubbo/samples/test/ProviderBean.java} | 12 --- .../dubbo/samples/test/api}/DemoService.java | 4 +-- .../dubbo/samples/test}/impl/DemoServiceImpl.java | 6 ++-- .../src/main/resources/log4j.properties| 0 .../src/main/resources/spring/provider.xml}| 13 .../apache/dubbo/samples/test/ConsumerBean.java} | 12 --- .../org/apache/dubbo/samples/test/ConsumerIT.java | 37 ++ .../src/test/resources/spring/consumer.xml}| 13 ++-- 99-integration/pom.xml | 1 + 13 files changed, 72 insertions(+), 48 deletions(-) copy {1-basic/dubbo-samples-spring-xml => 99-integration/dubbo-samples-test-12697}/case-configuration.yml (89%) copy {2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future-springboot => 99-integration/dubbo-samples-test-12697}/case-versions.conf (100%) copy 99-integration/{dubbo-samples-switch-serialization-thread => dubbo-samples-test-12697}/pom.xml (95%) copy 3-extensions/protocol/dubbo-samples-http/src/main/java/org/apache/dubbo/samples/http/HttpProvider.java => 99-integration/dubbo-samples-test-12697/src/main/java/org/apache/dubbo/samples/test/Provider.java (91%) copy 99-integration/{dubbo-samples-test-9806/src/test/java/org/apache/dubbo/samples/test/DemoServiceImpl.java => dubbo-samples-test-12697/src/main/java/org/apache/dubbo/samples/test/ProviderBean.java} (78%) copy 99-integration/{dubbo-samples-test-11137/src/test/java/org/apache/dubbo/samples/test => dubbo-samples-test-12697/src/main/java/org/apache/dubbo/samples/test/api}/DemoService.java (95%) copy {4-governance/dubbo-samples-monitor/src/main/java/org/apache/dubbo/samples/monitor => 99-integration/dubbo-samples-test-12697/src/main/java/org/apache/dubbo/samples/test}/impl/DemoServiceImpl.java (92%) copy {1-basic/dubbo-samples-spring-xml => 99-integration/dubbo-samples-test-12697}/src/main/resources/log4j.properties (100%) copy 99-integration/{dubbo-samples-switch-serialization-thread/src/main/resources/spring/serialization-switch-thread-provider.xml => dubbo-samples-test-12697/src/main/resources/spring/provider.xml} (77%) copy 99-integration/{dubbo-samples-test-9806/src/test/java/org/apache/dubbo/samples/test/DemoServiceImpl.java => dubbo-samples-test-12697/src/test/java/org/apache/dubbo/samples/test/ConsumerBean.java} (78%) copy 2-advanced/dubbo-samples-mock/src/test/java/org/apache/dubbo/samples/mock/MockServicesIT.java => 99-integration/dubbo-samples-test-12697/src/test/java/org/apache/dubbo/samples/test/ConsumerIT.java (62%) copy 99-integration/{dubbo-samples-switch-serialization-thread/src/main/resources/spring/serialization-switch-thread-consumer.xml => dubbo-samples-test-12697/src/test/resources/spring/consumer.xml} (73%) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch dependabot/maven/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/org.springframework-spring-framework-bom-4.3.30.RELEASE deleted (was
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch dependabot/maven/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/org.springframework-spring-framework-bom-4.3.30.RELEASE in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git was 955b8dfd Bump org.springframework:spring-framework-bom This change permanently discards the following revisions: discard 955b8dfd Bump org.springframework:spring-framework-bom - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (25992b04 -> c8a35b10)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 25992b04 Bump org.springframework:spring-framework-bom (#980) add f628b0d2 Fix snapshot version add c8a35b10 Update Spring framework version No new revisions were added by this update. Summary of changes: 1-basic/dubbo-samples-annotation/pom.xml | 2 +- .../dubbo-samples-async-generated-future-springboot/pom.xml | 2 +- .../dubbo-samples-async/dubbo-samples-async-generated-future/pom.xml | 2 +- 2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/pom.xml| 2 +- .../dubbo-samples-async/dubbo-samples-async-original-future/pom.xml | 2 +- 2-advanced/dubbo-samples-async/dubbo-samples-async-provider/pom.xml | 2 +- 2-advanced/dubbo-samples-async/dubbo-samples-async-simple/pom.xml | 2 +- 2-advanced/dubbo-samples-chain/pom.xml| 2 +- 2-advanced/dubbo-samples-compatible/pom.xml | 2 +- 2-advanced/dubbo-samples-context/pom.xml | 2 +- 2-advanced/dubbo-samples-direct/pom.xml | 2 +- 2-advanced/dubbo-samples-environment-keys/pom.xml | 2 +- 2-advanced/dubbo-samples-generic/dubbo-samples-generic-call/pom.xml | 2 +- 2-advanced/dubbo-samples-generic/dubbo-samples-generic-impl/pom.xml | 2 +- 2-advanced/dubbo-samples-generic/dubbo-samples-generic-type/pom.xml | 2 +- 2-advanced/dubbo-samples-group/pom.xml| 2 +- 2-advanced/dubbo-samples-local/pom.xml| 2 +- 2-advanced/dubbo-samples-merge/pom.xml| 2 +- 2-advanced/dubbo-samples-mock/pom.xml | 2 +- 2-advanced/dubbo-samples-rpccontext/pom.xml | 2 +- 2-advanced/dubbo-samples-scala/pom.xml| 2 +- .../dubbo-demo-servicediscovery-xml/pom.xml | 2 +- .../dubbo-servicediscovery-migration/pom.xml | 2 +- 2-advanced/dubbo-samples-spi-compatible/pom.xml | 2 +- 2-advanced/dubbo-samples-spring-security/pom.xml | 2 +- 2-advanced/dubbo-samples-springcloud/dubbo-call-sc/pom.xml| 2 +- 2-advanced/dubbo-samples-springcloud/sc-call-dubbo/pom.xml| 2 +- 2-advanced/dubbo-samples-validation/pom.xml | 2 +- 2-advanced/dubbo-samples-version/pom.xml | 2 +- .../configcenter/dubbo-samples-configcenter-annotation/pom.xml| 2 +- 3-extensions/configcenter/dubbo-samples-configcenter-api/pom.xml | 2 +- 3-extensions/configcenter/dubbo-samples-configcenter-apollo/pom.xml | 2 +- .../configcenter/dubbo-samples-configcenter-multi-registries/pom.xml | 2 +- .../configcenter/dubbo-samples-configcenter-multiprotocol/pom.xml | 2 +- 3-extensions/configcenter/dubbo-samples-configcenter-xml/pom.xml | 2 +- 3-extensions/protocol/dubbo-samples-http/pom.xml | 2 +- 3-extensions/protocol/dubbo-samples-jetty/pom.xml | 2 +- .../dubbo-samples-resilience4j-filter/pom.xml | 2 +- 3-extensions/protocol/dubbo-samples-rest/pom.xml | 2 +- .../protocol/dubbo-samples-thrift/dubbo-samples-thrift-impl/pom.xml | 2 +- 3-extensions/protocol/dubbo-samples-triple/pom.xml| 2 +- 3-extensions/protocol/dubbo-samples-webservice/pom.xml| 2 +- 3-extensions/registry/dubbo-samples-consul/pom.xml| 2 +- 3-extensions/registry/dubbo-samples-default-config/pom.xml| 2 +- .../dubbo-samples-kubernetes/dubbo-samples-apiserver-consumer/pom.xml | 2 +- .../dubbo-samples-kubernetes/dubbo-samples-apiserver-provider/pom.xml | 2 +- .../dubbo-samples-kubernetes/dubbo-samples-kubernetes-dns/pom.xml | 2 +- .../dubbo-samples-mesh-k8s/dubbo-samples-mesh-consumer/pom.xml| 2 +- .../dubbo-samples-mesh-k8s/dubbo-samples-mesh-provider/pom.xml| 2 +- 3-extensions/registry/dubbo-samples-multi-registry/pom.xml| 2 +- .../dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/pom.xml | 2 +- .../dubbo-samples-nacos/dubbo-samples-nacos-configcenter/pom.xml | 2 +- .../registry/dubbo-samples-nacos/dubbo-samples-nacos-group/pom.xml| 2 +- .../registry/dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml | 2 +- .../registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml | 2 +- .../dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/pom.xml | 2 +- .../dubbo-samples-simplified-registry-annotation/pom.xml | 2 +- .../dubbo-samples-simplified-registry-properties/pom.xml | 2 +- .../dubbo-samples-simplified-registry-xml/pom.xml
[dubbo-samples] branch master updated (3545db73 -> 25992b04)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 3545db73 Bump org.springframework:spring-framework-bom (#981) add 25992b04 Bump org.springframework:spring-framework-bom (#980) No new revisions were added by this update. Summary of changes: 3-extensions/protocol/dubbo-samples-rocketmq/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (8e125768 -> 3545db73)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 8e125768 Bump org.springframework:spring-framework-bom (#982) add 3545db73 Bump org.springframework:spring-framework-bom (#981) No new revisions were added by this update. Summary of changes: .../dubbo-samples-resilience4j-springboot2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (2e38fd90 -> 8e125768)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 2e38fd90 Bump org.springframework:spring-framework-bom (#983) add 8e125768 Bump org.springframework:spring-framework-bom (#982) No new revisions were added by this update. Summary of changes: 99-integration/dubbo-samples-prefer-serialization-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (806a6708 -> 2e38fd90)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 806a6708 Bump org.springframework:spring-framework-bom (#984) add 2e38fd90 Bump org.springframework:spring-framework-bom (#983) No new revisions were added by this update. Summary of changes: .../dubbo-samples-service-discovery/servicediscovery-transfer/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (dc35a913 -> 806a6708)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from dc35a913 Merge pull request #885 from CrazyHZM/feat/upgrade_native_plugin_version add 806a6708 Bump org.springframework:spring-framework-bom (#984) No new revisions were added by this update. Summary of changes: .../dubbo-samples-simplified-registry-nosimple/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (c41fef6c -> afcf9e94)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from c41fef6c Fix delay configure (#883) add afcf9e94 Fix delay register cases (#884) No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/dubbo/samples/App1.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App3.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App4.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App5.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App6.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App1.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App3.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App4.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App5.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App6.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App1.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App3.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App4.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App5.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App6.java | 4 ++-- 99-integration/dubbo-samples-registry-test-nacos-instance/pom.xml| 2 +- .../src/main/java/org/apache/dubbo/samples/App1.java | 5 ++--- .../src/main/java/org/apache/dubbo/samples/App2.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App3.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App4.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App5.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App6.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App1.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App3.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App4.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App5.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App6.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App1.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App3.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App4.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App5.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/App6.java | 4 ++-- .../src/main/java/org/apache/dubbo/samples/provider/Application.java | 1 + 99-integration/dubbo-samples-test-register/pom.xml | 2 +- .../src/main/java/org/apache/dubbo/samples/provider/Application.java | 1 + 40 files changed, 76 insertions(+), 75 deletions(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Fix delay configure (#883)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new c41fef6c Fix delay configure (#883) c41fef6c is described below commit c41fef6c9a987e983efacef30fca8ecf4e959b78 Author: Albumen Kevin AuthorDate: Tue Jul 25 20:59:05 2023 +0800 Fix delay configure (#883) --- .../src/main/java/org/apache/dubbo/samples/App1.java | 5 +++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App3.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App4.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App5.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App6.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App1.java | 5 +++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App3.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App4.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App5.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App6.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App1.java | 5 +++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App3.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App4.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App5.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App6.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App1.java | 6 -- .../src/main/java/org/apache/dubbo/samples/App2.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App3.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App4.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App5.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App6.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App1.java | 5 +++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App3.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App4.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App5.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App6.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App1.java | 5 +++-- .../src/main/java/org/apache/dubbo/samples/App2.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App3.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App4.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App5.java | 7 --- .../src/main/java/org/apache/dubbo/samples/App6.java | 7 --- 36 files changed, 139 insertions(+), 102 deletions(-) diff --git a/99-integration/dubbo-samples-registry-test-curator-instance/src/main/java/org/apache/dubbo/samples/App1.java b/99-integration/dubbo-samples-registry-test-curator-instance/src/main/java/org/apache/dubbo/samples/App1.java index 614a1430..8d7c9aa2 100644 --- a/99-integration/dubbo-samples-registry-test-curator-instance/src/main/java/org/apache/dubbo/samples/App1.java +++ b/99-integration/dubbo-samples-registry-test-curator-instance/src/main/java/org/apache/dubbo/samples/App1.java @@ -36,6 +36,7 @@ import org.apache.dubbo.samples.impl.DemoService3Impl; public class App1 { public static void main(String[] args) throws InterruptedException { System.setProperty(MetadataConstants.METADATA_PUBLISH_DELAY_KEY, "10"); +System.setProperty("dubbo.application.manual-register", "true"); ApplicationConfig applicationConfig = new ApplicationConfig("App1"); applicationConfig.setRegisterMode("instance"); @@ -48,21 +49,21 @@ public class App1 { ServiceConfig serviceConfig1 = new ServiceConfig<>(); serviceConfig1.setInterface(DemoService1.class); serviceConfig1.setRef(new DemoService1Impl("App1")); +serviceConfig1.setDelay(1); ServiceConfig serviceConfig2 = new ServiceConfig<>(); serviceConfig2.setInterface(DemoService2.class); serviceConfig2.setRef(new DemoService2Impl("App1")); -serviceConfig2.setDelay(-1); ServiceConfig serviceConfig3 = new ServiceConfig<>();
[dubbo-samples] branch master updated (209e654d -> 925c3d15)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 209e654d Bump grpc-protobuf (#870) add 925c3d15 Bump grpc-protobuf (#869) No new revisions were added by this update. Summary of changes: .../dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (61bd9408 -> 7e84eb98)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 61bd9408 Bump h2 (#873) add 7e84eb98 Bump grpc-protobuf (#871) No new revisions were added by this update. Summary of changes: 3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-reactor/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (7e84eb98 -> 209e654d)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 7e84eb98 Bump grpc-protobuf (#871) add 209e654d Bump grpc-protobuf (#870) No new revisions were added by this update. Summary of changes: .../dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (604fd59f -> 61bd9408)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 604fd59f Bump h2 (#874) add 61bd9408 Bump h2 (#873) No new revisions were added by this update. Summary of changes: .../dubbo-samples-spring-boot-mybatis-provider/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (3600fa7c -> 604fd59f)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 3600fa7c Bump grpc-protobuf (#868) add 604fd59f Bump h2 (#874) No new revisions were added by this update. Summary of changes: .../dubbo-samples-spring-boot-hibernate-provider/pom.xml| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Bump grpc-protobuf (#868)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 3600fa7c Bump grpc-protobuf (#868) 3600fa7c is described below commit 3600fa7cefe18cbd7ce144b72510777f16e43f4a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jul 13 20:32:50 2023 +0800 Bump grpc-protobuf (#868) Bumps [grpc-protobuf](https://github.com/grpc/grpc-java) from 1.19.0 to 1.53.0. - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.19.0...v1.53.0) --- updated-dependencies: - dependency-name: io.grpc:grpc-protobuf dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-rxjava/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-rxjava/pom.xml b/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-rxjava/pom.xml index 9e91e594..cc56ffae 100644 --- a/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-rxjava/pom.xml +++ b/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-rxjava/pom.xml @@ -41,7 +41,7 @@ 2181 org.apache.dubbo.samples.basic.BasicProvider 1.5.13.RELEASE -1.19.0 +1.53.0 0.0.1 1.0.0 - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Update case-versions.conf
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 1d83c324 Update case-versions.conf 1d83c324 is described below commit 1d83c32418cfa651537ddf649a35336109ccb2d6 Author: Albumen Kevin AuthorDate: Thu Jul 13 19:25:24 2023 +0800 Update case-versions.conf --- 99-integration/dubbo-samples-test-12631/case-versions.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/99-integration/dubbo-samples-test-12631/case-versions.conf b/99-integration/dubbo-samples-test-12631/case-versions.conf index cdecf9a2..0ad1517e 100644 --- a/99-integration/dubbo-samples-test-12631/case-versions.conf +++ b/99-integration/dubbo-samples-test-12631/case-versions.conf @@ -20,5 +20,5 @@ # Supported component versions of the test case # Spring app -dubbo.version= [ >= 3.1.0 ] -java.version= [ >= 8 ] \ No newline at end of file +dubbo.version= [ >= 3.2.0 ] +java.version= [ >= 8 ] - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Skip some test cases for 3.1.x (#877)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 557be349 Skip some test cases for 3.1.x (#877) 557be349 is described below commit 557be3499f6cb0a643eb63ea6941f94798fb8bf3 Author: Albumen Kevin AuthorDate: Sat Jul 8 15:05:10 2023 +0800 Skip some test cases for 3.1.x (#877) --- .../dubbo-samples-registry-test-curator-instance/case-versions.conf | 2 +- .../dubbo-samples-registry-test-curator-interface/case-versions.conf | 2 +- 99-integration/dubbo-samples-registry-test-curator/case-versions.conf | 2 +- .../dubbo-samples-registry-test-nacos-instance/case-versions.conf | 4 ++-- .../dubbo-samples-registry-test-nacos-interface/case-versions.conf| 2 +- 99-integration/dubbo-samples-registry-test-nacos/case-versions.conf | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/99-integration/dubbo-samples-registry-test-curator-instance/case-versions.conf b/99-integration/dubbo-samples-registry-test-curator-instance/case-versions.conf index f6351d04..706c8278 100644 --- a/99-integration/dubbo-samples-registry-test-curator-instance/case-versions.conf +++ b/99-integration/dubbo-samples-registry-test-curator-instance/case-versions.conf @@ -20,7 +20,7 @@ # Supported component versions of the test case # Spring app -dubbo.version=[ >= 3.1.0 ] +dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* java.version= [ <= 11 ] curator.version= [ >= 4.0.0 ] diff --git a/99-integration/dubbo-samples-registry-test-curator-interface/case-versions.conf b/99-integration/dubbo-samples-registry-test-curator-interface/case-versions.conf index 073b74bf..070a3395 100644 --- a/99-integration/dubbo-samples-registry-test-curator-interface/case-versions.conf +++ b/99-integration/dubbo-samples-registry-test-curator-interface/case-versions.conf @@ -20,7 +20,7 @@ # Supported component versions of the test case # Spring app -dubbo.version=[ >= 3.1.0 ] +dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* java.version= [ >= 8 ] curator.version= [ >= 4.0.0 ] diff --git a/99-integration/dubbo-samples-registry-test-curator/case-versions.conf b/99-integration/dubbo-samples-registry-test-curator/case-versions.conf index 073b74bf..070a3395 100644 --- a/99-integration/dubbo-samples-registry-test-curator/case-versions.conf +++ b/99-integration/dubbo-samples-registry-test-curator/case-versions.conf @@ -20,7 +20,7 @@ # Supported component versions of the test case # Spring app -dubbo.version=[ >= 3.1.0 ] +dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* java.version= [ >= 8 ] curator.version= [ >= 4.0.0 ] diff --git a/99-integration/dubbo-samples-registry-test-nacos-instance/case-versions.conf b/99-integration/dubbo-samples-registry-test-nacos-instance/case-versions.conf index 6b77c60d..8eb77acd 100644 --- a/99-integration/dubbo-samples-registry-test-nacos-instance/case-versions.conf +++ b/99-integration/dubbo-samples-registry-test-nacos-instance/case-versions.conf @@ -19,7 +19,7 @@ # Supported component versions of the test case # Spring app -dubbo.version=[ >= 3.1.0 ] +dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* java.version= [ >= 8 ] -nacos.version="!*-BETA","!*-ALPHA*",2.* \ No newline at end of file +nacos.version="!*-BETA","!*-ALPHA*",2.* diff --git a/99-integration/dubbo-samples-registry-test-nacos-interface/case-versions.conf b/99-integration/dubbo-samples-registry-test-nacos-interface/case-versions.conf index 45d7a7c9..6a5d0627 100644 --- a/99-integration/dubbo-samples-registry-test-nacos-interface/case-versions.conf +++ b/99-integration/dubbo-samples-registry-test-nacos-interface/case-versions.conf @@ -20,7 +20,7 @@ # Supported component versions of the test case # Spring app -dubbo.version=[ >= 3.1.0 ] +dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* java.version= [ >= 8 ] nacos.version="!*-BETA","!*-ALPHA*",2.* diff --git a/99-integration/dubbo-samples-registry-test-nacos/case-versions.conf b/99-integration/dubbo-samples-registry-test-nacos/case-versions.conf index 45d7a7c9..6a5d0627 100644 --- a/99-integration/dubbo-samples-registry-test-nacos/case-versions.conf +++ b/99-integration/dubbo-samples-registry-test-nacos/case-versions.conf @@ -20,7 +20,7 @@ # Supported component versions of the test case # Spring app -dubbo.version=[ >= 3.1.0 ] +dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* java.version= [ >= 8 ] nacos.version="!*-BETA","!*-ALPHA*",2.* - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (dcea268b -> 5e34bb73)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from dcea268b Set round-robin to prevent random failed add 5e34bb73 Add test cases to verify apache/dubbo#12631 and apache/dubbo#12643 (#867) No new revisions were added by this update. Summary of changes: .../case-configuration.yml | 2 +- .../case-versions.conf | 0 .../pom.xml| 6 +-- .../apache/dubbo/samples/api/GreetingsService.java | 0 .../samples/client/ConsumerClusterFilter.java} | 40 --- .../dubbo/samples/client/ConsumerFilter.java | 35 +++-- .../dubbo/samples/client/ProviderFilter.java | 60 ++ .../apache/dubbo/samples/provider/Application.java | 4 +- .../samples/provider/GreetingsServiceImpl.java | 0 .../META-INF/dubbo/org.apache.dubbo.rpc.Filter | 2 +- ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 + .../src/main/resources/log4j.properties| 0 .../dubbo/samples/client/GreetingServiceIT.java| 22 99-integration/pom.xml | 1 + 14 files changed, 142 insertions(+), 31 deletions(-) copy 99-integration/{dubbo-samples-test-11557 => dubbo-samples-test-12631}/case-configuration.yml (95%) copy 99-integration/{dubbo-samples-test-11557 => dubbo-samples-test-12631}/case-versions.conf (100%) copy 99-integration/{dubbo-samples-test-register => dubbo-samples-test-12631}/pom.xml (94%) copy 99-integration/{dubbo-samples-memory-server => dubbo-samples-test-12631}/src/main/java/org/apache/dubbo/samples/api/GreetingsService.java (100%) copy 99-integration/{dubbo-samples-test-11558/src/main/java/org/apache/dubbo/samples/client/ConsumerFilter.java => dubbo-samples-test-12631/src/main/java/org/apache/dubbo/samples/client/ConsumerClusterFilter.java} (52%) copy 99-integration/{dubbo-samples-test-11558 => dubbo-samples-test-12631}/src/main/java/org/apache/dubbo/samples/client/ConsumerFilter.java (56%) create mode 100644 99-integration/dubbo-samples-test-12631/src/main/java/org/apache/dubbo/samples/client/ProviderFilter.java copy 99-integration/{dubbo-samples-test-11716 => dubbo-samples-test-12631}/src/main/java/org/apache/dubbo/samples/provider/Application.java (95%) copy {1-basic/dubbo-samples-api => 99-integration/dubbo-samples-test-12631}/src/main/java/org/apache/dubbo/samples/provider/GreetingsServiceImpl.java (100%) copy 99-integration/{dubbo-samples-test-11557 => dubbo-samples-test-12631}/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter (50%) create mode 100644 99-integration/dubbo-samples-test-12631/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.filter.ClusterFilter copy {1-basic/dubbo-samples-annotation => 99-integration/dubbo-samples-test-12631}/src/main/resources/log4j.properties (100%) copy 99-integration/{dubbo-samples-test-11558 => dubbo-samples-test-12631}/src/test/java/org/apache/dubbo/samples/client/GreetingServiceIT.java (75%) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Set round-robin to prevent random failed
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new dcea268b Set round-robin to prevent random failed dcea268b is described below commit dcea268b9665a367f550d4a5225d98c27f556ef5 Author: Albumen Kevin AuthorDate: Sun Jul 2 15:58:55 2023 +0800 Set round-robin to prevent random failed --- .../src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java| 6 ++ .../src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java| 6 ++ .../src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java| 6 ++ 3 files changed, 18 insertions(+) diff --git a/99-integration/dubbo-samples-registry-test-curator-instance/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java b/99-integration/dubbo-samples-registry-test-curator-instance/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java index 6564c596..da45d47e 100644 --- a/99-integration/dubbo-samples-registry-test-curator-instance/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java +++ b/99-integration/dubbo-samples-registry-test-curator-instance/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java @@ -56,12 +56,15 @@ public class ZookeeperIT { ReferenceConfig referenceConfig1 = new ReferenceConfig<>(); referenceConfig1.setInterface(DemoService1.class); +referenceConfig1.setLoadbalance("roundrobin"); ReferenceConfig referenceConfig2 = new ReferenceConfig<>(); referenceConfig2.setInterface(DemoService2.class); +referenceConfig2.setLoadbalance("roundrobin"); ReferenceConfig referenceConfig3 = new ReferenceConfig<>(); referenceConfig3.setInterface(DemoService3.class); +referenceConfig3.setLoadbalance("roundrobin"); RegistryConfig registryConfig = new RegistryConfig(zookeeperAddress); @@ -239,12 +242,15 @@ public class ZookeeperIT { ReferenceConfig referenceConfig1 = new ReferenceConfig<>(); referenceConfig1.setInterface(DemoService1.class); +referenceConfig1.setLoadbalance("roundrobin"); ReferenceConfig referenceConfig2 = new ReferenceConfig<>(); referenceConfig2.setInterface(DemoService2.class); +referenceConfig2.setLoadbalance("roundrobin"); ReferenceConfig referenceConfig3 = new ReferenceConfig<>(); referenceConfig3.setInterface(DemoService3.class); +referenceConfig3.setLoadbalance("roundrobin"); RegistryConfig registryConfig = new RegistryConfig(zookeeperAddress); diff --git a/99-integration/dubbo-samples-registry-test-curator-interface/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java b/99-integration/dubbo-samples-registry-test-curator-interface/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java index 6564c596..da45d47e 100644 --- a/99-integration/dubbo-samples-registry-test-curator-interface/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java +++ b/99-integration/dubbo-samples-registry-test-curator-interface/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java @@ -56,12 +56,15 @@ public class ZookeeperIT { ReferenceConfig referenceConfig1 = new ReferenceConfig<>(); referenceConfig1.setInterface(DemoService1.class); +referenceConfig1.setLoadbalance("roundrobin"); ReferenceConfig referenceConfig2 = new ReferenceConfig<>(); referenceConfig2.setInterface(DemoService2.class); +referenceConfig2.setLoadbalance("roundrobin"); ReferenceConfig referenceConfig3 = new ReferenceConfig<>(); referenceConfig3.setInterface(DemoService3.class); +referenceConfig3.setLoadbalance("roundrobin"); RegistryConfig registryConfig = new RegistryConfig(zookeeperAddress); @@ -239,12 +242,15 @@ public class ZookeeperIT { ReferenceConfig referenceConfig1 = new ReferenceConfig<>(); referenceConfig1.setInterface(DemoService1.class); +referenceConfig1.setLoadbalance("roundrobin"); ReferenceConfig referenceConfig2 = new ReferenceConfig<>(); referenceConfig2.setInterface(DemoService2.class); +referenceConfig2.setLoadbalance("roundrobin"); ReferenceConfig referenceConfig3 = new ReferenceConfig<>(); referenceConfig3.setInterface(DemoService3.class); +referenceConfig3.setLoadbalance("roundrobin"); RegistryConfig registryConfig = new RegistryConfig(zookeeperAddress); diff --git a/99-integration/dubbo-samples-registry-test-curator/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java b/99-integration/dub
[dubbo-samples] branch master updated: Fix long wait
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 5ac488fa Fix long wait 5ac488fa is described below commit 5ac488fae6584bcdfa65388de2b25044d5d6aafb Author: Albumen Kevin AuthorDate: Sun Jul 2 15:42:59 2023 +0800 Fix long wait --- .../dubbo/samples/test/BlockingServiceIT.java | 27 ++ 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/99-integration/dubbo-samples-multi-port/src/test/java/org/apache/dubbo/samples/test/BlockingServiceIT.java b/99-integration/dubbo-samples-multi-port/src/test/java/org/apache/dubbo/samples/test/BlockingServiceIT.java index cc0e5e8b..788c327f 100644 --- a/99-integration/dubbo-samples-multi-port/src/test/java/org/apache/dubbo/samples/test/BlockingServiceIT.java +++ b/99-integration/dubbo-samples-multi-port/src/test/java/org/apache/dubbo/samples/test/BlockingServiceIT.java @@ -30,6 +30,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -96,20 +98,31 @@ public class BlockingServiceIT { Assert.assertEquals("dubbo-danger", blockingServiceD.type()); Assert.assertEquals("dubbo-openapi", blockingServiceE.type()); +List threads = new LinkedList<>(); for (int i = 0; i < 10; i++) { -new Thread(() -> blockingServiceA.block()).start(); +Thread t = new Thread(() -> blockingServiceA.block()); +t.start(); +threads.add(t); } for (int i = 0; i < 11; i++) { -new Thread(() -> blockingServiceB.block()).start(); +Thread t = new Thread(() -> blockingServiceB.block()); +t.start(); +threads.add(t); } for (int i = 0; i < 12; i++) { -new Thread(() -> blockingServiceC.block()).start(); +Thread t = new Thread(() -> blockingServiceC.block()); +t.start(); +threads.add(t); } for (int i = 0; i < 13; i++) { -new Thread(() -> blockingServiceD.block()).start(); +Thread t = new Thread(() -> blockingServiceD.block()); +t.start(); +threads.add(t); } for (int i = 0; i < 14; i++) { -new Thread(() -> blockingServiceE.block()).start(); +Thread t = new Thread(() -> blockingServiceE.block()); +t.start(); +threads.add(t); } await().untilAsserted(() -> { @@ -158,6 +171,10 @@ public class BlockingServiceIT { } catch (Exception e) { Assert.assertTrue(e.getMessage().contains("Thread pool is EXHAUSTED")); } + +for (Thread thread : threads) { +thread.interrupt(); +} } } - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (4de27aab -> f3076f33)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 4de27aab Add test cases to verify apache/dubbo:#11887 (#794) add f3076f33 Fix snapshot version (#866) No new revisions were added by this update. Summary of changes: 4-governance/dubbo-samples-tracing/pom.xml | 2 +- 99-integration/dubbo-samples-nacos-legacy/pom.xml | 2 +- 99-integration/dubbo-samples-test-register/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (94c1eb15 -> 4de27aab)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 94c1eb15 Add test cases to verify apache/dubbo#12376 (#853) add 4de27aab Add test cases to verify apache/dubbo:#11887 (#794) No new revisions were added by this update. Summary of changes: .../case-configuration.yml | 30 ++--- .../case-versions.conf | 0 .../dubbo-samples-nacos-legacy-api}/pom.xml| 4 +- .../dubbo/samples/legacy/api}/DemoService.java | 4 +- .../dubbo-samples-nacos-legacy-consumer}/pom.xml | 18 ++- .../src/main/java}/FakeMain.java | 5 - .../src/main/resources/log4j.properties| 2 +- .../org/apache/dubbo/samples/legacy/LegacyIT.java | 139 + .../dubbo-samples-nacos-legacy-provider1}/pom.xml | 37 +- .../org/apache/dubbo/samples/legacy/Provider.java | 27 ++-- .../samples/legacy/impl}/DemoServiceImpl.java | 11 +- .../src/main/resources/dubbo.properties| 1 + .../src/main/resources/log4j.properties| 2 +- .../dubbo-samples-nacos-legacy-provider2}/pom.xml | 12 +- .../org/apache/dubbo/samples/legacy/Provider.java | 29 +++-- .../samples/legacy}/impl/DemoServiceImpl.java | 11 +- .../src/main/resources/dubbo.properties| 0 .../src/main/resources/log4j.properties| 2 +- .../pom.xml| 16 +-- 99-integration/pom.xml | 1 + 20 files changed, 264 insertions(+), 87 deletions(-) copy {3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter => 99-integration/dubbo-samples-nacos-legacy}/case-configuration.yml (72%) copy 99-integration/{dubbo-samples-prefer-serialization-test-31x => dubbo-samples-nacos-legacy}/case-versions.conf (100%) copy 99-integration/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-api => dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-api}/pom.xml (91%) copy {2-advanced/dubbo-samples-docker/src/main/java/org/apache/dubbo/samples/docker => 99-integration/dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-api/src/main/java/org/apache/dubbo/samples/legacy/api}/DemoService.java (92%) copy 99-integration/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-consumer => dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-consumer}/pom.xml (84%) copy 99-integration/{dubbo-samples-test-12208/dubbo-samples-test-12208-test/src/main/java/org/apache/dubbo => dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-consumer/src/main/java}/FakeMain.java (91%) copy {2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer => 99-integration/dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-consumer}/src/main/resources/log4j.properties (97%) create mode 100644 99-integration/dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-consumer/src/test/java/org/apache/dubbo/samples/legacy/LegacyIT.java copy 99-integration/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider1 => dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-provider1}/pom.xml (69%) copy 2-advanced/dubbo-samples-local/src/main/java/org/apache/dubbo/samples/local/LocalDemo.java => 99-integration/dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-provider1/src/main/java/org/apache/dubbo/samples/legacy/Provider.java (57%) copy 99-integration/{dubbo-samples-test-11096/src/test/java/org/apache/dubbo/samples/test => dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-provider1/src/main/java/org/apache/dubbo/samples/legacy/impl}/DemoServiceImpl.java (80%) create mode 100644 99-integration/dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-provider1/src/main/resources/dubbo.properties copy {2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer => 99-integration/dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-provider1}/src/main/resources/log4j.properties (97%) copy 99-integration/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider2 => dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-provider2}/pom.xml (88%) copy 2-advanced/dubbo-samples-local/src/main/java/org/apache/dubbo/samples/local/LocalDemo.java => 99-integration/dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-provider2/src/main/java/org/apache/dubbo/samples/legacy/Provider.java (54%) copy {4-governance/dubbo-samples-meshrule-router/src/main/java/org/apache/dubbo/samples/governance => 99-integration/dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-provider2/src/main/java/org/apache/dubbo/samples/legacy}/impl/DemoServiceImpl.java (80%) copy 99-integration/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-provider1 => dubbo-samples-nacos-legacy/dubbo-samples-nacos-legacy-provider2}/src/main/resources/dub
[dubbo-samples] branch master updated: Add test cases to verify apache/dubbo#12376 (#853)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 94c1eb15 Add test cases to verify apache/dubbo#12376 (#853) 94c1eb15 is described below commit 94c1eb15df6143ffb469a4ca441f12975f224163 Author: Albumen Kevin AuthorDate: Sun Jul 2 09:37:18 2023 +0800 Add test cases to verify apache/dubbo#12376 (#853) * Add test cases to verify apache/dubbo#12376 * enhance test cases * Set interface mode * Update case-versions.conf * Fix test case --- .../case-configuration.yml | 23 ++ .../dubbo-samples-test-12376/case-versions.conf| 24 ++ 99-integration/dubbo-samples-test-12376/pom.xml| 84 +++ .../apache/dubbo/samples/api/BackendService.java | 24 ++ .../apache/dubbo/samples/api/GreetingsService.java | 24 ++ .../org/apache/dubbo/samples/api/HelloService.java | 24 ++ .../org/apache/dubbo/samples/api/QosService.java | 21 + .../samples/filter/ConsumerAlibabaFilter.java | 56 + .../samples/filter/ConsumerClusterFilter.java | 56 + .../dubbo/samples/filter/ConsumerFilter.java | 56 + .../samples/filter/ProviderAlibabaFilter.java | 56 + .../dubbo/samples/filter/ProviderFilter.java | 56 + .../samples/loadbalance/AlibabaLoadBalance.java| 42 ++ .../samples/loadbalance/ApacheLoadBalance.java | 41 ++ .../apache/dubbo/samples/provider/Application.java | 94 ++ .../dubbo/samples/provider/BackendServiceImpl.java | 26 ++ .../samples/provider/GreetingsServiceImpl.java | 34 .../dubbo/samples/provider/HelloServiceImpl.java | 33 .../dubbo/samples/provider/QosServiceImpl.java | 50 .../apache/dubbo/samples/router/AlibabaRouter.java | 57 + .../dubbo/samples/router/AlibabaRouterFactory.java | 31 +++ .../apache/dubbo/samples/router/ApacheRouter.java | 66 +++ .../dubbo/samples/router/ApacheRouterFactory.java | 30 +++ .../dubbo/samples/router/ApacheStateRouter.java| 53 .../samples/router/ApacheStateRouterFactory.java | 30 +++ .../META-INF/dubbo/com.alibaba.dubbo.rpc.Filter| 2 + .../com.alibaba.dubbo.rpc.cluster.LoadBalance | 2 + .../com.alibaba.dubbo.rpc.cluster.RouterFactory| 1 + .../META-INF/dubbo/org.apache.dubbo.rpc.Filter | 2 + .../org.apache.dubbo.rpc.cluster.RouterFactory | 1 + ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 + ...bbo.rpc.cluster.router.state.StateRouterFactory | 1 + .../src/main/resources/log4j.properties| 25 ++ .../dubbo/samples/client/GreetingServiceIT.java| 84 +++ 99-integration/pom.xml | 1 + 35 files changed, 1211 insertions(+) diff --git a/99-integration/dubbo-samples-test-12376/case-configuration.yml b/99-integration/dubbo-samples-test-12376/case-configuration.yml new file mode 100644 index ..64c2161d --- /dev/null +++ b/99-integration/dubbo-samples-test-12376/case-configuration.yml @@ -0,0 +1,23 @@ +# 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. + +from: app-external-zookeeper.yml + +props: + project_name: dubbo-samples-test-12376 + main_class: org.apache.dubbo.samples.provider.Application + dubbo_port: 20881 + check_log: "DubboBootstrap awaiting ..." diff --git a/99-integration/dubbo-samples-test-12376/case-versions.conf b/99-integration/dubbo-samples-test-12376/case-versions.conf new file mode 100644 index ..0ad1517e --- /dev/null +++ b/99-integration/dubbo-samples-test-12376/case-versions.conf @@ -0,0 +1,24 @@ +# +# +# 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&quo
[dubbo-samples] branch master updated (69ea42c2 -> 8c5e9f76)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 69ea42c2 Add Integration test cases to verify register (#863) add 8c5e9f76 Enhance multi port test cases (#864) No new revisions were added by this update. Summary of changes: .../src/main/resources/spring/dubbo-demo-provider.xml| 12 ++-- .../org/apache/dubbo/samples/test/BlockingServiceIT.java | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Add Integration test cases to verify register (#863)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 69ea42c2 Add Integration test cases to verify register (#863) 69ea42c2 is described below commit 69ea42c2ade96aaed76d05c901e8f01657e0b4bb Author: Albumen Kevin AuthorDate: Wed Jun 28 19:27:23 2023 +0800 Add Integration test cases to verify register (#863) * Add Integration test cases to verify register * rename config * Add license * Fix uts * Update jdk version * add cases * Update register to delay * ignore 3.3 --- .github/workflows/{dubbo-3_1.yml => dubbo-3_3.yml} | 8 +- .../main/java/org/apache/dubbo/samples/App1.java | 4 +- .../main/java/org/apache/dubbo/samples/App2.java | 4 +- .../main/java/org/apache/dubbo/samples/App3.java | 4 +- .../main/java/org/apache/dubbo/samples/App4.java | 4 +- .../main/java/org/apache/dubbo/samples/App5.java | 4 +- .../main/java/org/apache/dubbo/samples/App6.java | 4 +- .../main/java/org/apache/dubbo/samples/App1.java | 4 +- .../main/java/org/apache/dubbo/samples/App2.java | 4 +- .../main/java/org/apache/dubbo/samples/App3.java | 4 +- .../main/java/org/apache/dubbo/samples/App4.java | 4 +- .../main/java/org/apache/dubbo/samples/App5.java | 4 +- .../main/java/org/apache/dubbo/samples/App6.java | 4 +- .../main/java/org/apache/dubbo/samples/App1.java | 4 +- .../main/java/org/apache/dubbo/samples/App2.java | 4 +- .../main/java/org/apache/dubbo/samples/App3.java | 4 +- .../main/java/org/apache/dubbo/samples/App4.java | 4 +- .../main/java/org/apache/dubbo/samples/App5.java | 4 +- .../main/java/org/apache/dubbo/samples/App6.java | 4 +- .../main/java/org/apache/dubbo/samples/App1.java | 4 +- .../main/java/org/apache/dubbo/samples/App2.java | 4 +- .../main/java/org/apache/dubbo/samples/App3.java | 4 +- .../main/java/org/apache/dubbo/samples/App4.java | 4 +- .../main/java/org/apache/dubbo/samples/App5.java | 4 +- .../main/java/org/apache/dubbo/samples/App6.java | 4 +- .../main/java/org/apache/dubbo/samples/App1.java | 4 +- .../main/java/org/apache/dubbo/samples/App2.java | 4 +- .../main/java/org/apache/dubbo/samples/App3.java | 4 +- .../main/java/org/apache/dubbo/samples/App4.java | 4 +- .../main/java/org/apache/dubbo/samples/App5.java | 4 +- .../main/java/org/apache/dubbo/samples/App6.java | 4 +- .../main/java/org/apache/dubbo/samples/App1.java | 4 +- .../main/java/org/apache/dubbo/samples/App2.java | 4 +- .../main/java/org/apache/dubbo/samples/App3.java | 4 +- .../main/java/org/apache/dubbo/samples/App4.java | 4 +- .../main/java/org/apache/dubbo/samples/App5.java | 4 +- .../main/java/org/apache/dubbo/samples/App6.java | 4 +- .../case-configuration.yml | 23 +++ .../case-versions.conf | 24 +++ .../dubbo-samples-test-register-3-3/pom.xml| 84 + .../apache/dubbo/samples/api/GreetingsService.java | 24 +++ .../org/apache/dubbo/samples/api/QosService.java | 21 +++ .../apache/dubbo/samples/provider/Application.java | 162 + .../samples/provider/DemoModuleDeployListener.java | 64 +++ .../samples/provider/GreetingsServiceImpl.java | 27 +++ .../dubbo/samples/provider/QosServiceImpl.java | 28 +++ ...apache.dubbo.common.deploy.ModuleDeployListener | 1 + .../src/main/resources/log4j.properties| 25 +++ .../dubbo/samples/client/GreetingServiceIT.java| 151 .../case-configuration.yml | 23 +++ .../dubbo-samples-test-register/case-versions.conf | 24 +++ 99-integration/dubbo-samples-test-register/pom.xml | 84 + .../apache/dubbo/samples/api/GreetingsService.java | 24 +++ .../org/apache/dubbo/samples/api/QosService.java | 21 +++ .../apache/dubbo/samples/provider/Application.java | 162 + .../samples/provider/DemoModuleDeployListener.java | 64 +++ .../samples/provider/GreetingsServiceImpl.java | 27 +++ .../dubbo/samples/provider/QosServiceImpl.java | 28 +++ ...apache.dubbo.common.deploy.ModuleDeployListener | 1 + .../src/main/resources/log4j.properties| 25 +++ .../dubbo/samples/client/GreetingServiceIT.java| 195 + 99-integration/pom.xml | 2 + 62 files changed, 1390 insertions(+), 76 deletions(-) diff --git a/.github/workflows/dubbo-3_1.yml b/.github/workflows/dubbo-3_3.yml similarity index 98% rename from .github/workflows/dubbo-3_1.yml rename to .github/workflows/dubbo-3_3.yml index b687328e..cce4394b 100644 --- a/.github/workflows/dubbo-3_1.yml +++ b/.github/workflows/dubbo-3_3.yml @@ -
[dubbo-samples] branch master updated (dc6baa33 -> 6d0178e6)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from dc6baa33 Bump guava in /2-advanced/dubbo-samples-cloud-native/dubbo-call-sc (#857) add 6d0178e6 Bump guava in /2-advanced/dubbo-samples-cloud-native/sc-call-dubbo (#858) No new revisions were added by this update. Summary of changes: 2-advanced/dubbo-samples-cloud-native/sc-call-dubbo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (fe44edc7 -> d05a2c06)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from fe44edc7 Bump guava (#859) add d05a2c06 Bump guava (#860) No new revisions were added by this update. Summary of changes: .../dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (6d0178e6 -> fe44edc7)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 6d0178e6 Bump guava in /2-advanced/dubbo-samples-cloud-native/sc-call-dubbo (#858) add fe44edc7 Bump guava (#859) No new revisions were added by this update. Summary of changes: 2-advanced/dubbo-samples-cloud-native/servicediscovery-transfer/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (ce7a8f32 -> dc6baa33)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from ce7a8f32 Bump guava in /2-advanced/dubbo-samples-cloud-native/dubbo-call-scdubbo (#856) add dc6baa33 Bump guava in /2-advanced/dubbo-samples-cloud-native/dubbo-call-sc (#857) No new revisions were added by this update. Summary of changes: 2-advanced/dubbo-samples-cloud-native/dubbo-call-sc/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (1c5530f3 -> ce7a8f32)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 1c5530f3 feat: add tracing sample use dubbo directly (#854) add ce7a8f32 Bump guava in /2-advanced/dubbo-samples-cloud-native/dubbo-call-scdubbo (#856) No new revisions were added by this update. Summary of changes: 2-advanced/dubbo-samples-cloud-native/dubbo-call-scdubbo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (0193e46d -> 1c5530f3)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 0193e46d Update pom.xml add 1c5530f3 feat: add tracing sample use dubbo directly (#854) No new revisions were added by this update. Summary of changes: .../README.md | 0 .../dubbo-sample-api-tracing-otel-zipkin/README.md | 94 + .../dubbo-sample-api-tracing-otel-zipkin}/pom.xml | 79 - .../dubbo/tracing}/api/GreetingsService.java | 4 +- .../dubbo/tracing/api/TracingConfigProvider.java | 37 .../dubbo/tracing}/client/AlwaysApplication.java | 14 +-- .../apache/dubbo/tracing}/client/Application.java | 12 +-- .../dubbo/tracing}/provider/Application.java | 10 ++- .../dubbo/tracing/provider}/EmbeddedZooKeeper.java | 2 +- .../tracing}/provider/GreetingsServiceImpl.java| 5 +- .../src/main/resources/log4j.properties| 2 +- .../static/zipkin_detail.png | Bin 0 -> 147746 bytes .../static/zipkin_search.png | Bin 0 -> 184991 bytes .../README.md | 0 .../consumer/pom.xml | 0 .../demo/consumer/ConsumerApplication.java | 0 .../consumer/src/main/resources/application.yml| 0 .../interface/pom.xml | 0 .../apache/dubbo/springboot/demo/DemoService.java | 0 .../pom.xml| 2 +- .../provider/pom.xml | 0 .../springboot/demo/provider/DemoServiceImpl.java | 0 .../demo/provider/EmbeddedZooKeeper.java | 0 .../demo/provider/ProviderApplication.java | 0 .../provider/src/main/resources/application.yml| 0 .../static/demo_arch.png | Bin .../static/jaeger_detail.png | Bin .../static/jaeger_search.png | Bin .../static/zipkin_detail.png | Bin .../static/zipkin_search.png | Bin .../README.md | 0 .../consumer/pom.xml | 0 .../demo/consumer/ConsumerApplication.java | 0 .../consumer/src/main/resources/application.yml| 0 .../interface/pom.xml | 0 .../apache/dubbo/springboot/demo/DemoService.java | 0 .../pom.xml| 2 +- .../provider/pom.xml | 0 .../springboot/demo/provider/DemoServiceImpl.java | 0 .../demo/provider/EmbeddedZooKeeper.java | 0 .../demo/provider/ProviderApplication.java | 0 .../provider/src/main/resources/application.yml| 0 .../static/zipkin.png | Bin .../static/zipkin_home.png | Bin .../pom.xml| 4 +- 4-governance/pom.xml | 2 +- 46 files changed, 205 insertions(+), 64 deletions(-) rename 4-governance/{dubbo-samples-spring-boot-tracing => dubbo-samples-tracing}/README.md (100%) create mode 100644 4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/README.md copy {2-advanced/dubbo-samples-notify/dubbo-samples-notify-consumer => 4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin}/pom.xml (54%) copy {3-extensions/configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples => 4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing}/api/GreetingsService.java (95%) create mode 100644 4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing/api/TracingConfigProvider.java copy {1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples => 4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing}/client/AlwaysApplication.java (88%) copy {1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples => 4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing}/client/Application.java (87%) copy {1-basic/dubbo-samples-api/src/main/java/org/apache/dubbo/samples => 4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing}/provider/Application.java (84%) copy {2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/src/main/java/org/apache/dubbo/samples/async => 4-governance/dubbo-samples-tracing/dubbo-sample-api-tracing-otel-zipkin/src/main/java/org/apache/dubbo/tracing/provider}/EmbeddedZooKeeper.java (99%) copy {1-basic/dubbo-samples-spring-xml/src/main/ja
[dubbo-samples] branch master updated (a41643fc -> 0193e46d)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from a41643fc fix skywalking-oap-dashboard service port (#851) add 0193e46d Update pom.xml No new revisions were added by this update. Summary of changes: 4-governance/dubbo-samples-spring-boot3-tracing/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: fix skywalking-oap-dashboard service port (#851)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new a41643fc fix skywalking-oap-dashboard service port (#851) a41643fc is described below commit a41643fca6c3f1c4a424a127567cb94062b2341a Author: Jun <108045855+2456868...@users.noreply.github.com> AuthorDate: Thu Jun 1 15:51:46 2023 +0800 fix skywalking-oap-dashboard service port (#851) --- 10-task/dubbo-samples-shop/deploy/All.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/10-task/dubbo-samples-shop/deploy/All.yml b/10-task/dubbo-samples-shop/deploy/All.yml index 62653aaf..84d04052 100644 --- a/10-task/dubbo-samples-shop/deploy/All.yml +++ b/10-task/dubbo-samples-shop/deploy/All.yml @@ -216,9 +216,9 @@ spec: selector: app: skywalking-oap-dashboard ports: -- port: 8082 +- port: 8080 name: http - targetPort: 8082 + targetPort: 8080 --- # App FrontEnd - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch dependabot/maven/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/org.eclipse.jetty-jetty-server-10.0.14 updated (74b62ddd -> 914d78d2)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch dependabot/maven/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/org.eclipse.jetty-jetty-server-10.0.14 in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 74b62ddd Bump jetty-server add 59750576 Fix dependencies bom (#840) add a12de07a Update serialization config (#838) add bd4af07e docs & chore: update tracing doc & remove log4j (#839) add 0faf0034 Fix serialize check test add f374d4aa Update shop task. (#841) add aaebed9d Set timeout for memory server test (#843) add 7c27ce1d chore: change springboot tracing project add 22cad4b6 feat: add samples for dubbo-spring-boot-tracing-otel-otlp-starter add 29d83ceb fix: add license add 7c5ed304 chore: upgrade dubbo version add b8a093bf :arrow_up: upgrade dubbo dep add 6f4d4892 Merge pull request #846 from songxiaosheng/upgrade_dubbo_321 add fe910102 Merge branch 'master' into cgq add 50fb2b7d Merge pull request #844 from conghuhu/cgq add 8431b5e0 Add metrics task demo (#848) add 025b1d09 Bump jetty-server in /3-extensions/protocol/dubbo-samples-jetty (#826) add 914d78d2 Merge branch 'master' into dependabot/maven/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/org.eclipse.jetty-jetty-server-10.0.14 No new revisions were added by this update. Summary of changes: .../deploy/All.yml | 298 + .../pom.xml| 8 +- .../org/apache/dubbo/samples/CommentService.java | 0 .../dubbo-samples-metrics-demo-comment-v1}/pom.xml | 26 +- .../dubbo/samples/comment/CommentApplication.java | 0 .../dubbo/samples/comment/CommentServiceImpl.java | 0 .../src/main/resources/application.properties | 18 +- .../dubbo-samples-metrics-demo-comment-v2}/pom.xml | 26 +- .../dubbo/samples/comment/CommentApplication2.java | 0 .../dubbo/samples/comment/CommentServiceImpl2.java | 0 .../src/main/resources/application.properties | 18 +- .../dubbo-samples-metrics-demo-detail-api}/pom.xml | 8 +- .../org/apache/dubbo/samples/DetailService.java| 0 .../main/java/org/apache/dubbo/samples/Item.java | 0 .../dubbo-samples-metrics-demo-detail-v1}/pom.xml | 28 +- .../dubbo/samples/detail/DetailApplication.java| 0 .../dubbo/samples/detail/DetailServiceImpl.java| 1 - .../src/main/resources/application.properties | 21 +- .../dubbo-samples-metrics-demo-detail-v2}/pom.xml | 28 +- .../dubbo/samples/detail/DetailApplication2.java | 0 .../dubbo/samples/detail/DetailServiceImpl2.java | 1 - .../src/main/resources/application.properties | 20 +- .../pom.xml| 14 +- .../java/org/apache/dubbo/samples/ShopService.java | 0 .../dubbo-samples-metrics-demo-frontend}/pom.xml | 32 ++- .../dubbo/samples/frontend/BenchmarkClient.java| 5 +- .../samples/frontend/FrontEndApplication.java | 2 - .../dubbo/samples/frontend/ShopServiceImpl.java| 2 - .../samples/frontend/pages/WebController.java | 0 .../src/main/resources/application.properties | 18 +- .../src/main/resources/static/architecture.png | Bin .../src/main/resources/static/goods.png| Bin .../src/main/resources/static/jquery-3.6.3.min.js | 0 .../src/main/resources/templates/detail.ftl| 0 .../src/main/resources/templates/index.ftl | 0 .../dubbo-samples-metrics-demo-order-api}/pom.xml | 8 +- .../main/java/org/apache/dubbo/samples/Order.java | 0 .../java/org/apache/dubbo/samples/OrderDetail.java | 4 +- .../org/apache/dubbo/samples/OrderService.java | 0 .../dubbo-samples-metrics-demo-order-v1}/pom.xml | 31 ++- .../dubbo/samples/order/OrderApplicationV1.java| 0 .../dubbo/samples/order/OrderServiceImpl.java | 2 - .../src/main/resources/application.properties | 19 +- .../dubbo-samples-metrics-demo-order-v2}/pom.xml | 28 +- .../dubbo/samples/order/OrderApplicationV2.java| 0 .../dubbo/samples/order/OrderServiceImpl2.java | 2 - .../src/main/resources/application.properties | 19 +- .../dubbo-samples-metrics-demo-user-api}/pom.xml | 8 +- .../main/java/org/apache/dubbo/samples/User.java | 0 .../java/org/apache/dubbo/samples/UserService.java | 0 .../dubbo-samples-metrics-demo-user}/pom.xml | 26 +- .../apache/dubbo/samples/user/UserApplication.java | 0 .../apache/dubbo/samples/user/UserServiceImpl.java | 0 .../src/main/resources/application.properties | 17 +- .../pom.xml| 34 ++- .../.run/CommentApplication1.run.xml | 24 +- .../.run/CommentApplication2.run.xml | 24 +- .../.run/CommentApplicationGray.run.xml| 18 +-
[dubbo-samples] branch master updated: Bump jetty-server in /3-extensions/protocol/dubbo-samples-jetty (#826)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 025b1d09 Bump jetty-server in /3-extensions/protocol/dubbo-samples-jetty (#826) 025b1d09 is described below commit 025b1d09431bffc508d8d86521afb4a029097363 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed May 24 10:34:50 2023 +0800 Bump jetty-server in /3-extensions/protocol/dubbo-samples-jetty (#826) Bumps [jetty-server](https://github.com/eclipse/jetty.project) from 9.4.11.v20180605 to 10.0.14. - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.11.v20180605...jetty-10.0.14) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- 3-extensions/protocol/dubbo-samples-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3-extensions/protocol/dubbo-samples-jetty/pom.xml b/3-extensions/protocol/dubbo-samples-jetty/pom.xml index 143630bd..0bc4e212 100644 --- a/3-extensions/protocol/dubbo-samples-jetty/pom.xml +++ b/3-extensions/protocol/dubbo-samples-jetty/pom.xml @@ -212,7 +212,7 @@ org.eclipse.jetty jetty-server - 9.4.11.v20180605 + 10.0.14 org.eclipse.jetty - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (50fb2b7d -> 8431b5e0)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 50fb2b7d Merge pull request #844 from conghuhu/cgq add 8431b5e0 Add metrics task demo (#848) No new revisions were added by this update. Summary of changes: .../deploy/All.yml | 298 + .../pom.xml| 8 +- .../org/apache/dubbo/samples/CommentService.java | 0 .../dubbo-samples-metrics-demo-comment-v1}/pom.xml | 26 +- .../dubbo/samples/comment/CommentApplication.java | 0 .../dubbo/samples/comment/CommentServiceImpl.java | 0 .../src/main/resources/application.properties | 18 +- .../dubbo-samples-metrics-demo-comment-v2}/pom.xml | 26 +- .../dubbo/samples/comment/CommentApplication2.java | 0 .../dubbo/samples/comment/CommentServiceImpl2.java | 0 .../src/main/resources/application.properties | 18 +- .../dubbo-samples-metrics-demo-detail-api}/pom.xml | 8 +- .../org/apache/dubbo/samples/DetailService.java| 0 .../main/java/org/apache/dubbo/samples/Item.java | 0 .../dubbo-samples-metrics-demo-detail-v1}/pom.xml | 28 +- .../dubbo/samples/detail/DetailApplication.java| 0 .../dubbo/samples/detail/DetailServiceImpl.java| 1 - .../src/main/resources/application.properties | 21 +- .../dubbo-samples-metrics-demo-detail-v2}/pom.xml | 28 +- .../dubbo/samples/detail/DetailApplication2.java | 0 .../dubbo/samples/detail/DetailServiceImpl2.java | 1 - .../src/main/resources/application.properties | 20 +- .../pom.xml| 14 +- .../java/org/apache/dubbo/samples/ShopService.java | 0 .../dubbo-samples-metrics-demo-frontend}/pom.xml | 32 ++- .../dubbo/samples/frontend/BenchmarkClient.java| 5 +- .../samples/frontend/FrontEndApplication.java | 2 - .../dubbo/samples/frontend/ShopServiceImpl.java| 2 - .../samples/frontend/pages/WebController.java | 0 .../src/main/resources/application.properties | 18 +- .../src/main/resources/static/architecture.png | Bin .../src/main/resources/static/goods.png| Bin .../src/main/resources/static/jquery-3.6.3.min.js | 0 .../src/main/resources/templates/detail.ftl| 0 .../src/main/resources/templates/index.ftl | 1 - .../dubbo-samples-metrics-demo-order-api}/pom.xml | 8 +- .../main/java/org/apache/dubbo/samples/Order.java | 0 .../java/org/apache/dubbo/samples/OrderDetail.java | 4 +- .../org/apache/dubbo/samples/OrderService.java | 0 .../dubbo-samples-metrics-demo-order-v1}/pom.xml | 31 ++- .../dubbo/samples/order/OrderApplicationV1.java| 0 .../dubbo/samples/order/OrderServiceImpl.java | 2 - .../src/main/resources/application.properties | 19 +- .../dubbo-samples-metrics-demo-order-v2}/pom.xml | 28 +- .../dubbo/samples/order/OrderApplicationV2.java| 0 .../dubbo/samples/order/OrderServiceImpl2.java | 2 - .../src/main/resources/application.properties | 19 +- .../dubbo-samples-metrics-demo-user-api}/pom.xml | 8 +- .../main/java/org/apache/dubbo/samples/User.java | 0 .../java/org/apache/dubbo/samples/UserService.java | 0 .../dubbo-samples-metrics-demo-user}/pom.xml | 26 +- .../apache/dubbo/samples/user/UserApplication.java | 0 .../apache/dubbo/samples/user/UserServiceImpl.java | 0 .../src/main/resources/application.properties | 17 +- .../pom.xml| 34 ++- 10-task/pom.xml| 3 +- 56 files changed, 453 insertions(+), 323 deletions(-) copy 10-task/{dubbo-samples-shop => dubbo-samples-metrics-demo}/deploy/All.yml (74%) copy 10-task/{dubbo-samples-extensibility/dubbo-samples-extensibility-router-api => dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-api}/pom.xml (86%) copy 10-task/{dubbo-samples-shop/dubbo-samples-shop-comment-api => dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-api}/src/main/java/org/apache/dubbo/samples/CommentService.java (100%) copy 10-task/{dubbo-samples-shop/dubbo-samples-shop-comment-v1 => dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1}/pom.xml (79%) copy 10-task/{dubbo-samples-shop/dubbo-samples-shop-comment-v1 => dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1}/src/main/java/org/apache/dubbo/samples/comment/CommentApplication.java (100%) copy 10-task/{dubbo-samples-shop/dubbo-samples-shop-comment-v1 => dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1}/src/main/java/org/apache/dubbo/samples/comment/CommentServiceImpl.java (100%) copy 10-task/{dubbo-samples-shop/dubbo-samples-shop-comment-gray => dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1}/src/main/resources/application.prope
[dubbo-samples] branch master updated: Set timeout for memory server test (#843)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new aaebed9d Set timeout for memory server test (#843) aaebed9d is described below commit aaebed9d900dea397e33f1fe7646cc14315df57a Author: Albumen Kevin AuthorDate: Mon May 15 17:20:01 2023 +0800 Set timeout for memory server test (#843) --- .../src/main/java/org/apache/dubbo/samples/provider/Application.java| 2 ++ 1 file changed, 2 insertions(+) diff --git a/99-integration/dubbo-samples-memory-server/src/main/java/org/apache/dubbo/samples/provider/Application.java b/99-integration/dubbo-samples-memory-server/src/main/java/org/apache/dubbo/samples/provider/Application.java index 0b7dfb9d..aaf9d79d 100644 --- a/99-integration/dubbo-samples-memory-server/src/main/java/org/apache/dubbo/samples/provider/Application.java +++ b/99-integration/dubbo-samples-memory-server/src/main/java/org/apache/dubbo/samples/provider/Application.java @@ -35,9 +35,11 @@ public class Application { ServiceConfig service = new ServiceConfig<>(); service.setInterface(GreetingsService.class); service.setRef(new GreetingsServiceImpl()); +service.setTimeout(6); ServiceConfig qosService = new ServiceConfig<>(); qosService.setInterface(QosService.class); qosService.setRef(new QosServiceImpl()); +qosService.setTimeout(6); ApplicationConfig applicationConfig = new ApplicationConfig("first-dubbo-provider"); DubboBootstrap dubboBootstrap = DubboBootstrap.getInstance() - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch fix/memory_server created (now 051ab3ca)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch fix/memory_server in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git at 051ab3ca Set timeout for memory server test No new revisions were added by this update. - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Fix serialize check test
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 0faf0034 Fix serialize check test 0faf0034 is described below commit 0faf0034939ff97e9b0393b9ba9114899389147a Author: Albumen Kevin AuthorDate: Mon May 8 08:23:19 2023 +0800 Fix serialize check test --- .../src/main/java/org/apache/dubbo/samples/Provider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/99-integration/dubbo-samples-serialize-check/src/main/java/org/apache/dubbo/samples/Provider.java b/99-integration/dubbo-samples-serialize-check/src/main/java/org/apache/dubbo/samples/Provider.java index cd361b9e..96ba7d15 100644 --- a/99-integration/dubbo-samples-serialize-check/src/main/java/org/apache/dubbo/samples/Provider.java +++ b/99-integration/dubbo-samples-serialize-check/src/main/java/org/apache/dubbo/samples/Provider.java @@ -111,6 +111,7 @@ public class Provider { ApplicationConfig applicationConfig = new ApplicationConfig(); applicationConfig.setSerializeCheckStatus("STRICT"); +applicationConfig.setTrustSerializeClassLevel(3); applicationConfig.setName("provider"); DubboBootstrap.getInstance() .application(applicationConfig) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (a12de07a -> bd4af07e)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from a12de07a Update serialization config (#838) add bd4af07e docs & chore: update tracing doc & remove log4j (#839) No new revisions were added by this update. Summary of changes: 4-governance/dubbo-samples-spring-boot-tracing/README.md | 4 +++- .../dubbo-samples-spring-boot-tracing-consumer/pom.xml | 6 ++ .../src/main/resources/application.yml | 4 +++- .../src/main/resources/log4j.properties | 7 --- .../dubbo-samples-spring-boot-tracing-provider/pom.xml | 6 ++ .../src/main/resources/application.yml | 4 +++- .../src/main/resources/log4j.properties | 7 --- 4-governance/dubbo-samples-spring-boot-tracing/pom.xml | 16 .../dubbo-samples-spring-boot3-tracing/README.md | 4 +++- .../src/main/resources/application.yml | 4 +++- .../src/main/resources/log4j.properties | 7 --- .../src/main/resources/application.yml | 4 +++- .../src/main/resources/log4j.properties | 7 --- 4-governance/dubbo-samples-spring-boot3-tracing/pom.xml | 16 14 files changed, 30 insertions(+), 66 deletions(-) delete mode 100644 4-governance/dubbo-samples-spring-boot-tracing/dubbo-samples-spring-boot-tracing-consumer/src/main/resources/log4j.properties delete mode 100644 4-governance/dubbo-samples-spring-boot-tracing/dubbo-samples-spring-boot-tracing-provider/src/main/resources/log4j.properties delete mode 100644 4-governance/dubbo-samples-spring-boot3-tracing/dubbo-samples-spring-boot3-tracing-consumer/src/main/resources/log4j.properties delete mode 100644 4-governance/dubbo-samples-spring-boot3-tracing/dubbo-samples-spring-boot3-tracing-provider/src/main/resources/log4j.properties - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated: Update serialization config (#838)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new a12de07a Update serialization config (#838) a12de07a is described below commit a12de07a36b51b85dbd469cab4e11c4d0f9a7090 Author: Albumen Kevin AuthorDate: Mon May 8 07:12:12 2023 +0800 Update serialization config (#838) * Add child pojo to allow list * Set check level --- .../src/main/resources/security/serialize.allowlist | 19 +++ .../src/test/java/org/apache/dubbo/test/CheckIT.java | 11 ++- .../test/java/org/apache/dubbo/test/CheckIoIT.java| 17 + 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/3-extensions/protocol/dubbo-samples-triple/src/main/resources/security/serialize.allowlist b/3-extensions/protocol/dubbo-samples-triple/src/main/resources/security/serialize.allowlist new file mode 100644 index ..f08a259e --- /dev/null +++ b/3-extensions/protocol/dubbo-samples-triple/src/main/resources/security/serialize.allowlist @@ -0,0 +1,19 @@ +# +# +# 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. +# +# +org.apache.dubbo.sample.tri.api.ChildPojo diff --git a/99-integration/dubbo-samples-serialize-check/src/test/java/org/apache/dubbo/test/CheckIT.java b/99-integration/dubbo-samples-serialize-check/src/test/java/org/apache/dubbo/test/CheckIT.java index ef20db24..2ede188e 100644 --- a/99-integration/dubbo-samples-serialize-check/src/test/java/org/apache/dubbo/test/CheckIT.java +++ b/99-integration/dubbo-samples-serialize-check/src/test/java/org/apache/dubbo/test/CheckIT.java @@ -18,10 +18,6 @@ */ package org.apache.dubbo.test; -import java.lang.reflect.Proxy; -import java.util.Arrays; -import java.util.Map; - import org.apache.dubbo.common.beanutil.JavaBeanDescriptor; import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil; import org.apache.dubbo.common.utils.PojoUtils; @@ -36,18 +32,23 @@ import org.apache.dubbo.samples.NotSerializable; import org.apache.dubbo.samples.Parent; import org.apache.dubbo.samples.User; import org.apache.dubbo.samples.User2; + +import io.dubbo.test2.OthersSerializable; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import io.dubbo.test2.OthersSerializable; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.Map; public class CheckIT { @BeforeClass public static void setup() { ApplicationConfig applicationConfig = new ApplicationConfig(); applicationConfig.setSerializeCheckStatus("STRICT"); +applicationConfig.setTrustSerializeClassLevel(3); applicationConfig.setName("consumer"); DubboBootstrap.getInstance() .application(applicationConfig) diff --git a/99-integration/dubbo-samples-serialize-check/src/test/java/org/apache/dubbo/test/CheckIoIT.java b/99-integration/dubbo-samples-serialize-check/src/test/java/org/apache/dubbo/test/CheckIoIT.java index 4a9809a6..c26b2b59 100644 --- a/99-integration/dubbo-samples-serialize-check/src/test/java/org/apache/dubbo/test/CheckIoIT.java +++ b/99-integration/dubbo-samples-serialize-check/src/test/java/org/apache/dubbo/test/CheckIoIT.java @@ -18,10 +18,6 @@ */ package org.apache.dubbo.test; -import java.lang.reflect.Proxy; -import java.util.Arrays; -import java.util.Map; - import org.apache.dubbo.common.beanutil.JavaBeanDescriptor; import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil; import org.apache.dubbo.common.utils.PojoUtils; @@ -31,10 +27,6 @@ import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; import org.apache.dubbo.rpc.model.FrameworkModel; import org.apache.dubbo.rpc.service.GenericService; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; import io.dubbo.test.DemoService2; import io.dubbo.test.NotSerializable; @@ -42,12 +34,21 @@ import io.dubbo.test.Par
[dubbo-samples] branch master updated (eea34bfc -> 59750576)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from eea34bfc Refactor pom struct (#837) add 59750576 Fix dependencies bom (#840) No new revisions were added by this update. Summary of changes: .../dubbo-demo-servicediscovery-xml/pom.xml| 7 +++ 2-advanced/dubbo-samples-scala/pom.xml | 7 +++ 2 files changed, 14 insertions(+) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (28f00f20 -> eea34bfc)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 28f00f20 🎨 remove unused code (#836) add eea34bfc Refactor pom struct (#837) No new revisions were added by this update. Summary of changes: 1-basic/dubbo-samples-annotation/pom.xml | 44 +++- 1-basic/dubbo-samples-api/pom.xml | 2 +- .../dubbo-samples-spring-boot-consumer/pom.xml | 2 +- 1-basic/dubbo-samples-spring-boot/pom.xml | 2 +- 1-basic/dubbo-samples-spring-xml/pom.xml | 2 +- .../dubbo-samples-develop-consumer/pom.xml | 4 +- .../dubbo-samples-develop-provider/pom.xml | 4 +- .../pom.xml| 4 +- .../pom.xml| 4 +- .../pom.xml| 4 +- .../pom.xml| 4 +- .../pom.xml| 4 +- .../pom.xml| 4 +- .../pom.xml| 4 +- .../dubbo-samples-rpc-advanced-app-a/pom.xml | 2 +- .../dubbo-samples-rpc-advanced-app-b-v1/pom.xml| 2 +- .../dubbo-samples-rpc-advanced-app-b-v2/pom.xml| 2 +- .../dubbo-samples-rpc-advanced-app-c/pom.xml | 2 +- .../dubbo-samples-rpc-advanced-app-d/pom.xml | 2 +- .../dubbo-samples-rpc-basic-consumer/pom.xml | 4 +- .../dubbo-samples-rpc-basic-provider/pom.xml | 2 +- .../dubbo-samples-shop-comment-gray/pom.xml| 2 +- .../dubbo-samples-shop-comment-v1/pom.xml | 2 +- .../dubbo-samples-shop-comment-v2/pom.xml | 2 +- .../dubbo-samples-shop-detail-gray/pom.xml | 2 +- .../dubbo-samples-shop-detail-v1/pom.xml | 2 +- .../dubbo-samples-shop-detail-v2/pom.xml | 2 +- .../dubbo-samples-shop-frontend/pom.xml| 2 +- .../dubbo-samples-shop-order-gray/pom.xml | 2 +- .../dubbo-samples-shop-order-v1/pom.xml| 2 +- .../dubbo-samples-shop-order-v2/pom.xml| 2 +- .../dubbo-samples-shop-user-gray/pom.xml | 2 +- .../dubbo-samples-shop-user/pom.xml| 2 +- .../pom.xml| 2 +- .../pom.xml| 2 +- .../pom.xml| 4 +- .../dubbo-samples-async-generated-future/pom.xml | 51 - .../dubbo-samples-async-onerror/pom.xml| 123 + .../dubbo-samples-async-original-future/pom.xml| 51 - .../case-configuration.yml | 1 - .../dubbo-samples-async-provider/pom.xml | 50 - .../dubbo-samples-async-simple-boot/pom.xml| 4 +- .../dubbo-samples-async-simple/pom.xml | 51 - .../dubbo-samples-attachment-consumer/pom.xml | 2 +- .../dubbo-samples-attachment-provider/pom.xml | 2 +- 2-advanced/dubbo-samples-attachment/pom.xml| 4 +- .../dubbo-samples-autowire-consumer/pom.xml| 2 +- 2-advanced/dubbo-samples-autowire/pom.xml | 2 +- .../dubbo-samples-cache-consumer/pom.xml | 2 +- .../dubbo-samples-cache-provider/pom.xml | 2 +- 2-advanced/dubbo-samples-cache/pom.xml | 4 +- .../dubbo-samples-callback-consumer/pom.xml| 2 +- .../dubbo-samples-callback-provider/pom.xml| 2 +- 2-advanced/dubbo-samples-callback/pom.xml | 4 +- 2-advanced/dubbo-samples-chain/pom.xml | 6 +- .../dubbo-scdubbo-provider2/pom.xml| 2 + .../dubbo-demo-servicediscovery-xml/pom.xml| 2 +- .../servicediscovery-provider/pom.xml | 2 + .../dubbo-servicediscovery-migration/pom.xml | 8 +- .../sc-call-dubbo/sc-dubbo-provider/pom.xml| 2 + .../servicediscovery-transfer/pom.xml | 10 +- .../pom.xml| 2 + .../servicediscovery-transfer-provider/pom.xml | 2 + 2-advanced/dubbo-samples-compatible/pom.xml| 50 - 2-advanced/dubbo-samples-context/pom.xml | 49 +++- 2-advanced/dubbo-samples-direct/pom.xml| 6 +- 2-advanced/dubbo-samples-docker/pom.xml| 6 +- .../dubbo-samples-echo-consumer/pom.xml| 4 +- .../dubbo-samples-echo-provider/pom.xml| 53 + 2-advanced/dubbo-samples-echo/pom.xml | 10 +- 2-advanced/dubbo-samples-environment-keys/pom.xml | 50 - .../dubbo-samples-generic-call-consumer/pom.xml| 2 +- .../dubbo-samples-generic-call-provider/pom.xml| 2 +- .../dubbo-samples-generic-call/pom.xml | 4 +- .../dubbo-samples-generic-impl-consumer/pom.xml| 2 +- .../dubbo
[dubbo-samples] branch master updated: 🎨 remove unused code (#836)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git The following commit(s) were added to refs/heads/master by this push: new 28f00f20 🎨 remove unused code (#836) 28f00f20 is described below commit 28f00f2014933e3211cb31efb9203dd168e61936 Author: songxiaosheng AuthorDate: Fri May 5 21:08:13 2023 +0800 🎨 remove unused code (#836) * :memo: upgrade metrics doc * :memo: upgrade metrics doc * :bug: start need wait * :art: remove unused code --- .../src/main/resources/application.properties | 4 1 file changed, 4 deletions(-) diff --git a/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.properties b/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.properties index 0bb33f39..c500a319 100644 --- a/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.properties +++ b/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.properties @@ -10,8 +10,4 @@ server.port=18080 dubbo.application.name=metrics-provider dubbo.registry.address=zookeeper://${ZOOKEEPER_ADDRESS:127.0.0.1}:2181 dubbo.metrics.protocol=prometheus -#如果不使用spring-boot-actuator 可使用下面配置 #dubbo.metrics.enable-jvm-metrics=true -#dubbo.metrics.prometheus.exporter.enabled=true -#dubbo.metrics.prometheus.exporter.metrics-port=20888 -#prometheus.exporter.metrics.path=/prometheus \ No newline at end of file - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org
[dubbo-samples] branch master updated (9945e604 -> 9b5735b0)
This is an automated email from the ASF dual-hosted git repository. albumenj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git from 9945e604 Add memory bench for one server many client (#833) add 9b5735b0 Add test cases to verify apache/dubbo#12208 (#834) No new revisions were added by this update. Summary of changes: .../case-configuration.yml | 5 +- .../case-versions.conf | 0 .../dubbo-samples-test-12208-api}/pom.xml | 18 +- .../test/config/ApplicationConfigDelegate.java | 186 ++ .../dubbo/test/config/ArgumentConfigDelegate.java | 48 +- .../dubbo/test/config/ConsumerConfigDelegate.java | 451 ++ .../dubbo/test/config/MethodConfigDelegate.java| 276 + .../dubbo/test/config/ModuleConfigDelegate.java| 118 .../dubbo/test/config/MonitorConfigDelegate.java | 121 .../dubbo/test/config/ProtocolConfigDelegate.java | 328 ++ .../dubbo/test/config/ProviderConfigDelegate.java | 673 + .../dubbo/test/config/ReferenceConfigDelegate.java | 485 +++ .../dubbo/test/config/RegistryConfigDelegate.java | 231 +++ .../dubbo/test/config/ServiceConfigDelegate.java | 564 + .../dubbo-samples-test-12208-test}/pom.xml | 51 +- .../src/main/java/org/apache/dubbo}/FakeMain.java | 2 +- .../org/apache/dubbo/test/config/DelegateIT.java | 99 +++ .../pom.xml| 35 +- 99-integration/pom.xml | 1 + 19 files changed, 3619 insertions(+), 73 deletions(-) copy 99-integration/{dubbo-samples-empty-protection => dubbo-samples-test-12208}/case-configuration.yml (94%) copy 99-integration/{dubbo-samples-prefer-serialization-test-31x => dubbo-samples-test-12208}/case-versions.conf (100%) copy 99-integration/{dubbo-samples-nacos-merge/dubbo-samples-nacos-merge-api => dubbo-samples-test-12208/dubbo-samples-test-12208-api}/pom.xml (69%) create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/ApplicationConfigDelegate.java copy 2-advanced/dubbo-samples-compatible/src/main/java/org/apache/dubbo/samples/basic/api/User.java => 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/ArgumentConfigDelegate.java (50%) create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/ConsumerConfigDelegate.java create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/MethodConfigDelegate.java create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/ModuleConfigDelegate.java create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/MonitorConfigDelegate.java create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/ProtocolConfigDelegate.java create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/ProviderConfigDelegate.java create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/ReferenceConfigDelegate.java create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/RegistryConfigDelegate.java create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-api/src/main/java/org/apache/dubbo/test/config/ServiceConfigDelegate.java copy {2-advanced/dubbo-samples-merge/dubbo-samples-merge-consumer1 => 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-test}/pom.xml (75%) copy 99-integration/{dubbo-samples-test-11096/src/main/java/org/apache/dubbo/samples => dubbo-samples-test-12208/dubbo-samples-test-12208-test/src/main/java/org/apache/dubbo}/FakeMain.java (96%) create mode 100644 99-integration/dubbo-samples-test-12208/dubbo-samples-test-12208-test/src/test/java/org/apache/dubbo/test/config/DelegateIT.java copy 99-integration/{dubbo-samples-sd-merge => dubbo-samples-test-12208}/pom.xml (75%) - To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org