From 045440b02fbef5fae0dfa4197a271f08053cc5ec Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 13:01:23 +0800 Subject: [PATCH 01/12] add upload workspace --- .github/workflows/build-and-test-3.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml index 57b28d8190f..5a0b59d43d8 100644 --- a/.github/workflows/build-and-test-3.yml +++ b/.github/workflows/build-and-test-3.yml @@ -89,6 +89,12 @@ jobs: timeout-minutes: 30 if: ${{ startsWith( matrix.os, 'windows') }} run: ./mvnw --batch-mode -U -e --no-transfer-progress clean install -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"rat.skip=false" -D"maven.javadoc.skip=true" + - name: "Upload workspace if failure" + if: failure() + uses: actions/upload-artifact@v2 + with: + name: "failure-workspace - ${{ matrix.os }} (JDK: ${{ matrix.jdk }}" + path: ${{ github.workspace }} - name: "Upload coverage to Codecov" uses: codecov/codecov-action@v1 From db8d4f11cf401b07d1380ce68cde24c26b41ed71 Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 13:12:56 +0800 Subject: [PATCH 02/12] add pack --- .github/workflows/build-and-test-3.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml index 5a0b59d43d8..13a46062f96 100644 --- a/.github/workflows/build-and-test-3.yml +++ b/.github/workflows/build-and-test-3.yml @@ -89,12 +89,14 @@ jobs: timeout-minutes: 30 if: ${{ startsWith( matrix.os, 'windows') }} run: ./mvnw --batch-mode -U -e --no-transfer-progress clean install -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"rat.skip=false" -D"maven.javadoc.skip=true" + - name: "Pack workspace if failure" + run: 7z a ${{ github.workspace }}/workspace.zip ${{ github.workspace }} - name: "Upload workspace if failure" if: failure() uses: actions/upload-artifact@v2 with: name: "failure-workspace - ${{ matrix.os }} (JDK: ${{ matrix.jdk }}" - path: ${{ github.workspace }} + path: ${{ github.workspace }}/workspace.zip - name: "Upload coverage to Codecov" uses: codecov/codecov-action@v1 From bbc653110fcff2ea92aec2aa1641d501dd380a6b Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 13:27:55 +0800 Subject: [PATCH 03/12] change to rat --- .github/workflows/build-and-test-3.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml index 13a46062f96..2c708eb6c29 100644 --- a/.github/workflows/build-and-test-3.yml +++ b/.github/workflows/build-and-test-3.yml @@ -89,14 +89,14 @@ jobs: timeout-minutes: 30 if: ${{ startsWith( matrix.os, 'windows') }} run: ./mvnw --batch-mode -U -e --no-transfer-progress clean install -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"rat.skip=false" -D"maven.javadoc.skip=true" - - name: "Pack workspace if failure" - run: 7z a ${{ github.workspace }}/workspace.zip ${{ github.workspace }} - - name: "Upload workspace if failure" + - name: "Pack rat file if failure" + run: 7z a ${{ github.workspace }}/workspace.zip rat.txt -r + - name: "Upload rat file if failure" if: failure() uses: actions/upload-artifact@v2 with: - name: "failure-workspace - ${{ matrix.os }} (JDK: ${{ matrix.jdk }}" - path: ${{ github.workspace }}/workspace.zip + name: "rat-file-${{ matrix.os }}(JDK:${{ matrix.jdk }})" + path: ${{ github.workspace }}/rat.zip - name: "Upload coverage to Codecov" uses: codecov/codecov-action@v1 From f02b7a36560eb0dfd2b8221b23b908abf6ebb24c Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 13:28:11 +0800 Subject: [PATCH 04/12] change to rat --- .github/workflows/build-and-test-3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml index 2c708eb6c29..dfe96a4d9e1 100644 --- a/.github/workflows/build-and-test-3.yml +++ b/.github/workflows/build-and-test-3.yml @@ -90,7 +90,7 @@ jobs: if: ${{ startsWith( matrix.os, 'windows') }} run: ./mvnw --batch-mode -U -e --no-transfer-progress clean install -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"rat.skip=false" -D"maven.javadoc.skip=true" - name: "Pack rat file if failure" - run: 7z a ${{ github.workspace }}/workspace.zip rat.txt -r + run: 7z a ${{ github.workspace }}/rat.zip rat.txt -r - name: "Upload rat file if failure" if: failure() uses: actions/upload-artifact@v2 From e3a1a24ec9541312a3c9c0923bcc40d6ae8b84b2 Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 13:28:57 +0800 Subject: [PATCH 05/12] rename --- .github/workflows/build-and-test-3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml index dfe96a4d9e1..0cf9d708842 100644 --- a/.github/workflows/build-and-test-3.yml +++ b/.github/workflows/build-and-test-3.yml @@ -95,7 +95,7 @@ jobs: if: failure() uses: actions/upload-artifact@v2 with: - name: "rat-file-${{ matrix.os }}(JDK:${{ matrix.jdk }})" + name: "rat-file-${{ matrix.os }}-JDK${{ matrix.jdk }}" path: ${{ github.workspace }}/rat.zip - name: "Upload coverage to Codecov" uses: codecov/codecov-action@v1 From 266575e9d40ea657833bfbcdc31fd0f66a08e63d Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 13:53:45 +0800 Subject: [PATCH 06/12] add failure --- .github/workflows/build-and-test-3.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml index 0cf9d708842..57cfa7e6ac1 100644 --- a/.github/workflows/build-and-test-3.yml +++ b/.github/workflows/build-and-test-3.yml @@ -90,6 +90,7 @@ jobs: if: ${{ startsWith( matrix.os, 'windows') }} run: ./mvnw --batch-mode -U -e --no-transfer-progress clean install -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"rat.skip=false" -D"maven.javadoc.skip=true" - name: "Pack rat file if failure" + if: failure() run: 7z a ${{ github.workspace }}/rat.zip rat.txt -r - name: "Upload rat file if failure" if: failure() From de156bb8df76156312fe398338075924df72292e Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 14:02:03 +0800 Subject: [PATCH 07/12] add wildcard --- .github/workflows/build-and-test-3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml index 57cfa7e6ac1..c1522a90857 100644 --- a/.github/workflows/build-and-test-3.yml +++ b/.github/workflows/build-and-test-3.yml @@ -91,7 +91,7 @@ jobs: run: ./mvnw --batch-mode -U -e --no-transfer-progress clean install -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"rat.skip=false" -D"maven.javadoc.skip=true" - name: "Pack rat file if failure" if: failure() - run: 7z a ${{ github.workspace }}/rat.zip rat.txt -r + run: 7z a ${{ github.workspace }}/rat.zip *rat.txt -r - name: "Upload rat file if failure" if: failure() uses: actions/upload-artifact@v2 From 970ee3ac3cf2c88cb2227d33c58050606e215f18 Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 18:05:29 +0800 Subject: [PATCH 08/12] update rat --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fdcc22f0ea..6f65d939dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ 0.8.2 1.1.0 3.0.0-M2 - 0.12 + 0.13 true true From c779a5d4874f7bd5ac85257ea5327e0b59796a2f Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 18:12:19 +0800 Subject: [PATCH 09/12] update script --- .github/workflows/build-and-test-3.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml index c1522a90857..abdf2bfbdbf 100644 --- a/.github/workflows/build-and-test-3.yml +++ b/.github/workflows/build-and-test-3.yml @@ -82,13 +82,13 @@ jobs: - name: "Test with Maven with Integration Tests" timeout-minutes: 30 if: ${{ startsWith( matrix.os, 'ubuntu') }} - run: ./mvnw --batch-mode -U -e --no-transfer-progress clean test -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true + run: ./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true - name: "Test with Maven without Integration Tests" env: DISABLE_FILE_SYSTEM_TEST: true timeout-minutes: 30 if: ${{ startsWith( matrix.os, 'windows') }} - run: ./mvnw --batch-mode -U -e --no-transfer-progress clean install -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"rat.skip=false" -D"maven.javadoc.skip=true" + run: ./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"rat.skip=false" -D"maven.javadoc.skip=true" - name: "Pack rat file if failure" if: failure() run: 7z a ${{ github.workspace }}/rat.zip *rat.txt -r From c4cf21f4177f64505fac45a203bdda5ccd085411 Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 18:13:56 +0800 Subject: [PATCH 10/12] update script --- .github/workflows/build-and-test-3.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml index abdf2bfbdbf..b1e6302ddc2 100644 --- a/.github/workflows/build-and-test-3.yml +++ b/.github/workflows/build-and-test-3.yml @@ -45,11 +45,11 @@ jobs: - name: "Build Dubbo with Maven" run: | cd ./dubbo - ./mvnw --batch-mode -U -e --no-transfer-progress clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true + ./mvnw --batch-mode -U -e --no-transfer-progress clean source:jar install -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true - name: "Build Dubbo Spring Boot with Maven" run: | cd ./dubbo-spring-boot-project - ./mvnw --batch-mode --no-transfer-progress clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true + ./mvnw --batch-mode --no-transfer-progress clean source:jar install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true - name: "Calculate Dubbo Version" id: dubbo-version run: | From 52310ee9cdb4b7ffb6c60ff7dae5f800a6a4a9cd Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 18:37:15 +0800 Subject: [PATCH 11/12] exclude triple proto --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 6f65d939dfc..b1a1695f398 100644 --- a/pom.xml +++ b/pom.xml @@ -280,6 +280,7 @@ **/org/apache/dubbo/common/utils/Utf8Utils.java, **/org/apache/dubbo/common/serialize/protobuf/support/wrapper/MapValue.java, **/org/apache/dubbo/common/serialize/protobuf/support/wrapper/ThrowablePB.java, + **/org/apache/dubbo/triple/TripleWrapper.java, From daf2bcf1a78f51fda1758db00fd3509acdc37a3d Mon Sep 17 00:00:00 2001 From: Albumen Date: Wed, 17 Mar 2021 19:05:43 +0800 Subject: [PATCH 12/12] add license --- .../src/main/resources/dubbo-migration.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/dubbo-migration.yaml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/dubbo-migration.yaml index dc2e8f21319..b33d32c2a1a 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/dubbo-migration.yaml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/src/main/resources/dubbo-migration.yaml @@ -1,3 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + key: demo-consumer step: FORCE_APPLICATION threshold: 0.1 \ No newline at end of file