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/18 13:56:45 UTC
[commons-net] 01/04: Declutter root folder from Checkstyle
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-net.git
commit 5fac3d9648ae48727b48a27b79a2cb813ba198dd
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 18 09:45:27 2023 -0400
Declutter root folder from Checkstyle
---
pom.xml | 13 +++++++------
.../conf/checkstyle-suppressions.xml | 0
checkstyle.xml => src/conf/checkstyle.xml | 0
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index aa739946..46a9e7b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-net</commons.scmPubUrl>
<japicmp.skip>false</japicmp.skip>
<jacoco.skip>false</jacoco.skip>
+ <checkstyle.configdir>src/conf</checkstyle.configdir>
<!-- Current release -->
<commons.release.version>3.10.0</commons.release.version>
@@ -360,10 +361,10 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>${checkstyle.configdir}/checkstyle.xml</configLocation>
<!-- Needed to define config_loc for use by Eclipse -->
- <propertyExpansion>config_loc=${basedir}</propertyExpansion>
- <suppressionsLocation>${basedir}/checkstyle-suppressions.xml</suppressionsLocation>
+ <propertyExpansion>config_loc=${checkstyle.configdir}</propertyExpansion>
+ <suppressionsLocation>${checkstyle.configdir}/checkstyle-suppressions.xml</suppressionsLocation>
<enableRulesSummary>false</enableRulesSummary>
</configuration>
</plugin>
@@ -395,10 +396,10 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${commons.checkstyle-plugin.version}</version>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>${checkstyle.configdir}/checkstyle.xml</configLocation>
<!-- Needed to define config_loc for use by Eclipse -->
- <propertyExpansion>config_loc=${basedir}</propertyExpansion>
- <suppressionsLocation>${basedir}/checkstyle-suppressions.xml</suppressionsLocation>
+ <propertyExpansion>config_loc=${checkstyle.configdir}</propertyExpansion>
+ <suppressionsLocation>${checkstyle.configdir}/checkstyle-suppressions.xml</suppressionsLocation>
<enableRulesSummary>false</enableRulesSummary>
</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