Skip to content

Commit

Permalink
Merge branch '3.2' into 3.3
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
CrazyHZM committed Dec 4, 2023
2 parents 4737eaf + 394d487 commit 0c766ad
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 0c766ad

Please sign in to comment.