This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-numbers.git
commit cbfd89e82ee8321489a9b789c6b23a41df918987
Author: Alex Herbert <aherb...@apache.org>
AuthorDate: Thu Jul 4 15:53:43 2024 +0100
Move plugin resources to src/conf
When included in src/main/resources they are packaged and deployed in
output artifacts or the site files.
---
pom.xml | 20 ++++++++++----------
.../checkstyle/checkstyle-suppressions.xml | 0
.../resources => conf}/checkstyle/checkstyle.xml | 0
.../resources => conf}/checkstyle/license-header.txt | 0
src/{main/resources => conf}/pmd/pmd-ruleset.xml | 0
.../spotbugs/spotbugs-exclude-filter.xml | 0
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index dcce5936..080ca491 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,9 +229,9 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
-
<configLocation>${numbers.parent.dir}/src/main/resources/checkstyle/checkstyle.xml</configLocation>
-
<headerLocation>${numbers.parent.dir}/src/main/resources/checkstyle/license-header.txt</headerLocation>
-
<suppressionsLocation>${numbers.parent.dir}/src/main/resources/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+
<configLocation>${numbers.parent.dir}/src/conf/checkstyle/checkstyle.xml</configLocation>
+
<headerLocation>${numbers.parent.dir}/src/conf/checkstyle/license-header.txt</headerLocation>
+
<suppressionsLocation>${numbers.parent.dir}/src/conf/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<enableRulesSummary>false</enableRulesSummary>
<!-- Output issues to console. -->
<consoleOutput>false</consoleOutput>
@@ -255,7 +255,7 @@
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
-
<excludeFilterFile>${numbers.parent.dir}/src/main/resources/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
+
<excludeFilterFile>${numbers.parent.dir}/src/conf/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
</configuration>
<executions>
<execution>
@@ -276,7 +276,7 @@
<skipEmptyReport>false</skipEmptyReport>
<analysisCache>true</analysisCache>
<rulesets>
-
<ruleset>${numbers.parent.dir}/src/main/resources/pmd/pmd-ruleset.xml</ruleset>
+
<ruleset>${numbers.parent.dir}/src/conf/pmd/pmd-ruleset.xml</ruleset>
</rulesets>
<excludeRoots>
<excludeRoot>target/generated-sources</excludeRoot>
@@ -401,9 +401,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
-
<configLocation>${numbers.parent.dir}/src/main/resources/checkstyle/checkstyle.xml</configLocation>
-
<headerLocation>${numbers.parent.dir}/src/main/resources/checkstyle/license-header.txt</headerLocation>
-
<suppressionsLocation>${numbers.parent.dir}/src/main/resources/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+
<configLocation>${numbers.parent.dir}/src/conf/checkstyle/checkstyle.xml</configLocation>
+
<headerLocation>${numbers.parent.dir}/src/conf/checkstyle/license-header.txt</headerLocation>
+
<suppressionsLocation>${numbers.parent.dir}/src/conf/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<enableRulesSummary>false</enableRulesSummary>
<includeResources>false</includeResources>
</configuration>
@@ -421,7 +421,7 @@
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
-
<excludeFilterFile>${numbers.parent.dir}/src/main/resources/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
+
<excludeFilterFile>${numbers.parent.dir}/src/conf/spotbugs/spotbugs-exclude-filter.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
@@ -433,7 +433,7 @@
<skipEmptyReport>false</skipEmptyReport>
<analysisCache>true</analysisCache>
<rulesets>
-
<ruleset>${numbers.parent.dir}/src/main/resources/pmd/pmd-ruleset.xml</ruleset>
+
<ruleset>${numbers.parent.dir}/src/conf/pmd/pmd-ruleset.xml</ruleset>
</rulesets>
</configuration>
<reportSets>
diff --git a/src/main/resources/checkstyle/checkstyle-suppressions.xml
b/src/conf/checkstyle/checkstyle-suppressions.xml
similarity index 100%
rename from src/main/resources/checkstyle/checkstyle-suppressions.xml
rename to src/conf/checkstyle/checkstyle-suppressions.xml
diff --git a/src/main/resources/checkstyle/checkstyle.xml
b/src/conf/checkstyle/checkstyle.xml
similarity index 100%
rename from src/main/resources/checkstyle/checkstyle.xml
rename to src/conf/checkstyle/checkstyle.xml
diff --git a/src/main/resources/checkstyle/license-header.txt
b/src/conf/checkstyle/license-header.txt
similarity index 100%
rename from src/main/resources/checkstyle/license-header.txt
rename to src/conf/checkstyle/license-header.txt
diff --git a/src/main/resources/pmd/pmd-ruleset.xml
b/src/conf/pmd/pmd-ruleset.xml
similarity index 100%
rename from src/main/resources/pmd/pmd-ruleset.xml
rename to src/conf/pmd/pmd-ruleset.xml
diff --git a/src/main/resources/spotbugs/spotbugs-exclude-filter.xml
b/src/conf/spotbugs/spotbugs-exclude-filter.xml
similarity index 100%
rename from src/main/resources/spotbugs/spotbugs-exclude-filter.xml
rename to src/conf/spotbugs/spotbugs-exclude-filter.xml
