You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/12/09 11:54:42 UTC
svn commit: r1718812 - in /commons/proper/jexl/trunk: pom.xml
src/main/config/checkstyle.xml
Author: sebb
Date: Wed Dec 9 10:54:42 2015
New Revision: 1718812
URL: http://svn.apache.org/viewvc?rev=1718812&view=rev
Log:
Update checkstyle rules and plugin versions
Modified:
commons/proper/jexl/trunk/pom.xml
commons/proper/jexl/trunk/src/main/config/checkstyle.xml
Modified: commons/proper/jexl/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=1718812&r1=1718811&r2=1718812&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Wed Dec 9 10:54:42 2015
@@ -154,7 +154,7 @@
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
- <finalName>commons-jexl-${pom.version}</finalName>
+ <finalName>commons-jexl-${project.version}</finalName>
</configuration>
</plugin>
<plugin>
@@ -213,6 +213,33 @@
</ignorePathsToDelete>
</configuration>
</plugin>
+ <!-- Allow checkstyle to be run from command-line. Must agree with config in report section. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.16</version>
+ <configuration>
+ <configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
+ <suppressionsLocation>${basedir}/src/main/config/checkstyle-suppressions.xml</suppressionsLocation>
+ <excludes>org/apache/commons/jexl3/parser/*.java</excludes>
+ <headerLocation>${basedir}/src/main/config/header.txt</headerLocation>
+ <enableRulesSummary>true</enableRulesSummary>
+ </configuration>
+ <!-- Update embedded checkstyle to latest -->
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.13</version>
+ <exclusions><!-- MCHECKSTYLE-156 -->
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
@@ -229,7 +256,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.8</version>
+ <version>2.11</version>
<configuration>
<xmlPath>${basedir}/src/site/xdoc/changes.xml</xmlPath>
<issueLinkTemplatePerSystem>
@@ -240,20 +267,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.16</version>
<configuration>
<configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
+ <suppressionsLocation>${basedir}/src/main/config/checkstyle-suppressions.xml</suppressionsLocation>
<excludes>org/apache/commons/jexl3/parser/*.java</excludes>
<headerLocation>${basedir}/src/main/config/header.txt</headerLocation>
<enableRulesSummary>false</enableRulesSummary>
</configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>checkstyle</report>
- </reports>
- </reportSet>
- </reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -262,7 +283,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.2</version>
<configuration>
<excludeFilterFile>${basedir}/src/main/config/findbugs-exclude-filter.xml</excludeFilterFile>
<xmlOutput>true</xmlOutput>
@@ -273,19 +294,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
+ <version>3.5</version>
<configuration>
- <targetJdk>1.6</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
<excludes>
<excludes>**/generated-sources/**/*</excludes>
</excludes>
<rulesets>
- <ruleset>/rulesets/braces.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- <ruleset>/rulesets/imports.xml</ruleset>
- <ruleset>/rulesets/coupling.xml</ruleset>
- <ruleset>/rulesets/design.xml</ruleset>
- <ruleset>/rulesets/strings.xml</ruleset>
+ <ruleset>/rulesets/java/braces.xml</ruleset>
+ <ruleset>/rulesets/java/unusedcode.xml</ruleset>
+ <ruleset>/rulesets/java/imports.xml</ruleset>
+ <ruleset>/rulesets/java/coupling.xml</ruleset>
+ <ruleset>/rulesets/java/design.xml</ruleset>
+ <ruleset>/rulesets/java/strings.xml</ruleset>
</rulesets>
</configuration>
</plugin>
Modified: commons/proper/jexl/trunk/src/main/config/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/config/checkstyle.xml?rev=1718812&r1=1718811&r2=1718812&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/config/checkstyle.xml (original)
+++ commons/proper/jexl/trunk/src/main/config/checkstyle.xml Wed Dec 9 10:54:42 2015
@@ -83,6 +83,7 @@
<!-- value="${basedir}/java.header"/> -->
<property name="headerFile" value="${checkstyle.header.file}"/>
<property name="ignoreLines" value="2"/>
+ <property name="fileExtensions" value="java,xml"/>
</module>
<!-- See http://checkstyle.sf.net/config_sizes.html -->
@@ -151,13 +152,15 @@
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
<module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
+ <!-- too agressive module name="RedundantModifier"/-->
<!-- Checks for blocks. You know, those {}'s -->
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
+ <module name="EmptyBlock">
+ <property name="option" value="text"/>
+ </module>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
@@ -166,7 +169,6 @@
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
<!-- JEXL: module name="AvoidInlineConditionals"/-->
- <module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="HiddenField"/>
@@ -188,7 +190,8 @@
<!-- JEXL: module name="HideUtilityClassConstructor"/-->
<module name="InterfaceIsType"/>
<module name="VisibilityModifier">
- <property name="protectedAllowed" value="true"/>
+ <property name="packageAllowed" value="true"/>
+ <property name="protectedAllowed" value="false"/>
</module>