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 0164e0e7d5596774c504215dd5020695e0e3b170 Merge: 60a3c3fc3e f3d1294411 Author: Albumen Kevin <[email protected]> AuthorDate: Wed Aug 28 11:36:29 2024 +0800 Merge branch 'refs/heads/apache-3.2' into apache-3.3 # Conflicts: # .github/workflows/build-and-test-pr.yml # dubbo-dependencies-bom/pom.xml # dubbo-native-plugin/pom.xml # 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 .github/workflows/build-and-test-pr.yml | 39 +--------------------- .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 10 +++--- dubbo-maven-plugin/pom.xml | 4 +-- .../zookeeper/util/CuratorFrameworkUtils.java | 3 -- .../observability/pom.xml | 2 +- dubbo-spring-boot/pom.xml | 2 +- dubbo-test/dubbo-test-check/pom.xml | 2 +- pom.xml | 8 ++--- 11 files changed, 18 insertions(+), 58 deletions(-) diff --cc .github/workflows/build-and-test-pr.yml index 7a40dbca15,0a759bbe5b..b61c24f0ef --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@@ -224,29 -209,8 +208,8 @@@ jobs key: zookeeper-${{ runner.os }}-${{ env.ZOOKEEPER_VERSION }} restore-keys: | zookeeper-${{ runner.os }}- - - uses: actions/cache@v3 - name: "Cache secret key" - id: "cache-secret-cert" - with: - path: ${{ github.workspace }}/.tmp/rsa - key: secret-rsa-${{ runner.os }}-${{ github.run_id }} - - name: "Get sonarcloud token" - if: ${{ github.repository == 'apache/dubbo' }} - run: | - curl "http://dubbo-vm.apache.org:8000/token?workflow_id=${{ github.run_id }}" -o ${{ github.workspace }}/.tmp/encrypted-sonarcloud-token - openssl rsautl -decrypt -in ${{ github.workspace }}/.tmp/encrypted-sonarcloud-token -out ${{ github.workspace }}/.tmp/decrypted-sonarcloud-token -inkey ${{ github.workspace }}/.tmp/rsa/rsa_private.pem - - name: "Test with Maven with SonarCloud Scan" - if: ${{ github.repository == 'apache/dubbo' }} - timeout-minutes: 90 - env: - # Needed to get some information about the pull request, if any - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - source ${{ github.workspace }}/.tmp/decrypted-sonarcloud-token - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_dubbo -DtrimStackTrace=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false [...] - - name: "Test with Maven without SonarCloud Scan" - if: ${{ github.repository != 'apache/dubbo' }} + - name: "Test with Maven" - timeout-minutes: 70 + timeout-minutes: 90 run: | ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -DtrimStackTrace=false -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - name: "Upload coverage result" diff --cc dubbo-demo/dubbo-demo-spring-boot/pom.xml index 827811e26b,9a2bb9bcd6..77b5c8d659 --- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml @@@ -36,9 -35,10 +36,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.2</micrometer-core.version> + <micrometer-core.version>1.13.3</micrometer-core.version> </properties> + <dependencyManagement> <dependencies> <dependency> diff --cc dubbo-dependencies-bom/pom.xml index 3a46c3af52,8eb1822893..099355f3a4 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -90,12 -91,11 +90,12 @@@ <!-- Common libs --> <!-- <spring_version>4.3.30.RELEASE</spring_version> --> <spring_version>5.3.39</spring_version> - <spring_security_version>5.8.13</spring_security_version> + <spring_security_version>5.8.14</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> @@@ -121,9 -120,8 +121,9 @@@ <commons_lang3_version>3.16.0</commons_lang3_version> <envoy_api_version>0.1.35</envoy_api_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> + <micrometer-tracing.version>1.3.3</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> @@@ -135,16 -133,13 +135,16 @@@ <resteasy_version>3.15.6.Final</resteasy_version> <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> + <nacos_version>2.4.1</nacos_version> + <sentinel.version>1.8.6</sentinel.version> + <seata.version>1.6.1</seata.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> + <jcl_version>1.3.4</jcl_version> <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 --> diff --cc dubbo-spring-boot/pom.xml index f886ce40cf,800f7df003..04f057f82b --- 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.19</byte-buddy.version> + <byte-buddy.version>1.15.0</byte-buddy.version> + <mockito_version>4.11.0</mockito_version> </properties> <dependencyManagement> diff --cc pom.xml index 34beaba7b8,4d1df9dc34..e97d53cac9 --- a/pom.xml +++ b/pom.xml @@@ -108,29 -117,34 +108,29 @@@ </issueManagement> <properties> - <!-- Test libs --> - <junit_jupiter_version>5.9.3</junit_jupiter_version> - <awaitility_version>4.2.2</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.2</maven_jar_version> - <maven_surefire_version>3.3.1</maven_surefire_version> + <maven_surefire_version>3.4.0</maven_surefire_version> <maven_failsafe_version>3.4.0</maven_failsafe_version> - <maven_deploy_version>3.1.2</maven_deploy_version> + <maven_deploy_version>3.1.3</maven_deploy_version> <maven_compiler_version>3.13.0</maven_compiler_version> <maven_source_version>3.3.1</maven_source_version> <maven_javadoc_version>3.8.0</maven_javadoc_version>
