From 79312b1fd8a2458b3e8d460b1c7d691e56d642f6 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 5 Oct 2022 11:51:01 +0200 Subject: [PATCH 1/4] Make sure RAT plugin ignores files in the target folder --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 950f3f903400..4e2bb5b1f854 100644 --- a/pom.xml +++ b/pom.xml @@ -590,7 +590,8 @@ under the License. src/main/appended-resources/licenses/EPL-1.0.txt src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt - plexus-utils/target/** + + **/target/** From ecb52cdaaf3795a8aae26885d1bc0ef1bde63302 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 5 Oct 2022 14:42:47 +0200 Subject: [PATCH 2/4] Fix gitignore so that it can work with rat, do not inherit execution in children, use a single place to configure rat --- .gitignore | 2 +- maven-bom/pom.xml | 10 +++++++++ pom.xml | 53 ++++++++++++++++++++--------------------------- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 69c3758e8ae0..c03e1a60331b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -target/ +**/target/** .project .classpath .settings/ diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml index 257eac644a4b..ac7a6faa6780 100644 --- a/maven-bom/pom.xml +++ b/maven-bom/pom.xml @@ -160,6 +160,16 @@ under the License. ${project.distributionManagement.site.url}/.. + + org.apache.rat + apache-rat-plugin + + + rat-check + none + + + diff --git a/pom.xml b/pom.xml index 4e2bb5b1f854..643aac9dfe34 100644 --- a/pom.xml +++ b/pom.xml @@ -573,28 +573,6 @@ under the License. buildnumber-maven-plugin 1.4 - - org.apache.rat - apache-rat-plugin - - - **/.gitattributes - src/test/resources*/** - src/test/projects/** - src/test/remote-repo/** - **/*.odg - - src/main/appended-resources/licenses/MIT-slf4j-api-1.7.30.txt - src/main/appended-resources/licenses/EPL-1.0.txt - src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt - src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt - - **/target/** - - - @@ -636,14 +614,29 @@ under the License. org.apache.rat apache-rat-plugin - - - bootstrap/** - README.bootstrap.txt - README.md - **/.factorypath - - + + + rat-check + false + + + **/.gitattributes + src/test/resources*/** + src/test/projects/** + src/test/remote-repo/** + **/*.odg + + src/main/appended-resources/licenses/MIT-slf4j-api-1.7.30.txt + src/main/appended-resources/licenses/EPL-1.0.txt + src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt + src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt + + .gitignore + + + org.apache.maven.plugins From 582f140ce1e94945283ce0e3fecc9decd6e6ddf4 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 5 Oct 2022 14:53:20 +0200 Subject: [PATCH 3/4] Exclude .asf.yaml from rat check --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 643aac9dfe34..a7a5c65afa98 100644 --- a/pom.xml +++ b/pom.xml @@ -625,6 +625,7 @@ under the License. src/test/projects/** src/test/remote-repo/** **/*.odg + .asf.yaml @@ -633,7 +634,6 @@ under the License. src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt - .gitignore From a6c730ca4f288f9764d50879ea226df75ed22b34 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 5 Oct 2022 14:56:59 +0200 Subject: [PATCH 4/4] Add repo/ to the .gitignore file as it's often used for local repository --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c03e1a60331b..b630410a53e8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ .checkstyle .factorypath .vscode/ +repo/