Remove AvoidInlineConditionals rule.

Remove checkstyle license validations in favor of rat plugin. Add defaultGoal checkstyle validations.
apache · May 23, 2021 · 6ed7f3c · 6ed7f3c
1 parent 5b5e8a6
commit 6ed7f3c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git 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
@@ -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"/ -->