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 2020/02/17 14:23:31 UTC
[commons-lang] branch master updated: De-clutter root folder by
moving Checkstyle configuration files into src.
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-lang.git
The following commit(s) were added to refs/heads/master by this push:
new f20df21 De-clutter root folder by moving Checkstyle configuration files into src.
f20df21 is described below
commit f20df2124907ec20479bff5f8784a8dbbdc48425
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Feb 17 09:23:27 2020 -0500
De-clutter root folder by moving Checkstyle configuration files into
src.
---
pom.xml | 5 +++--
.../site/resources/checkstyle/checkstyle-suppressions.xml | 0
checkstyle.xml => src/site/resources/checkstyle/checkstyle.xml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index a76c799..b3c484b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -601,6 +601,7 @@
<checkstyle.plugin.version>3.1.0</checkstyle.plugin.version>
<checkstyle.version>8.29</checkstyle.version>
+ <checkstyle.configdir>src/site/resources/checkstyle</checkstyle.configdir>
<spotbugs.plugin.version>3.1.12.2</spotbugs.plugin.version>
<japicmp.skip>false</japicmp.skip>
@@ -744,7 +745,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>${checkstyle.configdir}/checkstyle.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<enableRulesSummary>false</enableRulesSummary>
</configuration>
@@ -781,7 +782,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>${checkstyle.configdir}/checkstyle.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<enableRulesSummary>false</enableRulesSummary>
</configuration>
diff --git a/checkstyle-suppressions.xml b/src/site/resources/checkstyle/checkstyle-suppressions.xml
similarity index 100%
rename from checkstyle-suppressions.xml
rename to src/site/resources/checkstyle/checkstyle-suppressions.xml
diff --git a/checkstyle.xml b/src/site/resources/checkstyle/checkstyle.xml
similarity index 95%
rename from checkstyle.xml
rename to src/site/resources/checkstyle/checkstyle.xml
index ad7c68a..279bd8c 100644
--- a/checkstyle.xml
+++ b/src/site/resources/checkstyle/checkstyle.xml
@@ -36,7 +36,7 @@ limitations under the License.
<property name="message" value="Line has trailing spaces."/>
</module>
<module name="SuppressionFilter">
- <property name="file" value="checkstyle-suppressions.xml"/>
+ <property name="file" value="src/site/resources/checkstyle/checkstyle-suppressions.xml"/>
</module>
<module name="TreeWalker">
<module name="AvoidStarImport"/>