Skip to content

Commit

Permalink
Update seata-all and netty to fix nativeTest in GraalVM Native Build …
Browse files Browse the repository at this point in the history
…Tools (#24929)
  • Loading branch information
linghengqian committed Apr 2, 2023
1 parent 9406159 commit 11139ce
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 33 deletions.
28 changes: 14 additions & 14 deletions distribution/proxy-native/src/main/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions distribution/proxy/src/main/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion kernel/transaction/type/base/seata-at/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -61,5 +61,11 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
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;
Expand Down Expand Up @@ -160,8 +160,8 @@ void assertRollbackWithoutBegin() {
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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,21 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
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);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit 11139ce

Please sign in to comment.