Skip to content

Commit c0bb126

Browse files
authored
optimize: compilation and packaging for the ARM64 architecture (apache#6803)
1 parent c0f7b82 commit c0bb126

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

changes/en-us/2.x.md

+2
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ Add changes here for all PR submitted to the 2.x branch.
114114
- [[#6750](https://github.com/apache/incubator-seata/pull/6750)] increase spring autoconfigure module unit test converage
115115
- [[#6773](https://github.com/apache/incubator-seata/pull/6773)] fix the wrong code coverage from codecov icon in default branch
116116
- [[#6821](https://github.com/apache/incubator-seata/pull/6821)] fix the test case assertions
117+
- [[#6803](https://github.com/apache/incubator-seata/pull/6803)] optimize: compilation and packaging for the ARM64 architecture
117118

118119

119120
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
148149
- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
149150
- [LegGasai](https://github.com/LegGasai)
150151
- [yangli-stu](https://github.com/yangli-stu)
152+
- [heliang666s](https://github.com/heliang666s)
151153

152154

153155
Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/2.x.md

+3
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
- [[#6779](https://github.com/apache/incubator-seata/pull/6779)] 在config模块中使用curator替代zkclient
9999
- [[#6831](https://github.com/apache/incubator-seata/pull/6831)] 在registry模块中使用curator替代zkclient
100100

101+
- [[#6803](https://github.com/apache/incubator-seata/pull/6803)] 优化 ARM64 架构的编译打包
101102

102103
### refactor:
103104

@@ -149,6 +150,8 @@
149150
- [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
150151
- [LegGasai](https://github.com/LegGasai)
151152
- [yangli-stu](https://github.com/yangli-stu)
153+
- [heliang666s](https://github.com/heliang666s)
154+
152155

153156

154157
同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。

dependencies/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<sofa.hessian.version>4.0.3</sofa.hessian.version>
7979
<sofa.bolt.version>1.6.7</sofa.bolt.version>
8080

81-
<protobuf.version>3.16.3</protobuf.version>
82-
<grpc.version>1.27.1</grpc.version>
81+
<protobuf.version>3.25.4</protobuf.version>
82+
<grpc.version>1.66.0</grpc.version>
8383
<kryo.version>5.4.0</kryo.version>
8484
<kryo-serializers.version>0.45</kryo-serializers.version>
8585
<hessian.version>4.0.63</hessian.version>

integration/grpc/pom.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<name>seata-grpc ${project.version}</name>
3333
<description>gRPC integration for Seata built with Maven</description>
3434

35-
3635
<dependencies>
3736
<dependency>
3837
<groupId>${project.groupId}</groupId>
@@ -83,9 +82,9 @@
8382
<groupId>org.xolstice.maven.plugins</groupId>
8483
<artifactId>protobuf-maven-plugin</artifactId>
8584
<configuration>
86-
<protocArtifact>com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}</protocArtifact>
85+
<protocArtifact>com.google.protobuf:protoc:3.25.4:exe:${os.detected.classifier}</protocArtifact>
8786
<pluginId>grpc-java</pluginId>
88-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.27.1:exe:${os.detected.classifier}</pluginArtifact>
87+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.66.0:exe:${os.detected.classifier}</pluginArtifact>
8988
</configuration>
9089
<executions>
9190
<execution>
@@ -98,5 +97,5 @@
9897
</plugin>
9998
</plugins>
10099
</build>
101-
100+
102101
</project>

pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,6 @@
218218
<maven.git-commit-id.skip>false</maven.git-commit-id.skip>
219219
</properties>
220220
</profile>
221-
<!-- profile: arrch64 -->
222-
<profile>
223-
<id>arrch64</id>
224-
<properties>
225-
<os.detected.classifier>osx-x86_64</os.detected.classifier>
226-
</properties>
227-
</profile>
228221
<!-- profile: checkstyle -->
229222
<profile>
230223
<id>checkstyle</id>

serializer/seata-serializer-protobuf/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<configuration>
5858
<protoSourceRoot>${project.basedir}/src/main/resources/protobuf/org/apache/seata/protocol/transcation/</protoSourceRoot>
5959
<protocArtifact>
60-
com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}
60+
com.google.protobuf:protoc:3.25.4:exe:${os.detected.classifier}
6161
</protocArtifact>
6262
</configuration>
6363
<executions>

0 commit comments

Comments
 (0)