natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.2' into 3.3 

# Conflicts:
#	dubbo-build-tools/pom.xml
This commit is contained in:
crazyhzm 2023-11-06 20:19:56 +08:00
parent c7e548d9a2 04f134a168
commit d9743aa86e
6 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dubbo-dependencies-bom/pom.xml
View File

@ -203,7 +203,7 @@
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.5.0</maven_flatten_version>
<commons_compress_version>1.23.0</commons_compress_version>
<spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
<spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
<revision>3.3.0-beta.2-SNAPSHOT</revision>

2
dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
View File

@ -37,7 +37,7 @@
<slf4j_version>1.7.36</slf4j_version>
<curator5_version>5.1.0</curator5_version>
<zookeeper_version>3.8.1</zookeeper_version>
<spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
<spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
</properties>

2
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
View File

@ -37,7 +37,7 @@
<slf4j_version>1.7.36</slf4j_version>
<curator_version>4.3.0</curator_version>
<zookeeper_version>3.4.14</zookeeper_version>
<spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
<spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
</properties>

2
dubbo-dependencies/pom.xml
View File

@ -32,7 +32,7 @@
</modules>
<properties>
<spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
<spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
</properties>

2
dubbo-distribution/pom.xml
View File

@ -29,7 +29,7 @@
<packaging>pom</packaging>
<properties>
<spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
<spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
</properties>

36
pom.xml
View File

@ -125,7 +125,7 @@
<protobuf-protoc_version>3.22.3</protobuf-protoc_version>
<grpc_version>1.54.0</grpc_version>
<spotless-maven-plugin.version>2.39.0</spotless-maven-plugin.version>
<spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
@ -603,6 +603,40 @@
<version>${spotless-maven-plugin.version}</version>
<configuration>
<java>
<excludes>
<exclude>src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocal.java</exclude>
<exclude>src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalMap.java</exclude>
<exclude>src/main/java/org/apache/dubbo/common/timer/HashedWheelTimer.java</exclude>
<exclude>src/main/java/org/apache/dubbo/common/timer/Timeout.java</exclude>
<exclude>src/main/java/org/apache/dubbo/common/timer/Timer.java</exclude>
<exclude>src/main/java/org/apache/dubbo/common/timer/TimerTask.java</exclude>
<exclude>src/main/java/org/apache/dubbo/common/utils/CIDRUtils.java</exclude>
<exclude>src/main/java/org/apache/dubbo/common/utils/Utf8Utils.java</exclude>
<exclude>src/test/java/org/apache/dubbo/config/spring/EmbeddedZooKeeper.java</exclude>
<exclude>src/main/java/org/apache/dubbo/test/common/utils/TestSocketUtils.java</exclude>
<exclude>src/main/java/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java</exclude>
<exclude>src/main/java/org/apache/dubbo/common/threadpool/serial/SerializingExecutor.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/AbstractAotMojo.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/AbstractDependencyFilterMojo.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/CommandLineBuilder.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/DependencyFilter.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/Exclude.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/ExcludeFilter.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/FilterableDependency.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/Include.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/IncludeFilter.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/JavaCompilerPluginConfiguration.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/JavaExecutable.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/JavaProcessExecutor.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/MatchingGroupIdFilter.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/RunArguments.java</exclude>
<exclude>src/main/java/org/apache/dubbo/maven/plugin/aot/RunProcess.java</exclude>
<exclude>src/main/java/org/apache/dubbo/aot/generate/BasicJsonWriter.java</exclude>
<exclude>src/main/java/org/apache/dubbo/aot/generate/ExecutableMode.java</exclude>
<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>
</excludes>
<palantirJavaFormat />
<removeUnusedImports />
<importOrder>