optimize: compatible with macOS 10.15 compilation

funky-eyes · Nov 20, 2024 · cf00491 · cf00491
1 parent 03595af
commit cf00491
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -77,7 +77,7 @@
         <sofa.hessian.version>4.0.3</sofa.hessian.version>
         <sofa.bolt.version>1.6.7</sofa.bolt.version>
         <protobuf.version>3.25.4</protobuf.version>
-        <grpc.version>1.66.0</grpc.version>
+        <grpc.version>1.55.1</grpc.version>
         <kryo.version>5.4.0</kryo.version>
         <kryo-serializers.version>0.45</kryo-serializers.version>
         <hessian.version>4.0.63</hessian.version>
@@ -529,6 +529,10 @@
                         <groupId>com.google.guava</groupId>
                         <artifactId>guava</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>io.grpc</groupId>
+                        <artifactId>grpc-core</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -618,6 +622,12 @@
                 <version>${grpc.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-grpclb</artifactId>
+                <version>${grpc.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-core</artifactId>

diff --git a/distribution/NOTICE.md b/distribution/NOTICE.md
@@ -165,15 +165,15 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
     │   ├── failsafe-2.3.3.jar
     │   ├── failureaccess-1.0.1.jar
     │   ├── fastjson-1.2.83.jar
-    │   ├── grpc-api-1.66.0.jar
-    │   ├── grpc-context-1.66.0.jar
-    │   ├── grpc-core-1.66.0.jar
+    │   ├── grpc-api-1.55.1.jar
+    │   ├── grpc-context-1.55.1.jar
+    │   ├── grpc-core-1.55.1.jar
     │   ├── grpc-grpclb-1.27.1.jar
-    │   ├── grpc-netty-1.66.0.jar
-    │   ├── grpc-protobuf-1.66.0.jar
-    │   ├── grpc-protobuf-lite-1.66.0.jar
-    │   ├── grpc-stub-1.66.0.jar
-    │   ├── grpc-util-1.66.0.jar
+    │   ├── grpc-netty-1.55.1.jar
+    │   ├── grpc-protobuf-1.55.1.jar
+    │   ├── grpc-protobuf-lite-1.55.1.jar
+    │   ├── grpc-stub-1.55.1.jar
+    │   ├── grpc-util-1.55.1.jar
     │   ├── gson-2.9.1.jar
     │   ├── guava-32.1.3-jre.jar
     │   ├── guice-5.0.1.jar
@@ -581,15 +581,15 @@ Please copy database driver dependencies, such as `mysql-connector-java.jar`, to
     │   ├── failsafe-2.3.3.jar
     │   ├── failureaccess-1.0.1.jar
     │   ├── fastjson-1.2.83.jar
-    │   ├── grpc-api-1.66.0.jar
-    │   ├── grpc-context-1.66.0.jar
-    │   ├── grpc-core-1.66.0.jar
+    │   ├── grpc-api-1.55.1.jar
+    │   ├── grpc-context-1.55.1.jar
+    │   ├── grpc-core-1.55.1.jar
     │   ├── grpc-grpclb-1.27.1.jar
-    │   ├── grpc-netty-1.66.0.jar
-    │   ├── grpc-protobuf-1.66.0.jar
-    │   ├── grpc-protobuf-lite-1.66.0.jar
-    │   ├── grpc-stub-1.66.0.jar
-    │   ├── grpc-util-1.66.0.jar
+    │   ├── grpc-netty-1.55.1.jar
+    │   ├── grpc-protobuf-1.55.1.jar
+    │   ├── grpc-protobuf-lite-1.55.1.jar
+    │   ├── grpc-stub-1.55.1.jar
+    │   ├── grpc-util-1.55.1.jar
     │   ├── gson-2.9.1.jar
     │   ├── guava-32.1.3-jre.jar
     │   ├── guice-5.0.1.jar

diff --git a/integration/grpc/pom.xml b/integration/grpc/pom.xml
@@ -84,7 +84,7 @@
                 <configuration>
                     <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.66.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.55.1:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/test/pom.xml b/test/pom.xml
@@ -50,7 +50,7 @@
                     </protocArtifact>
                     <pluginId>grpc-java</pluginId>
                     <pluginArtifact>
-                        io.grpc:protoc-gen-grpc-java:1.66.0:exe:${os.detected.classifier}
+                        io.grpc:protoc-gen-grpc-java:1.55.1:exe:${os.detected.classifier}
                     </pluginArtifact>
                 </configuration>
                 <executions>