This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.1 by this push:
new 5c0002c317 Backport of remove apache-rat-plugin. (#11523) (#11592)
5c0002c317 is described below
commit 5c0002c3174ea9e04c710f8386180a720ed2b72e
Author: Andy Cheung <[email protected]>
AuthorDate: Mon Feb 20 15:43:51 2023 +0800
Backport of remove apache-rat-plugin. (#11523) (#11592)
---
.github/workflows/build-and-test-pr.yml | 11 +--
.github/workflows/build-and-test-scheduled-3.0.yml | 11 +--
.github/workflows/build-and-test-scheduled-3.1.yml | 11 +--
.github/workflows/build-and-test-scheduled-3.2.yml | 11 +--
.github/workflows/release-test.yml | 11 +--
dubbo-build-tools/pom.xml | 51 --------------
pom.xml | 82 ----------------------
7 files changed, 5 insertions(+), 183 deletions(-)
diff --git a/.github/workflows/build-and-test-pr.yml
b/.github/workflows/build-and-test-pr.yml
index cf3f0ab106..34da3805a8 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 b8dedaeb59..2659f79801 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 bf8dd1ace6..be33c7faf6 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 a65db836d2..b133e06502 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 f8492e8517..3986baadbc 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 a1a0c60df1..28bae806b1 100644
--- a/dubbo-build-tools/pom.xml
+++ b/dubbo-build-tools/pom.xml
@@ -27,55 +27,4 @@
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.13</version>
- <executions>
- <execution>
- <id>verify.rat</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/*.versionsBackup</exclude>
- <exclude>**/.idea/</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.load</exclude>
- <exclude>**/*.flex</exclude>
- <exclude>**/*.fc</exclude>
- <exclude>**/*.javascript</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.thrift</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.bat</exclude>
- <exclude>**/*.md</exclude>
- <exclude>.git/</exclude>
- <exclude>.gitignore</exclude>
- <exclude>.repository/</exclude>
- <exclude>**/.settings/*</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/generated/**</exclude>
- <exclude>**/*.log</exclude>
- <exclude>CONTRIBUTING.md</exclude>
- <exclude>README.md</exclude>
- <exclude>**/codestyle/*</exclude>
- <exclude>**/resources/META-INF/**</exclude>
- <exclude>.github/**</exclude>
- <exclude>compiler/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 38de091be0..c414486d82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,6 @@
<maven_jacoco_version>0.8.8</maven_jacoco_version>
<maven_flatten_version>1.3.0</maven_flatten_version>
<maven_enforce_version>3.0.0-M3</maven_enforce_version>
- <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
<arguments />
<checkstyle.skip>true</checkstyle.skip>
<checkstyle_unix.skip>true</checkstyle_unix.skip>
@@ -273,13 +272,6 @@
<jacoco.skip>false</jacoco.skip>
</properties>
</profile>
- <!-- check apache license: mvn validate -Prat -->
- <profile>
- <id>rat</id>
- <properties>
- <rat.skip>false</rat.skip>
- </properties>
- </profile>
<!-- check code style: mvn validate -Pcheckstyle -->
<profile>
<id>checkstyle</id>
@@ -655,80 +647,6 @@
<encoding>${file_encoding}</encoding>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache-rat-plugin.version}</version>
- <executions>
- <execution>
- <id>rat-validate</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/*.versionsBackup</exclude>
- <exclude>**/.idea/</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.load</exclude>
- <exclude>**/*.flex</exclude>
- <exclude>**/*.fc</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.bat</exclude>
- <exclude>**/*.md</exclude>
- <exclude>.git/</exclude>
- <exclude>.tmp/</exclude>
- <exclude>.gitignore</exclude>
- <!-- ASF jenkins box puts the Maven repo in our root
directory. -->
- <exclude>.repository/</exclude>
- <exclude>**/.settings/*</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/*.log</exclude>
- <exclude>CODE_OF_CONDUCT.md</exclude>
- <exclude>.codecov.yml</exclude>
- <exclude>.travis.yml</exclude>
- <exclude>PULL_REQUEST_TEMPLATE.md</exclude>
- <exclude>CONTRIBUTING.md</exclude>
- <exclude>README.md</exclude>
- <exclude>Jenkinsfile</exclude>
- <exclude>**/codestyle/*</exclude>
- <exclude>**/resources/META-INF/**</exclude>
- <!-- exclude the grpc files -->
-
<exclude>**/org/apache/dubbo/common/threadpool/serial/SerializingExecutor.java</exclude>
- <!-- exclude the netty files -->
-
<exclude>**/org/apache/dubbo/common/threadlocal/InternalThreadLocal.java</exclude>
-
<exclude>**/org/apache/dubbo/common/threadlocal/InternalThreadLocalMap.java</exclude>
-
<exclude>**/org/apache/dubbo/common/timer/TimerTask.java</exclude>
-
<exclude>**/org/apache/dubbo/common/timer/Timer.java</exclude>
-
<exclude>**/org/apache/dubbo/common/timer/Timeout.java</exclude>
-
<exclude>**/org/apache/dubbo/common/timer/HashedWheelTimer.java</exclude>
- <!-- exclude the edazdarevic files -->
-
<exclude>**/org/apache/dubbo/common/utils/CIDRUtils.java</exclude>
- <!-- exclude protobuf generated files -->
-
<exclude>**/org/apache/dubbo/common/serialize/protobuf/support/wrapper/MapValue.java
- </exclude>
- <exclude>
-
**/org/apache/dubbo/common/serialize/protobuf/support/wrapper/ThrowablePB.java
- </exclude>
- <exclude>
- **/org/apache/dubbo/common/utils/Utf8Utils.java
- </exclude>
- <exclude>.github/**</exclude>
- <exclude>compiler/**</exclude>
- <exclude>**/generated/**</exclude>
- <!-- exclude mockito extensions spi files -->
- <exclude>**/mockito-extensions/*</exclude>
- <exclude>**/*.dubbo.cache</exclude>
- </excludes>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
