Adopt Checkstyle 6.5

.gitignore

@@ -1,6 +1,3 @@
 net.sf.eclipsecs.doc/docs/
-net.sf.eclipsecs.checkstyle/bin/
-net.sf.eclipsecs.core/target/
-net.sf.eclipsecs.doc/target/
-net.sf.eclipsecs.sample/target/
-net.sf.eclipsecs.ui/target/
+*/bin/
+*/target/

net.sf.eclipsecs-feature/feature.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature version="6.4.0.qualifier"
+<feature version="6.5.0.qualifier"
       id="net.sf.eclipsecs"
       label="%feature.label"
       provider-name="%feature.provider_name"
@@ -39,34 +39,34 @@
          id="net.sf.eclipsecs.branding"
          download-size="0"
          install-size="0"
-         version="6.4.0.qualifier"
+         version="6.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="net.sf.eclipsecs.core"
          download-size="0"
          install-size="0"
-         version="6.4.0.qualifier"
+         version="6.5.0.qualifier"
          unpack="true"/>
 
    <plugin
          id="net.sf.eclipsecs.doc"
          download-size="0"
          install-size="0"
-         version="6.4.0.qualifier"
+         version="6.5.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="net.sf.eclipsecs.checkstyle"
          download-size="0"
          install-size="0"
-         version="6.4.0.qualifier"/>
+         version="6.5.0.qualifier"/>
 
    <plugin
          id="net.sf.eclipsecs.ui"
          download-size="0"
          install-size="0"
-         version="6.4.0.qualifier"
+         version="6.5.0.qualifier"
          unpack="true"/>
 
 </feature>

net.sf.eclipsecs-feature/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>net.sf.eclipsecs.parent</artifactId>
         <groupId>net.sf.eclipsecs</groupId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.5.0-SNAPSHOT</version>
         <relativePath>../net.sf.eclipsecs.parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.eclipsecs</groupId>
     <artifactId>net.sf.eclipsecs</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.5.0-SNAPSHOT</version>
     <packaging>eclipse-feature</packaging>
     <name>eclipse-cs Feature</name>
 </project>

net.sf.eclipsecs-updatesite/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>net.sf.eclipsecs.parent</artifactId>
         <groupId>net.sf.eclipsecs</groupId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.5.0-SNAPSHOT</version>
         <relativePath>../net.sf.eclipsecs.parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.eclipsecs</groupId>
     <artifactId>net.sf.eclipsecs-updatesite</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.5.0-SNAPSHOT</version>
     <packaging>eclipse-update-site</packaging>
     <name>eclipse-cs Update Site</name>
 

net.sf.eclipsecs-updatesite/site.xml

@@ -3,11 +3,11 @@
    <description name="Eclipse Checkstyle Plugin" url="http://eclipse-cs.sourceforge.net/update">
       Eclipse Checkstyle Plugin Update Site
    </description>
-   <feature url="features/net.sf.eclipsecs_6.4.0.qualifier.jar" id="net.sf.eclipsecs" version="6.4.0.qualifier">
+   <feature url="features/net.sf.eclipsecs_6.5.0.qualifier.jar" id="net.sf.eclipsecs" version="6.5.0.qualifier">
       <category name="Checkstyle"/>
    </feature>
    <!--
-   <feature url="features/net.sf.eclipsecs.migration_6.4.0.qualifier.jar" id="net.sf.eclipsecs.migration" version="6.4.0.qualifier">
+   <feature url="features/net.sf.eclipsecs.migration_6.5.0.qualifier.jar" id="net.sf.eclipsecs.migration" version="6.5.0.qualifier">
       <category name="Checkstyle"/>
    </feature>
    -->

net.sf.eclipsecs.branding/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Checkstyle Plug-in
 Bundle-SymbolicName: net.sf.eclipsecs.branding
-Bundle-Version: 6.4.0.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Vendor: http://eclipse-cs.sf.net/
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

