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 9b3a32f8d6db3512076198cd84f3bc880677ec32 Merge: 1145b4015b 0553d70899 Author: Albumen Kevin <[email protected]> AuthorDate: Thu Mar 14 15:00:30 2024 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-distribution/dubbo-apache-release/pom.xml # dubbo-spring-boot/pom.xml .asf.yaml | 2 ++ dubbo-config/dubbo-config-api/pom.xml | 2 +- .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 8 +++---- dubbo-distribution/dubbo-apache-release/pom.xml | 2 +- .../dubbo/qos/command/impl/ChangeTelnet.java | 3 ++- .../apache/dubbo/qos/command/impl/CountTelnet.java | 3 ++- .../dubbo/qos/command/impl/ChangeTelnetTest.java | 11 ++++++++- .../dubbo/qos/command/impl/CountTelnetTest.java | 26 +++++++++++++++++++++- dubbo-test/dubbo-test-check/pom.xml | 2 +- 11 files changed, 50 insertions(+), 13 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index 9cf94d697f,b30413ef74..63cc1f9e50 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -147,35 -143,25 +147,35 @@@ <log4j_version>1.2.17</log4j_version> <logback_version>1.2.13</logback_version> <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 --> - <log4j2_version>2.23.0</log4j2_version> + <log4j2_version>2.23.1</log4j2_version> <commons_io_version>2.15.1</commons_io_version> + <commons-codec_version>1.16.0</commons-codec_version> <embedded_redis_version>0.13.0</embedded_redis_version> <!-- Alibaba --> <alibaba_spring_context_support_version>1.0.11</alibaba_spring_context_support_version> + <!-- Test libs --> + <junit_jupiter_version>5.9.3</junit_jupiter_version> + <junit_version>4.13.2</junit_version> + <awaitility_version>4.2.0</awaitility_version> + <hamcrest_version>2.2</hamcrest_version> + <cglib_version>2.2.2</cglib_version> + <mockito_version>4.11.0</mockito_version> + <jaxb_version>2.2.7</jaxb_version> <activation_version>1.2.0</activation_version> - <test_container_version>1.19.6</test_container_version> + <test_container_version>1.19.7</test_container_version> <hessian_lite_version>3.2.13</hessian_lite_version> <swagger_version>1.6.13</swagger_version> <snappy_java_version>1.1.10.5</snappy_java_version> <bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version> + <sofa_registry_version>5.4.3</sofa_registry_version> <metrics_version>2.0.6</metrics_version> <gson_version>2.10.1</gson_version> - <jackson_version>2.16.1</jackson_version> + <jackson_version>2.16.2</jackson_version> <mortbay_jetty_version>6.1.26</mortbay_jetty_version> <portlet_version>2.0</portlet_version> <maven_flatten_version>1.6.0</maven_flatten_version> diff --cc dubbo-distribution/dubbo-apache-release/pom.xml index ec914ff07e,fcd2ca4ac5..be51620299 --- a/dubbo-distribution/dubbo-apache-release/pom.xml +++ b/dubbo-distribution/dubbo-apache-release/pom.xml @@@ -15,86 -14,87 +15,86 @@@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-distribution</artifactId> - <version>${revision}</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>dubbo-apache-release</artifactId> - <packaging>pom</packaging> - <name>dubbo-apache-release</name> - <description>The apache source release</description> - <properties> - <skip_maven_deploy>true</skip_maven_deploy> - </properties> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-distribution</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>dubbo-apache-release</artifactId> + <packaging>pom</packaging> + <name>dubbo-apache-release</name> + <description>The apache source release</description> + <properties> + <skip_maven_deploy>true</skip_maven_deploy> + </properties> - <dependencies> - <dependency> - <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-demo-api-provider</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-demo-api-consumer</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-demo-api-provider</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-demo-api-consumer</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - <profiles> - <profile> - <id>release</id> - <build> - <finalName>apache-dubbo-${project.version}</finalName> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>3.7.0</version> - <executions> - <execution> - <id>bin</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/assembly/bin-release.xml</descriptor> - </descriptors> - </configuration> - </execution> - <execution> - <id>src</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/assembly/source-release.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>release</id> + <build> + <finalName>apache-dubbo-${project.version}</finalName> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> - <version>3.6.0</version> ++ <version>3.7.0</version> + <executions> + <execution> + <id>bin</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <descriptors> + <descriptor>src/assembly/bin-release.xml</descriptor> + </descriptors> + </configuration> + </execution> + <execution> + <id>src</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <descriptors> + <descriptor>src/assembly/source-release.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <goals> + <goal>sign</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>
