This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new c0bb126a06 optimize: compilation and packaging for the ARM64
architecture (#6803)
c0bb126a06 is described below
commit c0bb126a067b38fefa69bcae95bd96053e7c7e09
Author: heliang666s <[email protected]>
AuthorDate: Fri Sep 13 10:25:30 2024 +0800
optimize: compilation and packaging for the ARM64 architecture (#6803)
---
changes/en-us/2.x.md | 2 ++
changes/zh-cn/2.x.md | 3 +++
dependencies/pom.xml | 4 ++--
integration/grpc/pom.xml | 7 +++----
pom.xml | 7 -------
serializer/seata-serializer-protobuf/pom.xml | 2 +-
6 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 64cc2890bf..283808618e 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -114,6 +114,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6750](https://github.com/apache/incubator-seata/pull/6750)] increase
spring autoconfigure module unit test converage
- [[#6773](https://github.com/apache/incubator-seata/pull/6773)] fix the wrong
code coverage from codecov icon in default branch
- [[#6821](https://github.com/apache/incubator-seata/pull/6821)] fix the test
case assertions
+- [[#6803](https://github.com/apache/incubator-seata/pull/6803)] optimize:
compilation and packaging for the ARM64 architecture
Thanks to these contributors for their code commits. Please report an
unintended omission.
@@ -148,6 +149,7 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
- [LegGasai](https://github.com/LegGasai)
- [yangli-stu](https://github.com/yangli-stu)
+- [heliang666s](https://github.com/heliang666s)
Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 22249bd103..796dd6d1c1 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -98,6 +98,7 @@
- [[#6779](https://github.com/apache/incubator-seata/pull/6779)]
在config模块中使用curator替代zkclient
- [[#6831](https://github.com/apache/incubator-seata/pull/6831)]
在registry模块中使用curator替代zkclient
+- [[#6803](https://github.com/apache/incubator-seata/pull/6803)] 优化 ARM64
架构的编译打包
### refactor:
@@ -149,6 +150,8 @@
- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
- [LegGasai](https://github.com/LegGasai)
- [yangli-stu](https://github.com/yangli-stu)
+- [heliang666s](https://github.com/heliang666s)
+
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index bf5a1a2084..44f1662f45 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -78,8 +78,8 @@
<sofa.hessian.version>4.0.3</sofa.hessian.version>
<sofa.bolt.version>1.6.7</sofa.bolt.version>
- <protobuf.version>3.16.3</protobuf.version>
- <grpc.version>1.27.1</grpc.version>
+ <protobuf.version>3.25.4</protobuf.version>
+ <grpc.version>1.66.0</grpc.version>
<kryo.version>5.4.0</kryo.version>
<kryo-serializers.version>0.45</kryo-serializers.version>
<hessian.version>4.0.63</hessian.version>
diff --git a/integration/grpc/pom.xml b/integration/grpc/pom.xml
index cf42b481af..04665dcc95 100644
--- a/integration/grpc/pom.xml
+++ b/integration/grpc/pom.xml
@@ -32,7 +32,6 @@
<name>seata-grpc ${project.version}</name>
<description>gRPC integration for Seata built with Maven</description>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -83,9 +82,9 @@
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:3.25.4:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.27.1:exe:${os.detected.classifier}</pluginArtifact>
+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.66.0:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
@@ -98,5 +97,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/pom.xml b/pom.xml
index 919ebc962e..8e78921ba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,13 +218,6 @@
<maven.git-commit-id.skip>false</maven.git-commit-id.skip>
</properties>
</profile>
- <!-- profile: arrch64 -->
- <profile>
- <id>arrch64</id>
- <properties>
- <os.detected.classifier>osx-x86_64</os.detected.classifier>
- </properties>
- </profile>
<!-- profile: checkstyle -->
<profile>
<id>checkstyle</id>
diff --git a/serializer/seata-serializer-protobuf/pom.xml
b/serializer/seata-serializer-protobuf/pom.xml
index d3117161ef..e606c7ab62 100644
--- a/serializer/seata-serializer-protobuf/pom.xml
+++ b/serializer/seata-serializer-protobuf/pom.xml
@@ -57,7 +57,7 @@
<configuration>
<protoSourceRoot>${project.basedir}/src/main/resources/protobuf/org/apache/seata/protocol/transcation/</protoSourceRoot>
<protocArtifact>
-
com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}
+
com.google.protobuf:protoc:3.25.4:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
<executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