net.sf.eclipsecs.branding/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>net.sf.eclipsecs.parent</artifactId>
         <groupId>net.sf.eclipsecs</groupId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.5.0-SNAPSHOT</version>
         <relativePath>../net.sf.eclipsecs.parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.eclipsecs</groupId>
     <artifactId>net.sf.eclipsecs.branding</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.5.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <name>eclipse-cs Branding Plugin</name>
 </project>

net.sf.eclipsecs.checkstyle/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="checkstyle-6.4.1-all.jar" sourcepath="checkstyle-6.4.1-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="checkstyle-6.5-all.jar" sourcepath="checkstyle-6.5-src.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="metadata"/>

net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Checkstyle Core Library
 Bundle-SymbolicName: net.sf.eclipsecs.checkstyle
-Bundle-Version: 6.4.0.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Vendor: http://eclipse-cs.sf.net/
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -74,4 +74,4 @@ Export-Package: .,
  org.apache.commons.logging,
  org.apache.commons.logging.impl
 Bundle-ClassPath: .,
- checkstyle-6.4.1-all.jar
+ checkstyle-6.5-all.jar

net.sf.eclipsecs.checkstyle/build.properties

@@ -1,7 +1,7 @@
 bin.includes = META-INF/,\
                .,\
                license/,\
-               checkstyle-6.4.1-all.jar
+               checkstyle-6.5-all.jar
 jars.compile.order = .
 output.. = bin/
 source.. = metadata/

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/blocks/checkstyle-metadata.properties

@@ -23,7 +23,7 @@ LeftCurly.tokens        = blocks to check
 NeedBraces.desc   = Checks for braces around code blocks.
 NeedBraces.name   = Need Braces
 NeedBraces.tokens = blocks to check
-NeedBraces.allowSingleLineIf = allow one line if statements
+NeedBraces.allowSingleLineStatement = allows single-line statements without braces
 
 RightCurly.desc             = Checks the placement of right curly braces (<code>'}'</code>) for <code> else</code>, <code>try</code>, and <code>catch</code> tokens.<br/>\r\nThe policy to verify is specified using property <code>option</code>.
 RightCurly.name             = Right Curly Brace Placement

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/blocks/checkstyle-metadata.xml

@@ -110,9 +110,9 @@
                     <property-value-option value="LITERAL_WHILE"/>
                 </enumeration>
             </property-metadata>
-            <property-metadata name="allowSingleLineIf" datatype="Boolean" default-value="false">
-                <description>%NeedBraces.allowSingleLineIf</description>
-            </property-metadata>
+            <property-metadata name="allowSingleLineStatement" datatype="Boolean" default-value="false">
+                <description>%NeedBraces.allowSingleLineStatement</description>
+            </property-metadata>  
             <quickfix classname="net.sf.eclipsecs.ui.quickfixes.blocks.NeedBracesQuickfix"/>
             <message-key key="needBraces"/>
         </rule-metadata>

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/coding/checkstyle-metadata.properties

@@ -40,6 +40,7 @@ FallThrough.reliefPattern      = Regular expression to match the relief comment
 FinalLocalVariable.desc   = Checks that local variables that never have their values changed are declared final. The check can be configured to also check that unchanged parameters are declared final.<br/>\r\nWhen configured to check parameters, the check ignores parameters of interface methods and abstract methods.
 FinalLocalVariable.name   = Final Local Variable
 FinalLocalVariable.tokens = Tokens to check.
+FinalLocalVariable.validateEnhancedForLoopVariable = Controls whether to check enhanced for-loop variable.
 
 HiddenField.desc                       = Checks that a local variable or a parameter does not shadow a field that is defined in the same class.
 HiddenField.ignoreAbstractMethods      = Controls whether to ignore parameters of abstract methods.

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/coding/checkstyle-metadata.xml

