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 f6d54c5a4ff7307aa4e1596eff41edddfb012ea3
Merge: cc19f77c41 d667080305
Author: Albumen Kevin <[email protected]>
AuthorDate: Wed Aug 7 15:13:28 2024 +0800

    Merge branch 'refs/heads/apache-3.2' into apache-3.3
    
    # Conflicts:
    #       dubbo-dependencies-bom/pom.xml

 dubbo-config/dubbo-config-api/pom.xml | 2 +-
 dubbo-dependencies-bom/pom.xml        | 2 +-
 pom.xml                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --cc dubbo-dependencies-bom/pom.xml
index 06af4e45ce,20ce676b62..ef5a01444c
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -165,8 -153,8 +165,8 @@@
  
      <jaxb_version>2.2.7</jaxb_version>
      <activation_version>1.2.0</activation_version>
-     <test_container_version>1.20.0</test_container_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>

Reply via email to