This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 1702ee2ed27 Remove install verify of apache rat (#24981)
1702ee2ed27 is described below
commit 1702ee2ed27fe6540b30d7681147f092052f2eff
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Apr 3 19:36:27 2023 +0800
Remove install verify of apache rat (#24981)
* Upgrade version of spotless
* Remove install verify of apache rat
* Remove install verify of apache rat
* Remove install verify of apache rat
* Remove install verify of apache rat
---
.github/workflows/ci.yml | 2 +-
.github/workflows/e2e-agent.yml | 2 +-
.github/workflows/e2e-pipeline.yml | 2 +-
.github/workflows/e2e-showprocesslist.yml | 2 +-
.github/workflows/e2e-sql.yml | 2 +-
.github/workflows/e2e-transaction.yml | 2 +-
.github/workflows/nightly-build-artifact.yml | 2 +-
.github/workflows/nightly-build-example.yml | 2 +-
.github/workflows/nightly-check.yml | 2 +-
.github/workflows/nightly-ci.yml | 2 +-
.github/workflows/nightly-e2e.yml | 2 +-
.github/workflows/nightly-sql-parser.yml | 2 +-
pom.xml | 19 +++----------------
src/resources/{ => spotless}/copyright.txt | 0
src/resources/{spotless.xml => spotless/java.xml} | 0
15 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8ff24805c54..6f14fb1b875 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
-Dspotbugs.skip=true -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true
-Djacoco.skip=true -Drat.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
-Dspotbugs.skip=true -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true
-Djacoco.skip=true
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/e2e-agent.yml b/.github/workflows/e2e-agent.yml
index 038539b6e0e..4f3a3097fa4 100644
--- a/.github/workflows/e2e-agent.yml
+++ b/.github/workflows/e2e-agent.yml
@@ -53,7 +53,7 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Dspotbugs.skip=true -Djacoco.skip=true
-Dspotless.apply.skip=true -Drat.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Dspotbugs.skip=true -Djacoco.skip=true
-Dspotless.apply.skip=true
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/e2e-pipeline.yml
b/.github/workflows/e2e-pipeline.yml
index af227ce3ed5..ea3388516d1 100644
--- a/.github/workflows/e2e-pipeline.yml
+++ b/.github/workflows/e2e-pipeline.yml
@@ -67,7 +67,7 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Dspotbugs.skip=true -Dspotless.apply.skip=true
-Djacoco.skip=true -Drat.skip=true -Dfailsafe.skipAfterFailureCount=1
-Dio.netty.leakDetectionLevel=advanced
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Dspotbugs.skip=true -Dspotless.apply.skip=true
-Djacoco.skip=true -Dfailsafe.skipAfterFailureCount=1
-Dio.netty.leakDetectionLevel=advanced
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/e2e-showprocesslist.yml
b/.github/workflows/e2e-showprocesslist.yml
index b5d3efdf769..30073f08574 100644
--- a/.github/workflows/e2e-showprocesslist.yml
+++ b/.github/workflows/e2e-showprocesslist.yml
@@ -53,7 +53,7 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Dspotbugs.skip=true -Dspotless.apply.skip=true
-Djacoco.skip=true -Drat.skip=true -Dfailsafe.skipAfterFailureCount=1
-Dio.netty.leakDetectionLevel=advanced
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Dspotbugs.skip=true -Dspotless.apply.skip=true
-Djacoco.skip=true -Dfailsafe.skipAfterFailureCount=1
-Dio.netty.leakDetectionLevel=advanced
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml
index 16c344ff078..cca109b495f 100644
--- a/.github/workflows/e2e-sql.yml
+++ b/.github/workflows/e2e-sql.yml
@@ -59,7 +59,7 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Djacoco.skip=true -Dspotbugs.skip=true
-Dspotless.apply.skip=true -Drat.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Djacoco.skip=true -Dspotbugs.skip=true
-Dspotless.apply.skip=true
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/e2e-transaction.yml
b/.github/workflows/e2e-transaction.yml
index f16c1808e73..eaf547df1c8 100644
--- a/.github/workflows/e2e-transaction.yml
+++ b/.github/workflows/e2e-transaction.yml
@@ -57,7 +57,7 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Dspotbugs.skip=true -Dspotless.apply.skip=true
-Djacoco.skip=true -Drat.skip=true -Dfailsafe.skipAfterFailureCount=1
-Dio.netty.leakDetectionLevel=advanced
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Dspotbugs.skip=true -Dspotless.apply.skip=true
-Djacoco.skip=true -Dfailsafe.skipAfterFailureCount=1
-Dio.netty.leakDetectionLevel=advanced
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/nightly-build-artifact.yml
b/.github/workflows/nightly-build-artifact.yml
index f46022e4c1d..eb92da0e516 100644
--- a/.github/workflows/nightly-build-artifact.yml
+++ b/.github/workflows/nightly-build-artifact.yml
@@ -27,7 +27,7 @@ on:
type: string
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
-Dmaven.javadoc.skip=true -Djacoco.skip=true -DskipITs -DskipTests
-Dspotbugs.skip=true -Dspotless.apply.skip=true -Drat.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
-Dmaven.javadoc.skip=true -Djacoco.skip=true -DskipITs -DskipTests
-Dspotbugs.skip=true -Dspotless.apply.skip=true
REPOSITORY: apache/shardingsphere
REPOSITORY_NAME: shardingsphere
HUB: ghcr.io/apache/shardingsphere
diff --git a/.github/workflows/nightly-build-example.yml
b/.github/workflows/nightly-build-example.yml
index 1c6e9d129d3..43fda152ea7 100644
--- a/.github/workflows/nightly-build-example.yml
+++ b/.github/workflows/nightly-build-example.yml
@@ -23,7 +23,7 @@ on:
workflow_dispatch:
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
-Dspotbugs.skip=true -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true
-Drat.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
-Dspotbugs.skip=true -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/nightly-check.yml
b/.github/workflows/nightly-check.yml
index 0d5d7da227f..e8d3f64a47d 100644
--- a/.github/workflows/nightly-check.yml
+++ b/.github/workflows/nightly-check.yml
@@ -23,7 +23,7 @@ on:
workflow_dispatch:
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true -Drat.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
index 5a7efbb4f5e..2cb0b6a6e08 100644
--- a/.github/workflows/nightly-ci.yml
+++ b/.github/workflows/nightly-ci.yml
@@ -23,7 +23,7 @@ on:
workflow_dispatch:
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true -Drat.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/nightly-e2e.yml
b/.github/workflows/nightly-e2e.yml
index c74a481ef12..dec9fcc4877 100644
--- a/.github/workflows/nightly-e2e.yml
+++ b/.github/workflows/nightly-e2e.yml
@@ -27,7 +27,7 @@ concurrency:
cancel-in-progress: true
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Djacoco.skip=true -Dspotbugs.skip=true
-Dspotless.apply.skip=true -Drat.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dmaven.javadoc.skip=true
-Dcheckstyle.skip=true -Djacoco.skip=true -Dspotbugs.skip=true
-Dspotless.apply.skip=true
REPOSITORY_NAME: shardingsphere
jobs:
diff --git a/.github/workflows/nightly-sql-parser.yml
b/.github/workflows/nightly-sql-parser.yml
index cbc8214d90b..50c48e8f52c 100644
--- a/.github/workflows/nightly-sql-parser.yml
+++ b/.github/workflows/nightly-sql-parser.yml
@@ -23,7 +23,7 @@ on:
workflow_dispatch:
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
-Dspotbugs.skip=true -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true
-Djacoco.skip=true -Drat.skip=true
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3 -Dcheckstyle.skip=true
-Dspotbugs.skip=true -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true
-Djacoco.skip=true
RUNS_ON: ubuntu-latest
REPOSITORY: apache/shardingsphere
REPOSITORY_NAME: shardingsphere
diff --git a/pom.xml b/pom.xml
index b6228d3a8d3..42a8eb885b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
<docker-compose-maven-plugin.version>4.0.0</docker-compose-maven-plugin.version>
<templating-maven-plugin.version>1.0.0</templating-maven-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
- <spotless-maven-plugin.version>2.35.0</spotless-maven-plugin.version>
+ <spotless-maven-plugin.version>2.22.1</spotless-maven-plugin.version>
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
</properties>
@@ -853,19 +853,6 @@
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
@@ -887,10 +874,10 @@
<configuration>
<java>
<eclipse>
- <file>src/resources/spotless.xml</file>
+ <file>src/resources/spotless/java.xml</file>
</eclipse>
<licenseHeader>
- <file>src/resources/copyright.txt</file>
+ <file>src/resources/spotless/copyright.txt</file>
</licenseHeader>
</java>
<pom>
diff --git a/src/resources/copyright.txt b/src/resources/spotless/copyright.txt
similarity index 100%
rename from src/resources/copyright.txt
rename to src/resources/spotless/copyright.txt
diff --git a/src/resources/spotless.xml b/src/resources/spotless/java.xml
similarity index 100%
rename from src/resources/spotless.xml
rename to src/resources/spotless/java.xml