@@ -98,6 +98,9 @@
                     <property-value-option value="VARIABLE_DEF"/>
                 </enumeration>
             </property-metadata>
+            <property-metadata name="validateEnhancedForLoopVariable" datatype="Boolean" default-value="false">
+                <description>%FinalLocalVariable.validateEnhancedForLoopVariable</description>
+            </property-metadata>
             <quickfix classname="net.sf.eclipsecs.ui.quickfixes.coding.FinalLocalVariableQuickfix"/>
             <message-key key="final.variable"/>
         </rule-metadata>

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/design/checkstyle-metadata.properties

@@ -30,6 +30,7 @@ VisibilityModifier.packageAllowed      = Whether package visible members are all
 VisibilityModifier.protectedAllowed    = Whether protected members are allowed or not.
 VisibilityModifier.publicMemberPattern = Pattern for public members that should be ignored.
 VisibilityModifier.immutableClassCanonicalNames = immutable classes canonical names
+VisibilityModifier.ignoreAnnotationCanonicalNames = ignore annotations canonical names
 
 OneTopLevelClass.name = One Top Level Class
 OneTopLevelClass.desc = Checks that each top-level class, interface or enum resides in a source file of its own. Official description of a 'top-level' term:7.6. Top Level Type Declarations. If file doesn't contains public class, enum or interface, top-level type is the first type in file.

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/design/checkstyle-metadata.xml

@@ -80,6 +80,9 @@
             <property-metadata name="immutableClassCanonicalNames" datatype="String" default-value="java.lang.String, java.lang.Integer, java.lang.Byte, java.lang.Character, java.lang.Short, java.lang.Boolean, java.lang.Long, java.lang.Double, java.lang.Float, java.lang.StackTraceElement, java.math.BigInteger, java.math.BigDecimal, java.io.File, java.util.Locale, java.util.UUID, java.net.URL, java.net.URI, java.net.Inet4Address, java.net.Inet6Address, java.net.InetSocketAddress,">
                 <description>%VisibilityModifier.immutableClassCanonicalNames</description>
             </property-metadata>
+            <property-metadata name="ignoreAnnotationCanonicalNames" datatype="String" default-value="org.junit.Rule, com.google.common.annotations.VisibleForTesting">
+                <description>%VisibilityModifier.ignoreAnnotationCanonicalNames</description>
+            </property-metadata>
 
             <message-key key="variable.notPrivate"/>
         </rule-metadata>

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/imports/checkstyle-metadata.properties

@@ -25,6 +25,7 @@ ImportOrder.name          = Import Order Check
 ImportOrder.option        = policy on the relative order between regular imports and static imports
 ImportOrder.ordered       = whether imports within group should be sorted
 ImportOrder.separated     = whether imports groups should be separated by, at least, one blank line
+ImportOrder.sortStaticImportsAlphabetically = whether static imports grouped by top or bottom option are sorted alphabetically or not
 
 Imports.group = Imports
 

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/imports/checkstyle-metadata.xml

@@ -65,6 +65,9 @@
             <property-metadata name="caseSensitive" datatype="Boolean" default-value="true">
                 <description>%ImportOrder.caseSensitive</description>
             </property-metadata>
+            <property-metadata name="sortStaticImportsAlphabetically" datatype="Boolean" default-value="false">
+                <description>%ImportOrder.sortStaticImportsAlphabetically</description>
+            </property-metadata>
             <message-key key="import.ordering"/>
             <message-key key="import.separation"/>
         </rule-metadata>

net.sf.eclipsecs.checkstyle/metadata/com/puppycrawl/tools/checkstyle/checks/whitespace/checkstyle-metadata.xml

@@ -293,6 +293,7 @@
                     <property-value-option value="STAR"/>
                     <property-value-option value="STAR_ASSIGN"/>
                     <property-value-option value="TYPE_EXTENSION_AND"/>
