Merge pull request #521 from Assassinxc/add-protoc-support-for-macos-…

…aarch64 Bump protoc plugin and grpc-starter to latest version for macos aarch64
dromara · Feb 12, 2025 · 4e27686 · 4e27686
2 parents ea93f01 + d1a2b7b
commit 4e27686
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -35,7 +35,7 @@
         <apache-dubbo.version>3.0.7</apache-dubbo.version>
         <alibaba-dubbo.version>2.6.0</alibaba-dubbo.version>
         <alibaba-dubbo-starter.version>2.0.0</alibaba-dubbo-starter.version>
-        <grpc-starter.version>2.13.1.RELEASE</grpc-starter.version>
+        <grpc-starter.version>2.15.0.RELEASE</grpc-starter.version>
         <hystrix.version>1.5.18</hystrix.version>
         <motan.version>1.2.0</motan.version>
         <okhttp.version>3.14.9</okhttp.version>
@@ -106,7 +106,7 @@
 
             <dependency>
                 <groupId>net.devh</groupId>
-                <artifactId>grpc-server-spring-boot-starter</artifactId>
+                <artifactId>grpc-spring-boot-starter</artifactId>
                 <version>${grpc-starter.version}</version>
             </dependency>
 

diff --git a/example/example-adapter/example-adapter-grpc/pom.xml b/example/example-adapter/example-adapter-grpc/pom.xml
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>net.devh</groupId>
             <artifactId>grpc-spring-boot-starter</artifactId>
-            <version>2.13.1.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -57,6 +56,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -70,18 +75,18 @@
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
-                <version>1.4.1.Final</version>
+                <version>1.7.1</version>
             </extension>
         </extensions>
         <plugins>
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.0</version>
+                <version>0.6.1</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.0.0:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:3.18.2:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.69.1:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/...mple-adapter-grpc/src/main/java/org/dromara/dynamictp/example/GrpcExampleApplication.java b/...mple-adapter-grpc/src/main/java/org/dromara/dynamictp/example/GrpcExampleApplication.java
@@ -20,12 +20,13 @@
 import org.dromara.dynamictp.spring.annotation.EnableDynamicTp;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 
 /**
  * @author fabian4
  */
 @EnableDynamicTp
-@SpringBootApplication
+@SpringBootApplication(exclude = RedisAutoConfiguration.class)
 public class GrpcExampleApplication {
     public static void main(String[] args) {
         SpringApplication.run(GrpcExampleApplication.class, args);