This is an automated email from the ASF dual-hosted git repository.
jochen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
The following commit(s) were added to refs/heads/master by this push:
new 6ed7f3c Remove AvoidInlineConditionals rule. Remove checkstyle
license validations in favor of rat plugin. Add defaultGoal checkstyle
validations.
new 000db65 Merge pull request #92 from arturobernalg/checkstyle_enhance
6ed7f3c is described below
commit 6ed7f3cc78ad3e6c5425ba2c5bc781383f420276
Author: Arturo Bernal <[email protected]>
AuthorDate: Sun May 23 14:59:24 2021 +0200
Remove AvoidInlineConditionals rule.
Remove checkstyle license validations in favor of rat plugin.
Add defaultGoal checkstyle validations.
---
pom.xml | 19 ++++++++++++++++---
src/checkstyle/fileupload_checks.xml | 6 ------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index cf6f43b..9e2dfc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,6 +234,8 @@
<commons.releaseManagerKey>B6E73D84EA4FCC47166087253FAAD2CD5ECBB314</commons.releaseManagerKey>
<spotbugs.plugin.version>4.2.3</spotbugs.plugin.version>
<spotbugs.impl.version>4.2.3</spotbugs.impl.version>
+ <checkstyle.plugin.version>3.1.2</checkstyle.plugin.version>
+
</properties>
<dependencies>
@@ -357,9 +359,20 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ <configuration>
+
<configLocation>${basedir}/src/checkstyle/fileupload_checks.xml</configLocation>
+
<suppressionsLocation>${basedir}/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>false</includeTestSourceDirectory>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
- <defaultGoal>clean verify apache-rat:check clirr:check javadoc:javadoc
spotbugs:check</defaultGoal>
+ <defaultGoal>clean verify apache-rat:check clirr:check checkstyle:check
javadoc:javadoc spotbugs:check</defaultGoal>
</build>
<reporting>
@@ -383,12 +396,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.2</version>
+ <version>${checkstyle.plugin.version}</version>
<configuration>
<configLocation>${basedir}/src/checkstyle/fileupload_checks.xml</configLocation>
<suppressionsLocation>${basedir}/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>false</includeTestSourceDirectory>
<enableRulesSummary>false</enableRulesSummary>
-
<headerLocation>${basedir}/src/checkstyle/license-header.txt</headerLocation>
</configuration>
</plugin>
<plugin>
diff --git a/src/checkstyle/fileupload_checks.xml
b/src/checkstyle/fileupload_checks.xml
index 7ef9935..1abd1d5 100644
--- a/src/checkstyle/fileupload_checks.xml
+++ b/src/checkstyle/fileupload_checks.xml
@@ -74,11 +74,6 @@
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
<module name="Translation"/>
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
- <module name="RegexpHeader">
- <property name="headerFile" value="${checkstyle.header.file}"/>
- </module>
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
@@ -200,7 +195,6 @@
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="AvoidInlineConditionals"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<!-- Disabled for FileUpload: module name="HiddenField"/ -->
