This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 06217da300c05fc813e7bf955a9b775e2069a1dc Merge: 2b01339b87 7fcbb63982 Author: Albumen Kevin <[email protected]> AuthorDate: Fri Aug 9 14:49:21 2024 +0800 Merge branch 'refs/heads/apache-3.2' into apache-3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # pom.xml .../rpc/protocol/dubbo/pu/DubboDetectorTest.java | 47 ++++++++++++++++++ .../protocol/dubbo/pu/DubboWireProtocolTest.java | 55 ++++++++++++++++++++++ pom.xml | 2 +- 3 files changed, 103 insertions(+), 1 deletion(-) diff --cc pom.xml index 7d83fb0375,a04eebd88f..161a4a3ab0 --- a/pom.xml +++ b/pom.xml @@@ -149,8 -168,8 +149,8 @@@ <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version> <spotless.action>check</spotless.action> <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version> - + <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version> - <revision>3.2.16-SNAPSHOT</revision> + <revision>3.3.0-beta.6-SNAPSHOT</revision> </properties> <dependencyManagement>
