You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/04/02 06:37:10 UTC
[shardingsphere] branch master updated: Update seata-all and netty to fix nativeTest in GraalVM Native Build Tools (#24929)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 11139ce4e0b Update seata-all and netty to fix nativeTest in GraalVM Native Build Tools (#24929)
11139ce4e0b is described below
commit 11139ce4e0b441f8cbf4c1c1551494b611d7067c
Author: Ling Hengqian <li...@outlook.com>
AuthorDate: Sun Apr 2 14:37:01 2023 +0800
Update seata-all and netty to fix nativeTest in GraalVM Native Build Tools (#24929)
---
.../proxy-native/src/main/release-docs/LICENSE | 28 +++++++++++-----------
distribution/proxy/src/main/release-docs/LICENSE | 28 +++++++++++-----------
examples/pom.xml | 2 +-
kernel/transaction/type/base/seata-at/pom.xml | 8 ++++++-
...eataATShardingSphereTransactionManagerTest.java | 4 ++--
.../base/seata/at/fixture/MockMessageHandler.java | 15 ++++++++++++
pom.xml | 2 +-
7 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE
index bc13f9c89c4..e8873890563 100644
--- a/distribution/proxy-native/src/main/release-docs/LICENSE
+++ b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -270,20 +270,20 @@ The text of each license is the standard Apache 2.0 license.
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
memory 0.9.0, Apache 2.0
- netty-buffer 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-codec 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-codec-http 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-codec-http2 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-codec-socks 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-common 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-handler 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-handler-proxy 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-resolver 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-transport 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-transport-classes-epoll 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-transport-native-epoll 4.1.87.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
- netty-transport-native-epoll 4.1.87.Final-linux-x86_64: https://github.com/netty, Apache 2.0
- netty-transport-native-unix-common 4.1.87.Final: https://github.com/netty, Apache 2.0
+ netty-buffer 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-codec 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http2 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-codec-socks 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-common 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-handler 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-handler-proxy 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-resolver 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-transport 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-transport-classes-epoll 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.90.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.90.Final-linux-x86_64: https://github.com/netty, Apache 2.0
+ netty-transport-native-unix-common 4.1.90.Final: https://github.com/netty, Apache 2.0
perfmark-api 0.23.0: https://github.com/perfmark/perfmark, Apache 2.0
proto-google-common-protos 2.0.1: https://github.com/googleapis/common-protos-java, Apache 2.0
proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0
diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE
index 1f41fb44eff..0953b098706 100644
--- a/distribution/proxy/src/main/release-docs/LICENSE
+++ b/distribution/proxy/src/main/release-docs/LICENSE
@@ -268,20 +268,20 @@ The text of each license is the standard Apache 2.0 license.
json-simple 1.1.1: https://code.google.com/archive/p/json-simple/, Apache 2.0
jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
memory 0.9.0, Apache 2.0
- netty-buffer 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-codec 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-codec-http 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-codec-http2 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-codec-socks 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-common 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-handler 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-handler-proxy 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-resolver 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-transport 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-transport-classes-epoll 4.1.87.Final: https://github.com/netty, Apache 2.0
- netty-transport-native-epoll 4.1.87.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
- netty-transport-native-epoll 4.1.87.Final-linux-x86_64: https://github.com/netty, Apache 2.0
- netty-transport-native-unix-common 4.1.87.Final: https://github.com/netty, Apache 2.0
+ netty-buffer 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-codec 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http2 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-codec-socks 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-common 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-handler 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-handler-proxy 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-resolver 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-transport 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-transport-classes-epoll 4.1.90.Final: https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.90.Final-linux-aarch_64: https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.90.Final-linux-x86_64: https://github.com/netty, Apache 2.0
+ netty-transport-native-unix-common 4.1.90.Final: https://github.com/netty, Apache 2.0
perfmark-api 0.25.0: https://github.com/perfmark/perfmark, Apache 2.0
proto-google-common-protos 2.9.0: https://github.com/googleapis/common-protos-java, Apache 2.0
proj4j 1.1.5: https://github.com/locationtech/proj4j, Apache 2.0
diff --git a/examples/pom.xml b/examples/pom.xml
index deb7d0eee59..f4564d4d0b2 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -60,7 +60,7 @@
<jboss-logging.version>3.2.1.Final</jboss-logging.version>
<btm.version>2.1.3</btm.version>
- <seata.version>1.4.2</seata.version>
+ <seata.version>1.6.1</seata.version>
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
diff --git a/kernel/transaction/type/base/seata-at/pom.xml b/kernel/transaction/type/base/seata-at/pom.xml
index 23e84be1177..d76ae4af5cc 100644
--- a/kernel/transaction/type/base/seata-at/pom.xml
+++ b/kernel/transaction/type/base/seata-at/pom.xml
@@ -28,7 +28,7 @@
<name>${project.artifactId}</name>
<properties>
- <seata.version>1.4.2</seata.version>
+ <seata.version>1.6.1</seata.version>
</properties>
<dependencies>
@@ -61,5 +61,11 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
index 95841df293b..f69f209ce44 100644
--- a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
+++ b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
@@ -20,10 +20,10 @@ package org.apache.shardingsphere.transaction.base.seata.at;
import io.seata.core.context.RootContext;
import io.seata.core.protocol.MergeResultMessage;
import io.seata.core.protocol.MergedWarpMessage;
-import io.seata.core.protocol.RegisterRMRequest;
import io.seata.core.protocol.RegisterRMResponse;
import io.seata.core.protocol.RegisterTMRequest;
import io.seata.core.protocol.RegisterTMResponse;
+import io.seata.core.protocol.transaction.GlobalBeginRequest;
import io.seata.core.rpc.netty.RmNettyRemotingClient;
import io.seata.core.rpc.netty.TmNettyRemotingClient;
import io.seata.rm.datasource.ConnectionProxy;
@@ -160,8 +160,8 @@ class SeataATShardingSphereTransactionManagerTest {
private void assertResult() {
int requestQueueSize = requestQueue.size();
if (3 == requestQueueSize) {
- assertThat(requestQueue.poll(), instanceOf(RegisterRMRequest.class));
assertThat(requestQueue.poll(), instanceOf(RegisterTMRequest.class));
+ assertThat(requestQueue.poll(), instanceOf(GlobalBeginRequest.class));
assertThat(requestQueue.poll(), instanceOf(MergedWarpMessage.class));
}
int responseQueueSize = responseQueue.size();
diff --git a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockMessageHandler.java b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockMessageHandler.java
index 7e8fe3576cd..e1baff18706 100644
--- a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockMessageHandler.java
+++ b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockMessageHandler.java
@@ -88,6 +88,21 @@ public final class MockMessageHandler extends ChannelDuplexHandler {
response.setBody(HeartbeatMessage.PONG);
} else if (requestBody instanceof MergedWarpMessage) {
setMergeResultMessage(request, response);
+ } else if (requestBody instanceof GlobalBeginRequest) {
+ GlobalBeginResponse globalBeginResponse = new GlobalBeginResponse();
+ globalBeginResponse.setXid(XID.generateXID(id.incrementAndGet()));
+ globalBeginResponse.setResultCode(ResultCode.Success);
+ response.setBody(globalBeginResponse);
+ } else if (requestBody instanceof GlobalCommitRequest) {
+ GlobalCommitResponse globalCommitResponse = new GlobalCommitResponse();
+ globalCommitResponse.setResultCode(ResultCode.Success);
+ globalCommitResponse.setGlobalStatus(GlobalStatus.Committing);
+ response.setBody(globalCommitResponse);
+ } else if (requestBody instanceof GlobalRollbackRequest) {
+ GlobalRollbackResponse globalRollbackResponse = new GlobalRollbackResponse();
+ globalRollbackResponse.setResultCode(ResultCode.Success);
+ globalRollbackResponse.setGlobalStatus(GlobalStatus.Rollbacked);
+ response.setBody(globalRollbackResponse);
}
if (requestBody != HeartbeatMessage.PING) {
requestQueue.offer(requestBody);
diff --git a/pom.xml b/pom.xml
index d034e2c4a3a..02f9fc4c7ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<truffle-api.version>21.2.0</truffle-api.version>
<calcite.version>1.32.0</calcite.version>
- <netty.version>4.1.87.Final</netty.version>
+ <netty.version>4.1.90.Final</netty.version>
<javax.transaction.version>1.1</javax.transaction.version>