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 c7e548d9a246a30e43674b97d692f9b14b53995c Merge: 70469346b2 1a24e72653 Author: crazyhzm <[email protected]> AuthorDate: Mon Nov 6 19:25:16 2023 +0800 Merge branch '3.2' into 3.3 # Conflicts: # dubbo-build-tools/pom.xml # dubbo-dependencies-bom/pom.xml # dubbo-distribution/pom.xml # pom.xml dubbo-dependencies-bom/pom.xml | 55 +++++++++++++++++++ .../dubbo-dependencies-zookeeper-curator5/pom.xml | 55 +++++++++++++++++++ .../dubbo-dependencies-zookeeper/pom.xml | 55 +++++++++++++++++++ dubbo-dependencies/pom.xml | 61 ++++++++++++++++++++++ dubbo-distribution/pom.xml | 58 ++++++++++++++++++++ pom.xml | 56 ++++++++++++++++++++ 6 files changed, 340 insertions(+) diff --cc dubbo-dependencies-bom/pom.xml index f0fd107784,c0c6dadbc0..b13e6bcf0c --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -203,8 -189,10 +203,11 @@@ <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.action>check</spotless.action> + <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version> - <revision>3.2.8-SNAPSHOT</revision> + <revision>3.3.0-beta.2-SNAPSHOT</revision> + <open_feign_version>3.1.5</open_feign_version> </properties> <dependencyManagement> diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index f3e1479a83,2fa1c058fb..6ac8218ed7 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@@ -32,11 -32,13 +32,14 @@@ <packaging>pom</packaging> <properties> - <revision>3.2.8-SNAPSHOT</revision> + <revision>3.3.0-beta.2-SNAPSHOT</revision> <maven_flatten_version>1.5.0</maven_flatten_version> + <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.action>check</spotless.action> + <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version> </properties> <dependencyManagement> diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index f13089af11,4a8b23fc99..9f15085d0d --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@@ -32,11 -32,13 +32,14 @@@ <packaging>pom</packaging> <properties> - <revision>3.2.8-SNAPSHOT</revision> + <revision>3.3.0-beta.2-SNAPSHOT</revision> <maven_flatten_version>1.5.0</maven_flatten_version> + <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.action>check</spotless.action> + <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version> </properties> <dependencies> diff --cc dubbo-distribution/pom.xml index bf684234a0,d71d2a70ba..2f862e5fc3 --- a/dubbo-distribution/pom.xml +++ b/dubbo-distribution/pom.xml @@@ -55,12 -60,57 +61,64 @@@ <module>dubbo-core-spi</module> </modules> </profile> + <profile> + <id>dubbo-all-shaded</id> + <modules> + <module>dubbo-all-shaded</module> + <module>dubbo-bom</module> + </modules> + </profile> + <profile> + <id>java11+</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <build> + <!--- newer versions of plugins requires JDK 11 --> + <plugins> + <plugin> + <groupId>com.diffplug.spotless</groupId> + <artifactId>spotless-maven-plugin</artifactId> + <version>${spotless-maven-plugin.version}</version> + <configuration> + <java> + <palantirJavaFormat /> + <removeUnusedImports /> + <importOrder> + <file>dubbo-importorder.txt</file> + </importOrder> + <licenseHeader> + <file>checkstyle-header.txt</file> + </licenseHeader> + </java> + <pom> + <sortPom> + <expandEmptyElements>false</expandEmptyElements> + <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement> + </sortPom> + </pom> + <upToDateChecking> + <enabled>true</enabled> + </upToDateChecking> + </configuration> + <dependencies> + <dependency> + <groupId>com.alibaba</groupId> + <artifactId>dubbo-shared-resources</artifactId> + <version>${dubbo-shared-resources.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <goals> + <goal>${spotless.action}</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> diff --cc pom.xml index 42a85de99d,98bf6659d3..d2cc33d31f --- a/pom.xml +++ b/pom.xml @@@ -122,11 -127,19 +122,14 @@@ <maven_antrun_version>3.1.0</maven_antrun_version> <maven_os_plugin_version>1.7.1</maven_os_plugin_version> <maven_protobuf_plugin_version>0.6.1</maven_protobuf_plugin_version> - <arguments /> - <checkstyle.skip>true</checkstyle.skip> - <checkstyle_unix.skip>true</checkstyle_unix.skip> - <rat.skip>true</rat.skip> - <jacoco.skip>true</jacoco.skip> - <jprotoc_version>1.2.2</jprotoc_version> - <protobuf-java_version>3.22.3</protobuf-java_version> + <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.action>check</spotless.action> + <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version> - <revision>3.2.8-SNAPSHOT</revision> + + <revision>3.3.0-beta.2-SNAPSHOT</revision> </properties> <modules>
