You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2021/03/24 07:25:07 UTC
[dubbo] 06/12: [3.0-Actions] Add rat result upload & Fix rat in
Ubuntu (#7394)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit a812a7a9bf9cbe5c154dca61e899823f16936476
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Wed Mar 17 19:59:50 2021 +0800
[3.0-Actions] Add rat result upload & Fix rat in Ubuntu (#7394)
---
.github/workflows/build-and-test-3.yml | 17 +++++++++++++----
.../src/main/resources/dubbo-migration.yaml | 19 +++++++++++++++++++
pom.xml | 3 ++-
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build-and-test-3.yml b/.github/workflows/build-and-test-3.yml
index 57b28d8..b1e6302 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: |
@@ -82,13 +82,22 @@ 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
+ - name: "Upload rat file if failure"
+ if: failure()
+ uses: actions/upload-artifact@v2
+ with:
+ name: "rat-file-${{ matrix.os }}-JDK${{ matrix.jdk }}"
+ path: ${{ github.workspace }}/rat.zip
- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v1
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 dc2e8f2..b33d32c 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
diff --git a/pom.xml b/pom.xml
index 0fdcc22..b1a1695 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<maven_jacoco_version>0.8.2</maven_jacoco_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
<maven_enforce_version>3.0.0-M2</maven_enforce_version>
- <apache-rat-plugin.version>0.12</apache-rat-plugin.version>
+ <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
<arguments />
<checkstyle.skip>true</checkstyle.skip>
<rat.skip>true</rat.skip>
@@ -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,
</excludes>
</configuration>
<goals>