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 d9743aa86ec519913ccd09c70e0499968d43b679 Merge: c7e548d9a2 04f134a168 Author: crazyhzm <[email protected]> AuthorDate: Mon Nov 6 20:19:56 2023 +0800 Merge branch '3.2' into 3.3 # Conflicts: # dubbo-build-tools/pom.xml dubbo-dependencies-bom/pom.xml | 2 +- .../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- .../dubbo-dependencies-zookeeper/pom.xml | 2 +- dubbo-dependencies/pom.xml | 2 +- dubbo-distribution/pom.xml | 2 +- pom.xml | 36 +++++++++++++++++++++- 6 files changed, 40 insertions(+), 6 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index b13e6bcf0c,302db996a9..944a2ead34 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -203,11 -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-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.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 6ac8218ed7,ef72c10c0b..26a1f14b99 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@@ -32,12 -32,11 +32,12 @@@ <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-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> diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index 9f15085d0d,68d1f1908f..0098240f2a --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@@ -32,12 -32,11 +32,12 @@@ <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-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> diff --cc pom.xml index d2cc33d31f,8387166168..1ef9a2a6c4 --- a/pom.xml +++ b/pom.xml @@@ -122,14 -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-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.2.8-SNAPSHOT</revision> + + <revision>3.3.0-beta.2-SNAPSHOT</revision> </properties> <modules>
