|
@@ -125,6 +125,10 @@
|
|
|
<artifactId>aliyun-log</artifactId>
|
|
|
<groupId>com.aliyun.openservices</groupId>
|
|
|
</exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <artifactId>protobuf-java</artifactId>
|
|
|
+ <groupId>com.google.protobuf</groupId>
|
|
|
+ </exclusion>
|
|
|
</exclusions>
|
|
|
</dependency>
|
|
|
|
|
@@ -132,6 +136,12 @@
|
|
|
<groupId>com.aliyun.openservices</groupId>
|
|
|
<artifactId>aliyun-log-logback-appender</artifactId>
|
|
|
<version>0.1.18</version>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <artifactId>protobuf-java</artifactId>
|
|
|
+ <groupId>com.google.protobuf</groupId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
</dependency>
|
|
|
|
|
|
<dependency>
|
|
@@ -282,7 +292,22 @@
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-starter-security</artifactId>
|
|
|
</dependency>
|
|
|
-
|
|
|
+ <dependency>
|
|
|
+ <groupId>com.google.protobuf</groupId>
|
|
|
+ <artifactId>protobuf-java</artifactId>
|
|
|
+ <version>3.12.0</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>com.google.protobuf</groupId>
|
|
|
+ <artifactId>protobuf-java-util</artifactId>
|
|
|
+ <version>3.6.0</version>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <artifactId>protobuf-java</artifactId>
|
|
|
+ <groupId>com.google.protobuf</groupId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
+ </dependency>
|
|
|
<!--easyexcel-->
|
|
|
</dependencies>
|
|
|
|