You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/09/19 13:46:03 UTC
[commons-imaging] branch master updated: Declutter root folder of Checkstyle files
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new 888ad4e1 Declutter root folder of Checkstyle files
888ad4e1 is described below
commit 888ad4e13d9ff1311662d637906c5f8567a3b075
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Sep 19 09:45:59 2023 -0400
Declutter root folder of Checkstyle files
---
pom.xml | 15 ++++++++-------
.../conf/checkstyle-suppressions.xml | 0
checkstyle.xml => src/conf/checkstyle.xml | 0
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 996fc2f7..e3125ec1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
<commons.release-plugin.version>1.8.0</commons.release-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <conf.dir>src/conf</conf.dir>
<!-- Commons Release Plugin -->
<commons.release.version>1.0-alpha3</commons.release.version>
@@ -153,8 +154,8 @@
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
- <suppressionsLocation>${basedir}/checkstyle-suppressions.xml</suppressionsLocation>
+ <configLocation>${conf.dir}/checkstyle.xml</configLocation>
+ <suppressionsLocation>${conf.dir}/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>false</includeTestSourceDirectory>
<enableRulesSummary>false</enableRulesSummary>
<excludes>target/**</excludes>
@@ -164,7 +165,7 @@
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
- <excludeFilterFile>${basedir}/src/conf/spotbugs-exclude-filter.xml</excludeFilterFile>
+ <excludeFilterFile>${conf.dir}/spotbugs-exclude-filter.xml</excludeFilterFile>
</configuration>
</plugin>
</plugins>
@@ -248,8 +249,8 @@
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
- <suppressionsLocation>${basedir}/checkstyle-suppressions.xml</suppressionsLocation>
+ <configLocation>${conf.dir}/checkstyle.xml</configLocation>
+ <suppressionsLocation>${conf.dir}/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>false</includeTestSourceDirectory>
<enableRulesSummary>false</enableRulesSummary>
</configuration>
@@ -266,7 +267,7 @@
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
- <excludeFilterFile>${basedir}/src/conf/spotbugs-exclude-filter.xml</excludeFilterFile>
+ <excludeFilterFile>${conf.dir}/spotbugs-exclude-filter.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
@@ -291,7 +292,7 @@
<configuration>
<targetJdk>${maven.compiler.target}</targetJdk>
<rulesets>
- <ruleset>${basedir}/src/conf/pmd-ruleset.xml</ruleset>
+ <ruleset>${conf.dir}/pmd-ruleset.xml</ruleset>
</rulesets>
</configuration>
</plugin>
diff --git a/checkstyle-suppressions.xml b/src/conf/checkstyle-suppressions.xml
similarity index 100%
rename from checkstyle-suppressions.xml
rename to src/conf/checkstyle-suppressions.xml
diff --git a/checkstyle.xml b/src/conf/checkstyle.xml
similarity index 100%
rename from checkstyle.xml
rename to src/conf/checkstyle.xml