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 06909275a3b18811a36b101231e34766fbdb85f7 Merge: 3c4247eb58 99601a6198 Author: Albumen Kevin <[email protected]> AuthorDate: Sun Jun 23 19:46:55 2024 +0800 Merge branch '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 # dubbo-test/dubbo-test-spring/pom.xml # pom.xml .github/workflows/build-and-test-scheduled-3.3.yml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 10 +++++----- .../apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java | 18 +++++++++++++----- .../dubbo-spring-boot-starters/observability/pom.xml | 4 ++-- 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 | 8 ++++---- 9 files changed, 29 insertions(+), 21 deletions(-) diff --cc dubbo-demo/dubbo-demo-spring-boot/pom.xml index 2d63b81e5e,6e3280e972..5396c1e0fc --- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml @@@ -35,9 -35,10 +35,9 @@@ <skip_maven_deploy>true</skip_maven_deploy> <spring-boot.version>2.7.18</spring-boot.version> <spring-boot-maven-plugin.version>2.7.18</spring-boot-maven-plugin.version> - <micrometer-core.version>1.13.0</micrometer-core.version> + <micrometer-core.version>1.13.1</micrometer-core.version> </properties> + <dependencyManagement> <dependencies> <dependency> diff --cc dubbo-dependencies-bom/pom.xml index 7781cbf37c,ea86d8f2ff..ee34e89a19 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -90,13 -90,12 +90,13 @@@ <properties> <!-- Common libs --> <!-- <spring_version>4.3.30.RELEASE</spring_version> --> - <spring_version>5.3.36</spring_version> + <spring_version>5.3.37</spring_version> <spring_security_version>5.8.12</spring_security_version> <javassist_version>3.30.2-GA</javassist_version> - <bytebuddy.version>1.14.17</bytebuddy.version> + <byte-buddy_version>1.14.17</byte-buddy_version> <netty_version>3.2.10.Final</netty_version> - <netty4_version>4.1.110.Final</netty4_version> + <netty4_version>4.1.111.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> @@@ -121,10 -119,9 +121,10 @@@ <snakeyaml_version>2.2</snakeyaml_version> <commons_lang3_version>3.14.0</commons_lang3_version> <envoy_api_version>0.1.35</envoy_api_version> - <micrometer.version>1.13.0</micrometer.version> + <micrometer.version>1.13.1</micrometer.version> - + <opentelemetry.version>1.39.0</opentelemetry.version> + <zipkin-reporter.version>3.4.0</zipkin-reporter.version> - <micrometer-tracing.version>1.3.0</micrometer-tracing.version> + <micrometer-tracing.version>1.3.1</micrometer-tracing.version> <t_digest.version>3.3</t_digest.version> <prometheus_client.version>0.16.0</prometheus_client.version> <reactive.version>1.0.4</reactive.version> diff --cc pom.xml index 438bf40857,73d88547a7..9544ab2f1c --- a/pom.xml +++ b/pom.xml @@@ -110,28 -117,33 +110,28 @@@ </issueManagement> <properties> - <!-- Test libs --> - <junit_jupiter_version>5.9.3</junit_jupiter_version> - <awaitility_version>4.2.1</awaitility_version> - <hazelcast_version>3.12.13</hazelcast_version> - <hamcrest_version>2.2</hamcrest_version> - <hibernate_validator_version>5.2.4.Final</hibernate_validator_version> - <el_api_version>2.2.5</el_api_version> - <jaxb_api_version>2.2.7</jaxb_api_version> - <cglib_version>2.2.2</cglib_version> - <mockito_version>4.11.0</mockito_version> <!-- Build args --> - <argline>-server -Xms256m -Xmx512m -Dfile.encoding=UTF-8 - -Djava.net.preferIPv4Stack=true -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m</argline> - <skip_maven_deploy>false</skip_maven_deploy> - <updateReleaseInfo>true</updateReleaseInfo> - <project.build.sourceEncoding>${file_encoding}</project.build.sourceEncoding> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.outputTimestamp>2020-04-01T08:04:00Z</project.build.outputTimestamp> - + <argline>-server -Xms256m -Xmx512m -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m -Dfile.encoding=UTF-8 + -Djava.net.preferIPv4Stack=true</argline> + <arguments /> + <jacocoArgLine /> <profile.name>oss</profile.name> - <!-- for maven compiler plugin --> - <java_source_version>1.8</java_source_version> - <java_target_version>1.8</java_target_version> - <file_encoding>UTF-8</file_encoding> + <updateReleaseInfo>true</updateReleaseInfo> + <skip_maven_deploy>false</skip_maven_deploy> + <checkstyle.skip>true</checkstyle.skip> + <checkstyle_unix.skip>true</checkstyle_unix.skip> + <rat.skip>true</rat.skip> + <jacoco.skip>true</jacoco.skip> + <!-- Maven plugins --> <maven_jar_version>3.4.1</maven_jar_version> - <maven_surefire_version>3.2.5</maven_surefire_version> - <maven_failsafe_version>3.2.5</maven_failsafe_version> + <maven_surefire_version>3.3.0</maven_surefire_version> + <maven_failsafe_version>3.3.0</maven_failsafe_version> <maven_deploy_version>2.8.2</maven_deploy_version> <maven_compiler_version>3.13.0</maven_compiler_version> <maven_source_version>3.3.1</maven_source_version>