+                    <property-value-option value="WILDCARD_TYPE"/>
                 </enumeration>
             </property-metadata>
             <property-metadata name="allowEmptyConstructors" datatype="Boolean" default-value="false">

net.sf.eclipsecs.checkstyle/pom.xml

@@ -3,13 +3,13 @@
 	<parent>
 		<artifactId>net.sf.eclipsecs.parent</artifactId>
 		<groupId>net.sf.eclipsecs</groupId>
-		<version>6.4.0-SNAPSHOT</version>
+		<version>6.5.0-SNAPSHOT</version>
 		<relativePath>../net.sf.eclipsecs.parent</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.eclipsecs</groupId>
     <artifactId>net.sf.eclipsecs.checkstyle</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.5.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <name>Checkstyle Core Library Plugin</name>
 

net.sf.eclipsecs.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: Checkstyle Plug-in
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: net.sf.eclipsecs.core;singleton:=true
-Bundle-Version: 6.4.0.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .,
  lib/commons-lang-2.3.jar,

net.sf.eclipsecs.core/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>net.sf.eclipsecs.parent</artifactId>
         <groupId>net.sf.eclipsecs</groupId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.5.0-SNAPSHOT</version>
         <relativePath>../net.sf.eclipsecs.parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.eclipsecs</groupId>
     <artifactId>net.sf.eclipsecs.core</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.5.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <name>eclipse-cs Core Plugin</name>
 </project>

net.sf.eclipsecs.doc/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eclipse-cs Plugin and Checkstyle Documentation
 Bundle-SymbolicName: net.sf.eclipsecs.doc;singleton:=true
-Bundle-Version: 6.4.0.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Vendor: http://eclipse-cs.sf.net/
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

net.sf.eclipsecs.doc/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>net.sf.eclipsecs.parent</artifactId>
         <groupId>net.sf.eclipsecs</groupId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.5.0-SNAPSHOT</version>
         <relativePath>../net.sf.eclipsecs.parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.eclipsecs</groupId>
     <artifactId>net.sf.eclipsecs.doc</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.5.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <name>eclipse-cs Documentation Plugin</name>
 

net.sf.eclipsecs.parent/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.eclipsecs</groupId>
     <artifactId>net.sf.eclipsecs.parent</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>net.sf.eclipsecs.parent</name>
 

net.sf.eclipsecs.sample/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eclipse-cs Extension Sample Plugin
 Bundle-SymbolicName: net.sf.eclipsecs.sample;singleton:=true
-Bundle-Version: 6.4.0.qualifier
+Bundle-Version: 6.5.0.qualifier
 Require-Bundle: net.sf.eclipsecs.checkstyle,
  net.sf.eclipsecs.core,
  net.sf.eclipsecs.ui

net.sf.eclipsecs.sample/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>net.sf.eclipsecs.parent</artifactId>
         <groupId>net.sf.eclipsecs</groupId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.5.0-SNAPSHOT</version>
         <relativePath>../net.sf.eclipsecs.parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.eclipsecs</groupId>
     <artifactId>net.sf.eclipsecs.sample</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.5.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <name>eclipse-cs Sample Plugin</name>
 </project>

net.sf.eclipsecs.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Checkstyle Ui Plug-in
 Bundle-SymbolicName: net.sf.eclipsecs.ui;singleton:=true
-Bundle-Version: 6.4.0.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Vendor: http://eclipse-cs.sf.net/
 Bundle-Activator: net.sf.eclipsecs.ui.CheckstyleUIPlugin
 Bundle-ActivationPolicy: lazy

net.sf.eclipsecs.ui/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>net.sf.eclipsecs.parent</artifactId>
         <groupId>net.sf.eclipsecs</groupId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.5.0-SNAPSHOT</version>
         <relativePath>../net.sf.eclipsecs.parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.eclipsecs</groupId>
     <artifactId>net.sf.eclipsecs.ui</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.5.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <name>eclipse-cs UI Plugin</name>
 </project>