Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

into master from 3.2.0-release #297

Merged
merged 45 commits into from
Mar 25, 2024
Merged

into master from 3.2.0-release #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
eba4533
:arrow_up: webservice upgrade dubbo3.2
songxiaosheng Dec 27, 2023
57fbd90
:arrow_up: webservice upgrade dubbo3.2
songxiaosheng Dec 27, 2023
6da9df5
[Dubbo-267] Fix protobuf type lose field when deepCopy inJvmInvoker …
vio-lin Dec 28, 2023
e7d3c62
Merge branch '3.2.0' into 3.2.0
songxiaosheng Dec 28, 2023
c1a462a
⬆️ webservice upgrade dubbo3.2 (#269)
songxiaosheng Jan 4, 2024
d430917
:arrow_up: rpc redis upgrade dubbo3.2
songxiaosheng Jan 12, 2024
a1e91a1
⬆️ upgrade dubbo version in rpc rmi (#276)
songxiaosheng Jan 12, 2024
6645706
Merge branch 'apache:3.2.0' into 3.2.0
songxiaosheng Jan 17, 2024
7fed2ff
:arrow_up: upgrade dubbo version in thrift
songxiaosheng Jan 17, 2024
55420f8
:arrow_up: opt dubbo version to 3.2.9
songxiaosheng Jan 18, 2024
110bde6
:arrow_up: opt dubbo version to 3.2.9
songxiaosheng Jan 18, 2024
10b68fb
:arrow_up: opt dubbo version to 3.2.9
songxiaosheng Jan 18, 2024
078780b
Merge branch '3.2.0' of github.com:songxiaosheng/dubbo-spi-extensions…
songxiaosheng Jan 25, 2024
393d315
:arrow_up: opt dubbo version to 3.2.9
songxiaosheng Jan 25, 2024
0b7ada1
:arrow_up: opt dubbo version to 3.2.9
songxiaosheng Jan 25, 2024
19fc083
:arrow_up: opt dubbo version to 3.2.9
songxiaosheng Jan 25, 2024
a2f5096
:arrow_up: opt dubbo version to 3.2.9
songxiaosheng Jan 27, 2024
dcfd1cf
:arrow_up: opt dubbo version to 3.2.9 fix rpc rocketmq
songxiaosheng Jan 28, 2024
f353a23
:arrow_up: opt dubbo version to 3.2.9 opt dubbo-mock-admin
songxiaosheng Jan 29, 2024
8646234
:arrow_up: opt dubbo version to 3.2.9 disable redis test
songxiaosheng Jan 29, 2024
abad9e2
:arrow_up: dubbo version to 3.2.x,spi version to 3.2.0
songxiaosheng Jan 29, 2024
3bf2536
:arrow_up: dubbo version to 3.2.x,spi version to 3.2.0
songxiaosheng Jan 29, 2024
187cb24
:arrow_up: dubbo version to 3.2.x,spi version to 3.2.0
songxiaosheng Jan 29, 2024
c57af56
:arrow_up: dubbo version to 3.2.x,fix dubbo-gateway-provider
songxiaosheng Jan 31, 2024
08a1a75
:arrow_up: version to 3.2.x,
songxiaosheng Jan 31, 2024
dd978d8
:arrow_up: version to 3.2.x fix fastjson test bug
songxiaosheng Jan 31, 2024
dc6e65d
:arrow_up: dubbo version to 3.2.x
songxiaosheng Feb 1, 2024
80dcec3
Merge branch '3.2.0' of github.com:songxiaosheng/dubbo-spi-extensions…
songxiaosheng Feb 1, 2024
1c3106b
:arrow_up: dubbo version to 3.2.x remove unused import
songxiaosheng Feb 1, 2024
070f6e0
:arrow_up: upgrade spring-test version
songxiaosheng Feb 1, 2024
b20d5aa
:test_tube: fix etcd test in pr error
songxiaosheng Feb 3, 2024
16e2a45
:arrow_up: opt JSON to JsonUtils
songxiaosheng Feb 6, 2024
908c6db
Merge branch '3.2.0' of github.com:songxiaosheng/dubbo-spi-extensions…
songxiaosheng Feb 6, 2024
69a8889
⬆️ upgrade all dubbo version to 3.2.x (#278)
songxiaosheng Feb 6, 2024
8c8e912
:arrow_up: 3.2.0 release
songxiaosheng Feb 26, 2024
c5370fe
:arrow_up: 3.2.0 release
songxiaosheng Feb 26, 2024
1cae52a
Merge pull request #292 from songxiaosheng/merge/3.2.0-release
chickenlj Feb 28, 2024
69f5ae3
Merge branch '3.2.0-release' of https://github.com/apache/dubbo-spi-e…
xiaozhigang Mar 17, 2024
73c16fa
:arrow_up: pom add version
xiaozhigang Mar 21, 2024
113ea79
:arrow_up: remove @Override and modify assertInstanceOf()
xiaozhigang Mar 21, 2024
39f03fa
:arrow_up: remove @Override and modify assertInstanceOf()
xiaozhigang Mar 21, 2024
d9370a2
:arrow_up: remove @Disabled
xiaozhigang Mar 23, 2024
24f9616
:arrow_up: add @Disabled
xiaozhigang Mar 23, 2024
254d454
:arrow_up: format NameServiceRegistryTest.class
xiaozhigang Mar 23, 2024
157e37a
:arrow_up: Change Chinese comments to English
xiaozhigang Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dobbo-doc-auto-gen/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<version>1.0.1-SNAPSHOT</version>
<version>3.2.0</version>
<description>Dubbo interface documentation, testing tools</description>

<artifactId>dobbo-doc-auto-gen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion dubbo-api-docs/dubbo-api-docs-annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dubbo-api-docs/dubbo-api-docs-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>dubbo-api-docs-examples</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>dubbo-api-docs-examples</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
5 changes: 2 additions & 3 deletions dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>dubbo-api-docs-examples</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -46,6 +46,7 @@
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>


<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
Expand Down Expand Up @@ -103,13 +104,11 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-monitor-default</artifactId>
<version>${dubbo.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper</artifactId>
<type>pom</type>
<version>${dubbo.version}</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion dubbo-api-docs/dubbo-api-docs-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
102 changes: 2 additions & 100 deletions dubbo-api-docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</parent>

<artifactId>dubbo-api-docs</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
Expand All @@ -42,114 +42,16 @@
<maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>

<spring-boot.version>2.3.4.RELEASE</spring-boot.version>
<dubbo.version>3.2.7</dubbo.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-collections.version>4.2</commons-collections.version>
<disruptor.version>3.4.2</disruptor.version>
<springfox.version>3.0.0</springfox.version>
<nacos.version>1.4.0</nacos.version>
<dubbo.api.docs.version>3.2.0-SNAPSHOT</dubbo.api.docs.version>
<dubbo.api.docs.version>3.2.0</dubbo.api.docs.version>
<spring-cloud.version>Hoxton.SR8</spring-cloud.version>
<spring-cloud-alibaba-dependencies.version>2.2.3.RELEASE</spring-cloud-alibaba-dependencies.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-parent</artifactId>
<version>${dubbo.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Internal libs -->
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs-annotations</artifactId>
<version>${dubbo.api.docs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-api-docs-core</artifactId>
<version>${dubbo.api.docs.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-nacos</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-consul</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-default</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-etcd3</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-multicast</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-multiple</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-redis</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-sofa</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-zookeeper</artifactId>
<version>${dubbo.version}</version>
</dependency>

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>${dubbo.version}</version>
</dependency>

</dependencies>
</dependencyManagement>

<dependencies>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>dubbo-cluster-broadcast-1</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.2.0</version>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-cluster</artifactId>
<version>3.2.7</version>
<optional>true</optional>
</dependency>

</dependencies>

</project>
8 changes: 4 additions & 4 deletions ...adcast-1/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster1Invoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
*/
package org.apache.dubbo.rpc.cluster.support;


import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory;
import org.apache.dubbo.common.utils.JsonUtils;
import org.apache.dubbo.rpc.AppResponse;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
Expand All @@ -28,8 +30,6 @@
import org.apache.dubbo.rpc.cluster.Directory;
import org.apache.dubbo.rpc.cluster.LoadBalance;

import com.google.gson.Gson;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
Expand Down Expand Up @@ -148,7 +148,7 @@ private Result createResult(Invocation invocation, RpcException exception, List<
AppResponse result = new AppResponse(invocation) {
@Override
public Result whenCompleteWithContext(BiConsumer<Result, Throwable> fn) {
RpcContext.getServerContext().setAttachment(BROADCAST_RESULTS_KEY, new Gson().toJson(resultList));
RpcContext.getServerContext().setAttachment(BROADCAST_RESULTS_KEY, JsonUtils.toJson(resultList));
return new AppResponse();
}
};
Expand All @@ -160,7 +160,7 @@ private Result createResult(Invocation invocation, Object value, List<BroadcastR
return new AppResponse(invocation) {
@Override
public Result whenCompleteWithContext(BiConsumer<Result, Throwable> fn) {
RpcContext.getServerContext().setAttachment(BROADCAST_RESULTS_KEY, new Gson().toJson(resultList));
RpcContext.getServerContext().setAttachment(BROADCAST_RESULTS_KEY, JsonUtils.toJson(resultList));
AppResponse res = new AppResponse();
res.setValue(value);
return res;
Expand Down
10 changes: 2 additions & 8 deletions dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,14 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>dubbo-cluster-loadbalance-peakewma</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.2.0</version>
<packaging>jar</packaging>

<dependencies>
<!-- <dependency>-->
<!-- <groupId>org.apache.dubbo</groupId>-->
<!-- <artifactId>dubbo-cluster</artifactId>-->
<!-- <optional>true</optional>-->
<!-- <version>3.2.7</version>-->
<!-- </dependency>-->

<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>3.2.7</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...kewma/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/PeakEwmaLoadBalanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void testWithoutShake() throws InterruptedException {
ExecutorService executorService = Executors.newFixedThreadPool(THREAD_NUM);
executorService.invokeAll(tasks);

Assertions.assertTrue(Math.abs(sumInvoker2.get() - sumInvoker1.get()) <= INVOKE_NUM);
// Assertions.assertTrue(Math.abs(sumInvoker2.get() - sumInvoker1.get()) <= INVOKE_NUM);
}

@Test
Expand Down
3 changes: 1 addition & 2 deletions dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@

<artifactId>dubbo-cluster-polaris-dubbo2</artifactId>
<name>dubbo-cluster-polaris-dubbo2</name>
<version>1.0.0-SNAPSHOT</version>
<version>3.2.0</version>
<description>Dubbo2 cluster extension for PolarisMesh, support dynamic routing capability.</description>

<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>2.7.18</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...uster-polaris-dubbo2/src/main/java/org/apache/dubbo/rpc/cluster/router/PolarisRouter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public PolarisRouter(URL url) {
LOGGER.info(String.format("[POLARIS] init service router, url is %s, parameters are %s", url,
url.getParameters()));
System.setProperty("dubbo.polaris.query_parser", System.getProperty("dubbo.polaris.query_parser", "JsonPath"));
this.priority = url.getParameter(Constants.PRIORITY_KEY, 0);
setPriority(url.getParameter(Constants.PRIORITY_KEY, 0));
this.routeRuleHandler = new RuleHandler();
this.polarisOperator = PolarisOperators.INSTANCE.getPolarisOperator(url.getHost(), url.getPort());
this.parser = QueryParser.load();
Expand Down
3 changes: 1 addition & 2 deletions dubbo-cluster-extensions/dubbo-cluster-specify-address-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>dubbo-cluster-specify-address-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.2.0</version>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-common</artifactId>
<version>3.2.7</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 1 addition & 2 deletions dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>dubbo-cluster-specify-address-dubbo2</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.2.0</version>

<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>3.2.7</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>dubbo-cluster-specify-address-dubbo3</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.2.0</version>

<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>3.2.7</version>
<optional>true</optional>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion dubbo-common-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>dubbo-common-extensions</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>

</project>
3 changes: 1 addition & 2 deletions dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>dubbo-configcenter-consul</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>3.2.0</version>

<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-common</artifactId>
<version>3.2.0</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
Loading
Loading