diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 2e9b7aacb64..a5438d7bb4c 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -70,16 +70,7 @@ jobs: - name: "Build Dubbo with Maven" run: | cd ./dubbo - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,rat,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - - 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@v3 - with: - name: "rat-file" - path: ${{ github.workspace }}/rat.zip + ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - name: "Pack checkstyle file if failure" if: failure() run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r diff --git a/.github/workflows/build-and-test-scheduled-3.0.yml b/.github/workflows/build-and-test-scheduled-3.0.yml index b8dedaeb595..2659f798017 100644 --- a/.github/workflows/build-and-test-scheduled-3.0.yml +++ b/.github/workflows/build-and-test-scheduled-3.0.yml @@ -50,16 +50,7 @@ jobs: - name: "Build Dubbo with Maven" run: | cd ./dubbo - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,rat,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - - 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@v3 - with: - name: "rat-file" - path: ${{ github.workspace }}/rat.zip + ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - name: "Pack checkstyle file if failure" if: failure() run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index 75cc2f1798c..eebfdcc395b 100644 --- a/.github/workflows/build-and-test-scheduled-3.1.yml +++ b/.github/workflows/build-and-test-scheduled-3.1.yml @@ -60,16 +60,7 @@ jobs: - name: "Build Dubbo with Maven" run: | cd ./dubbo - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,rat,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - - 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@v3 - with: - name: "rat-file" - path: ${{ github.workspace }}/rat.zip + ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - name: "Pack checkstyle file if failure" if: failure() run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index 9431efa2447..5c8c43dd346 100644 --- a/.github/workflows/build-and-test-scheduled-3.2.yml +++ b/.github/workflows/build-and-test-scheduled-3.2.yml @@ -60,16 +60,7 @@ jobs: - name: "Build Dubbo with Maven" run: | cd ./dubbo - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,rat,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - - 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@v3 - with: - name: "rat-file" - path: ${{ github.workspace }}/rat.zip + ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - name: "Pack checkstyle file if failure" if: failure() run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index ee8348c5a7c..17c591e6c89 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -58,16 +58,7 @@ jobs: - name: "Build Dubbo with Maven" run: | cd ./dubbo - ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,rat,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - - 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" - path: ${{ github.workspace }}/rat.zip + ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean source:jar install -Pjacoco,checkstyle -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -Dmaven.test.skip=true -Dmaven.test.skip.exec=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper - name: "Pack checkstyle file if failure" if: failure() run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r diff --git a/dubbo-build-tools/pom.xml b/dubbo-build-tools/pom.xml index f0f0be33746..28bae806b19 100644 --- a/dubbo-build-tools/pom.xml +++ b/dubbo-build-tools/pom.xml @@ -27,55 +27,4 @@ true - - - - org.apache.rat - apache-rat-plugin - 0.15 - - - verify.rat - verify - - check - - - - - - **/*.versionsBackup - **/.idea/ - **/*.iml - **/*.txt - **/*.load - **/*.flex - **/*.fc - **/*.javascript - **/*.properties - **/*.thrift - **/*.sh - **/*.bat - **/*.md - .git/ - .gitignore - .repository/ - **/.settings/* - **/.classpath - **/.project - **/target/** - **/generated/** - **/*.log - CONTRIBUTING.md - README.md - **/codestyle/* - **/resources/META-INF/** - .github/** - compiler/** - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index ad4062256cb..82a65a04c7e 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,6 @@ 0.8.8 1.3.0 3.2.1 - 0.15 true true @@ -273,13 +272,7 @@ false - - - rat - - false - - + checkstyle @@ -705,81 +698,6 @@ ${file_encoding} - - org.apache.rat - apache-rat-plugin - ${apache-rat-plugin.version} - - - rat-validate - validate - - check - - - - - - **/*.versionsBackup - **/.idea/ - **/*.iml - **/*.txt - **/*.load - **/*.flex - **/*.fc - **/*.properties - **/*.sh - **/*.bat - **/*.md - .git/ - .tmp/ - .gitignore - - .repository/ - **/.settings/* - **/.classpath - **/.project - **/target/** - **/*.log - CODE_OF_CONDUCT.md - .codecov.yml - .travis.yml - PULL_REQUEST_TEMPLATE.md - CONTRIBUTING.md - README.md - Jenkinsfile - **/codestyle/* - **/resources/META-INF/** - - **/org/apache/dubbo/common/threadpool/serial/SerializingExecutor.java - - **/org/apache/dubbo/common/threadlocal/InternalThreadLocal.java - **/org/apache/dubbo/common/threadlocal/InternalThreadLocalMap.java - **/org/apache/dubbo/common/timer/TimerTask.java - **/org/apache/dubbo/common/timer/Timer.java - **/org/apache/dubbo/common/timer/Timeout.java - **/org/apache/dubbo/common/timer/HashedWheelTimer.java - - **/org/apache/dubbo/common/utils/CIDRUtils.java - - **/org/apache/dubbo/common/serialize/protobuf/support/wrapper/MapValue.java - - - **/org/apache/dubbo/common/serialize/protobuf/support/wrapper/ThrowablePB.java - - - **/org/apache/dubbo/common/utils/Utf8Utils.java - - **/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java - .github/** - compiler/** - **/generated/** - - **/mockito-extensions/* - **/*.dubbo.cache - - - org.apache.maven.plugins maven-release-plugin