(dubbo) 01/01: Merge branch '3.2' into 3.3

[crazyhzm]

This is an automated email from the ASF dual-hosted git repository.

crazyhzm pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 0c766ad4628aae9f51f28c7af2da66a5690ef6c0
Merge: 4737eafcb4 394d487117
Author: crazyhzm <crazy...@gmail.com>
AuthorDate: Mon Dec 4 20:39:36 2023 +0800

    Merge branch '3.2' into 3.3
    
    # Conflicts:
    #       pom.xml

 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --cc pom.xml
index b181dcd8fd,1abff8f884..4e70221edc
--- a/pom.xml
+++ b/pom.xml
@@@ -865,16 -894,7 +865,11 @@@
                    
<exclude>src/main/java/org/apache/dubbo/aot/generate/MemberCategory.java</exclude>
                    
<exclude>src/main/java/org/apache/dubbo/metrics/aggregate/DubboMergingDigest.java</exclude>
                    
<exclude>src/main/java/org/apache/dubbo/metrics/aggregate/DubboAbstractTDigest.java</exclude>
 +                  
<exclude>src/main/java/org/apache/dubbo/common/logger/helpers/FormattingTuple.java</exclude>
 +                  
<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>