You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/05/08 00:07:46 UTC
[dubbo] branch 3.3 updated (471f44b52d -> 9f0e1589a5)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from 471f44b52d fix: fix inappropriate invoke in unsubscribe retry task (#12231)
add c5f8ce6478 auto detect proxy type (#12232)
add 8b65828767 degist-concurrency-bugfix (#12223)
add 0a7a960f39 Default heartbeat configurable (#12241)
add 7f86a8cc56 fix: fix inappropriate invoke in unsubscribe retry task (#12235)
add 86b5a3e590 Bump fastjson2 version from 2.0.29 to 2.0.31 (#12250)
add da9fbbdbf8 fix #12233 redis cluster not support password bug. (#12240)
add 838b7c9c4b Generic bugfix in bean mode (#12249)
add 796e9ec9b6 fix: fix mutiple tracing config (#12247)
add ed6afe1ac3 Use bom mode flatten (#12239)
new 9f0e1589a5 Merge branch 'apache-3.2' into apache-3.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.licenserc.yaml | 6 +-
NOTICE | 4 +
...opeModelDestroyListener.java => DubboStub.java} | 12 +-
.../main/resources/Dubbo3InterfaceStub.mustache | 2 +-
.../resources/Dubbo3TripleInterfaceStub.mustache | 2 +-
.../src/main/resources/DubboStub.mustache | 2 +-
.../src/main/resources/DubboStub3Single.mustache | 2 +-
.../ReactorDubbo3TripleInterfaceStub.mustache | 2 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 7 +
.../annotation/DubboConfigConfiguration.java | 2 +-
.../dubbo-demo-annotation-consumer/pom.xml | 14 +-
.../dubbo-demo-annotation-provider/pom.xml | 12 +
.../dubbo-demo-api/dubbo-demo-api-consumer/pom.xml | 12 +
.../dubbo-demo-api/dubbo-demo-api-provider/pom.xml | 12 +
dubbo-demo/dubbo-demo-generic-call/pom.xml | 12 +
dubbo-demo/dubbo-demo-interface/pom.xml | 1 +
.../dubbo-demo-native-consumer/pom.xml | 91 +++
.../dubbo-demo-native-provider/pom.xml | 92 +++
.../dubbo-demo-spring-boot-consumer/pom.xml | 10 +
.../dubbo-demo-spring-boot-provider/pom.xml | 9 +
dubbo-demo/dubbo-demo-triple/pom.xml | 16 +
.../dubbo-demo-jaxrs-rest-consumer/pom.xml | 14 +
.../dubbo-demo-jaxrs-rest-provider/pom.xml | 14 +
.../dubbo-demo-spring-mvc-rest-consumer/pom.xml | 14 +
.../dubbo-demo-spring-mvc-rest-provider/pom.xml | 14 +
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 14 +
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 16 +
dubbo-dependencies-bom/pom.xml | 4 +-
dubbo-dependencies/pom.xml | 29 +
dubbo-distribution/dubbo-bom/pom.xml | 31 +
.../metadata/store/redis/RedisMetadataReport.java | 9 +-
.../metrics/aggregate/DubboAbstractTDigest.java | 86 +++
.../metrics/aggregate/DubboMergingDigest.java | 851 +++++++++++++++++++++
.../metrics/aggregate/TimeWindowQuantile.java | 6 +-
.../metrics/aggregate/TimeWindowQuantileTest.java | 26 +
.../java/org/apache/dubbo/remoting/Constants.java | 1 +
.../org/apache/dubbo/remoting/utils/UrlUtils.java | 11 +-
.../apache/dubbo/remoting/utils/UrlUtilsTest.java | 9 +
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 22 +-
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 12 +-
dubbo-test/dubbo-dependencies-all/pom.xml | 75 ++
dubbo-test/dubbo-test-check/pom.xml | 1 +
dubbo-test/dubbo-test-common/pom.xml | 5 +-
dubbo-test/dubbo-test-modules/pom.xml | 1 +
dubbo-test/dubbo-test-spring/pom.xml | 16 +-
dubbo-test/dubbo-test-spring3.2/pom.xml | 2 +-
dubbo-test/dubbo-test-spring4.1/pom.xml | 2 +-
dubbo-test/dubbo-test-spring4.2/pom.xml | 2 +-
dubbo-test/pom.xml | 2 +-
pom.xml | 4 +-
50 files changed, 1567 insertions(+), 48 deletions(-)
copy dubbo-common/src/main/java/org/apache/dubbo/rpc/model/{ScopeModelDestroyListener.java => DubboStub.java} (83%)
create mode 100644 dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/DubboAbstractTDigest.java
create mode 100644 dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/DubboMergingDigest.java
[dubbo] 01/01: Merge branch 'apache-3.2' into apache-3.3
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 9f0e1589a54c62e0997f0562e9113b75945f0a92
Merge: 471f44b52d ed6afe1ac3
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon May 8 08:07:10 2023 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# .licenserc.yaml
.licenserc.yaml | 6 +-
NOTICE | 4 +
.../java/org/apache/dubbo/rpc/model/DubboStub.java | 22 +-
.../main/resources/Dubbo3InterfaceStub.mustache | 2 +-
.../resources/Dubbo3TripleInterfaceStub.mustache | 2 +-
.../src/main/resources/DubboStub.mustache | 2 +-
.../src/main/resources/DubboStub3Single.mustache | 2 +-
.../ReactorDubbo3TripleInterfaceStub.mustache | 2 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 7 +
.../annotation/DubboConfigConfiguration.java | 2 +-
.../dubbo-demo-annotation-consumer/pom.xml | 14 +-
.../dubbo-demo-annotation-provider/pom.xml | 12 +
.../dubbo-demo-api/dubbo-demo-api-consumer/pom.xml | 12 +
.../dubbo-demo-api/dubbo-demo-api-provider/pom.xml | 12 +
dubbo-demo/dubbo-demo-generic-call/pom.xml | 12 +
dubbo-demo/dubbo-demo-interface/pom.xml | 1 +
.../dubbo-demo-native-consumer/pom.xml | 91 +++
.../dubbo-demo-native-provider/pom.xml | 92 +++
.../dubbo-demo-spring-boot-consumer/pom.xml | 10 +
.../dubbo-demo-spring-boot-provider/pom.xml | 9 +
dubbo-demo/dubbo-demo-triple/pom.xml | 16 +
.../dubbo-demo-jaxrs-rest-consumer/pom.xml | 14 +
.../dubbo-demo-jaxrs-rest-provider/pom.xml | 14 +
.../dubbo-demo-spring-mvc-rest-consumer/pom.xml | 14 +
.../dubbo-demo-spring-mvc-rest-provider/pom.xml | 14 +
.../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 14 +
.../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 16 +
dubbo-dependencies-bom/pom.xml | 4 +-
dubbo-dependencies/pom.xml | 29 +
dubbo-distribution/dubbo-bom/pom.xml | 31 +
.../metadata/store/redis/RedisMetadataReport.java | 9 +-
.../metrics/aggregate/DubboAbstractTDigest.java | 86 +++
.../metrics/aggregate/DubboMergingDigest.java | 851 +++++++++++++++++++++
.../metrics/aggregate/TimeWindowQuantile.java | 6 +-
.../metrics/aggregate/TimeWindowQuantileTest.java | 26 +
.../java/org/apache/dubbo/remoting/Constants.java | 1 +
.../org/apache/dubbo/remoting/utils/UrlUtils.java | 11 +-
.../apache/dubbo/remoting/utils/UrlUtilsTest.java | 9 +
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 22 +-
.../apache/dubbo/rpc/filter/GenericImplFilter.java | 12 +-
dubbo-test/dubbo-dependencies-all/pom.xml | 75 ++
dubbo-test/dubbo-test-check/pom.xml | 1 +
dubbo-test/dubbo-test-common/pom.xml | 5 +-
dubbo-test/dubbo-test-modules/pom.xml | 1 +
dubbo-test/dubbo-test-spring/pom.xml | 16 +-
dubbo-test/dubbo-test-spring3.2/pom.xml | 2 +-
dubbo-test/dubbo-test-spring4.1/pom.xml | 2 +-
dubbo-test/dubbo-test-spring4.2/pom.xml | 2 +-
dubbo-test/pom.xml | 2 +-
pom.xml | 4 +-
50 files changed, 1567 insertions(+), 58 deletions(-)
diff --cc .licenserc.yaml
index 246f8b2db8,f19fa8a6d0..6996c1fb2d
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@@ -97,9 -97,10 +97,11 @@@ header
- 'dubbo-maven-plugin/src/main/java/org/apache/dubbo/maven/plugin/aot/RunArguments.java'
- 'dubbo-maven-plugin/src/main/java/org/apache/dubbo/maven/plugin/aot/RunProcess.java'
- 'dubbo-native/src/main/java/org/apache/dubbo/aot/generate/BasicJsonWriter.java'
- - 'dubbo-native/src/main/java/org/apache/dubbo/aot/api/ExecutableMode.java'
- - 'dubbo-native/src/main/java/org/apache/dubbo/aot/api/MemberCategory.java'
+ - 'dubbo-native/src/main/java/org/apache/dubbo/aot/generate/ExecutableMode.java'
+ - 'dubbo-native/src/main/java/org/apache/dubbo/aot/generate/MemberCategory.java'
+ - 'dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/DubboMergingDigest.java'
+ - 'dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/DubboAbstractTDigest.java'
+ - 'dubbo-annotation-processor/src/main/java/org/apache/dubbo/annotation/permit/**'
comment: on-failure
diff --cc dubbo-test/dubbo-dependencies-all/pom.xml
index 30da17a3b1,d98a49f720..590ccb51a3
--- a/dubbo-test/dubbo-dependencies-all/pom.xml
+++ b/dubbo-test/dubbo-dependencies-all/pom.xml
@@@ -65,11 -70,8 +70,12 @@@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-config-spring</artifactId>
+ <version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-config-spring6</artifactId>
+ </dependency>
<!-- config-center -->
<dependency>