Merge branch '3.2' into 3.3

# Conflicts:
#	pom.xml
This commit is contained in:
crazyhzm 2023-12-04 20:39:36 +08:00
commit 0c766ad462
1 changed files with 1 additions and 6 deletions

View File

@ -869,12 +869,7 @@
<exclude>src/main/java/org/apache/dubbo/common/logger/helpers/MessageFormatter.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/protoc/DubboProtocCompilerMojo.java</exclude>
<exclude>src/main/java/org/apache/dubbo/gen/utils/ProtoTypeMap.java</exclude>
<exclude>**/TripleWrapper.java</exclude>
<exclude>**/com/google/rpc/**</exclude>
<exclude>**/io/grpc/**</exclude>
<exclude>**/istio/**</exclude>
<exclude>**/org/apache/dubbo/auth/v1alpha1/**</exclude>
<exclude>**/demo/hello/**</exclude>
<exclude>**/generated-sources/**</exclude>
</excludes>
<palantirJavaFormat>
<version>${palantirJavaFormat.version}</version>