Merge branch 'develop' into 1103

apache · Nov 7, 2022 · df558ce · df558ce
2 parents 6c729d4 + 5796d64
commit df558ce
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,24 @@ on:
     branches: [ develop, master ]
 
 jobs:
+  build_arm64-binary: 
+     runs-on: ubuntu-latest
+     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}   
+     strategy:
+      fail-fast: false
+     steps:
+      - uses: actions/checkout@v2
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+      - name: Build arm-binary
+        run: |
+               docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
+               arm64v8/ubuntu:20.04 \
+               bash -exc 'apt-get update -y && \
+                apt-get install maven -y && \
+                mvn -Prelease-seata -Dmaven.test.skip=true clean install -U'
+
   build:
     name: "build"
     runs-on: ubuntu-latest

diff --git a/build/pom.xml b/build/pom.xml
@@ -82,7 +82,7 @@
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
         <!-- Compiler -->
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <protobuf-maven-plugin.version>0.5.0</protobuf-maven-plugin.version>
+        <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
         <kotlin-maven-plugin.version>1.3.72</kotlin-maven-plugin.version>
         <!-- Check -->
         <maven-pmd-plugin.version>3.8</maven-pmd-plugin.version>

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -53,7 +53,7 @@
         <eureka-clients.version>1.10.17</eureka-clients.version>
         <consul-clients.version>1.4.2</consul-clients.version>
         <nacos-client.version>1.4.2</nacos-client.version>
-        <etcd-client-v3.version>0.3.0</etcd-client-v3.version>
+        <etcd-client-v3.version>0.5.0</etcd-client-v3.version>
         <testcontainers.version>1.11.2</testcontainers.version>
         <guava.version>27.0.1-jre</guava.version>
         <javax-inject.version>1</javax-inject.version>
@@ -66,8 +66,8 @@
         <ant.version>1.10.12</ant.version>
         <lz4.version>1.7.1</lz4.version>
 
-        <protobuf.version>3.7.1</protobuf.version>
-        <grpc.version>1.17.1</grpc.version>
+        <protobuf.version>3.11.4</protobuf.version>
+        <grpc.version>1.27.1</grpc.version>
         <kryo.version>5.3.0</kryo.version>
         <kryo-serializers.version>0.45</kryo-serializers.version>
         <hessian.version>4.0.63</hessian.version>

diff --git a/...ery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryServiceImplTest.java b/...ery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryServiceImplTest.java
@@ -18,7 +18,7 @@
 import io.etcd.jetcd.ByteSequence;
 import io.etcd.jetcd.Client;
 import io.etcd.jetcd.Watch;
-import io.etcd.jetcd.launcher.junit.EtcdClusterResource;
+import io.etcd.jetcd.launcher.junit4.EtcdClusterResource;
 import io.etcd.jetcd.options.DeleteOption;
 import io.etcd.jetcd.options.GetOption;
 import io.etcd.jetcd.watch.WatchResponse;
@@ -49,13 +49,13 @@ public class EtcdRegistryServiceImplTest {
     @Rule
     private final static EtcdClusterResource etcd = new EtcdClusterResource(CLUSTER_NAME, 1);
 
-    private final Client client = Client.builder().endpoints(etcd.cluster().getClientEndpoints()).build();
+    private final Client client = Client.builder().endpoints(etcd.getClientEndpoints()).build();
     private final static String HOST = "127.0.0.1";
     private final static int PORT = 8091;
 
     @BeforeAll
     public static void beforeClass() throws Exception {
-        System.setProperty(EtcdRegistryServiceImpl.TEST_ENDPONT, etcd.cluster().getClientEndpoints().get(0).toString());
+        System.setProperty(EtcdRegistryServiceImpl.TEST_ENDPONT, etcd.getClientEndpoints().get(0).toString());
     }
 
     @AfterAll

diff --git a/integration/grpc/pom.xml b/integration/grpc/pom.xml
@@ -76,9 +76,9 @@
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.27.1:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
                 <executions>
                     <execution>
@@ -92,4 +92,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/serializer/seata-serializer-protobuf/pom.xml b/serializer/seata-serializer-protobuf/pom.xml
@@ -54,7 +54,7 @@
                 <configuration>
                     <protoSourceRoot>${project.basedir}/src/main/resources/protobuf/io/seata/protocol/transcation/</protoSourceRoot>
                     <protocArtifact>
-                        com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+                        com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}
                     </protocArtifact>
                 </configuration>
                 <executions>