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 a675544b4186e45933852b7f9524e3c801b92d15 Merge: 3beeebe2cf 05cb55a3fc Author: Albumen Kevin <[email protected]> AuthorDate: Wed Aug 21 17:45:28 2024 +0800 Merge branch 'refs/heads/apache-3.2' into apache-3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml # dubbo-native-plugin/pom.xml # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/PathAndInvokerMapper.java # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/netty/ChunkOutputStream.java # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/netty/NettyHttpResponse.java # dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/netty/RestHttpRequestDecoder.java # dubbo-spring-boot/pom.xml # dubbo-test/dubbo-test-spring/pom.xml # pom.xml dubbo-configcenter/dubbo-configcenter-apollo/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 16 ++++++++-------- dubbo-maven-plugin/pom.xml | 4 ++-- .../dubbo-spring-boot-starters/observability/pom.xml | 4 ++-- dubbo-spring-boot/pom.xml | 2 +- dubbo-test/dubbo-test-check/pom.xml | 2 +- dubbo-test/dubbo-test-spring3.2/pom.xml | 2 +- dubbo-test/dubbo-test-spring4.1/pom.xml | 2 +- dubbo-test/dubbo-test-spring4.2/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index 8eb8c3be9e,fa44f7754c..71441545f9 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -89,13 -90,12 +89,13 @@@ <properties> <!-- Common libs --> <!-- <spring_version>4.3.30.RELEASE</spring_version> --> - <spring_version>5.3.37</spring_version> + <spring_version>5.3.39</spring_version> <spring_security_version>5.8.13</spring_security_version> <javassist_version>3.30.2-GA</javassist_version> - <bytebuddy.version>1.14.18</bytebuddy.version> + <byte-buddy_version>1.14.18</byte-buddy_version> <netty_version>3.2.10.Final</netty_version> <netty4_version>4.1.112.Final</netty4_version> + <netty_http3_version>0.0.28.Final</netty_http3_version> <httpclient_version>4.5.14</httpclient_version> <httpcore_version>4.4.16</httpcore_version> <fastjson_version>1.2.83</fastjson_version> @@@ -116,13 -115,12 +116,13 @@@ <hibernate_validator_new_version>7.0.5.Final</hibernate_validator_new_version> <jel_version>3.0.1-b12</jel_version> <jcache_version>1.1.1</jcache_version> - <apollo_client_version>2.2.0</apollo_client_version> + <apollo_client_version>2.3.0</apollo_client_version> <snakeyaml_version>2.2</snakeyaml_version> - <commons_lang3_version>3.15.0</commons_lang3_version> + <commons_lang3_version>3.16.0</commons_lang3_version> <envoy_api_version>0.1.35</envoy_api_version> - <micrometer.version>1.13.2</micrometer.version> + <micrometer.version>1.13.3</micrometer.version> - + <opentelemetry.version>1.39.0</opentelemetry.version> + <zipkin-reporter.version>3.4.0</zipkin-reporter.version> <micrometer-tracing.version>1.3.2</micrometer-tracing.version> <t_digest.version>3.3</t_digest.version> <prometheus_client.version>0.16.0</prometheus_client.version> @@@ -136,12 -134,9 +136,12 @@@ <codehaus-jackson_version>1.9.13</codehaus-jackson_version> <tomcat_embed_version>8.5.100</tomcat_embed_version> <nacos_version>2.4.0</nacos_version> + <sentinel.version>1.8.6</sentinel.version> + <seata.version>1.6.1</seata.version> - <grpc.version>1.65.1</grpc.version> + <grpc.version>1.66.0</grpc.version> <grpc_contrib_verdion>0.8.1</grpc_contrib_verdion> <jprotoc_version>1.2.2</jprotoc_version> + <mustache_version>0.9.10</mustache_version> <!-- Log libs --> <slf4j_version>1.7.36</slf4j_version> <jcl_version>1.3.3</jcl_version> @@@ -166,12 -154,11 +166,12 @@@ <jaxb_version>2.2.7</jaxb_version> <activation_version>1.2.0</activation_version> <test_container_version>1.20.1</test_container_version> - <hessian_lite_version>3.2.13</hessian_lite_version> + <hessian_lite_version>4.0.1</hessian_lite_version> <swagger_version>1.6.14</swagger_version> - <snappy_java_version>1.1.10.5</snappy_java_version> + <snappy_java_version>1.1.10.6</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.11.0</gson_version> <jackson_version>2.17.2</jackson_version> diff --cc dubbo-spring-boot/pom.xml index 233aa7c0e4,46f8525c68..f886ce40cf --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@@ -40,9 -39,11 +40,9 @@@ <properties> <spring-boot.version>2.7.18</spring-boot.version> - <dubbo.version>${revision}</dubbo.version> - <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 --> - <log4j2_version>2.23.1</log4j2_version> <!-- Spring boot buddy is lower than the delivery dependency package version and can only show the defined dependency version --> - <byte-buddy.version>1.14.18</byte-buddy.version> + <byte-buddy.version>1.14.19</byte-buddy.version> + <mockito_version>4.11.0</mockito_version> </properties> <dependencyManagement>
