Updated to CheckStyle 6.7 (#168)

jshiell · Jun 3, 2015 · 5918109 · 5918109
1 parent 2b1f0ce
commit 5918109
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/CheckStyle-IDEA.iml b/CheckStyle-IDEA.iml
@@ -18,6 +18,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="com.puppycrawl.tools:checkstyle:6.6" level="project" />
+    <orderEntry type="library" name="com.puppycrawl.tools:checkstyle:6.7" level="project" />
   </component>
 </module>
diff --git a/CheckStyle-IDEA.ipr b/CheckStyle-IDEA.ipr
@@ -29,7 +29,7 @@
   <component name="CheckStyle-IDEA">
     <option name="configuration">
       <map>
-        <entry key="active-configuration" value="LOCAL_FILE:$PRJ_DIR$/test-configs/yazino-checkstyle-rules.xml:Yazino" />
+        <entry key="active-configuration" value="LOCAL_FILE:$PRJ_DIR$/test-configs/issue-164/checkstyle.xml:Issue 164" />
         <entry key="check-nonjava-files" value="false" />
         <entry key="check-test-classes" value="false" />
         <entry key="location-0" value="LOCAL_FILE:$PRJ_DIR$/test-configs/amigo-cs5.0.xml:A2" />
@@ -41,11 +41,13 @@
         <entry key="location-6" value="LOCAL_FILE:$PRJ_DIR$/test-configs/sonar.xml:Sonar" />
         <entry key="location-7" value="CLASSPATH:/sun_checks.xml:The default CheckStyle rules" />
         <entry key="location-8" value="LOCAL_FILE:$PRJ_DIR$/test-configs/yazino-checkstyle-rules.xml:Yazino" />
+        <entry key="location-9" value="LOCAL_FILE:$PRJ_DIR$/test-configs/issue-164/checkstyle.xml:Issue 164" />
         <entry key="property-2.samedir" value="" />
         <entry key="property-3.checkstyle.suppressions.file" value="yazino-checkstyle-suppressions.xml" />
         <entry key="property-8.checkstyle.suppressions.file" value="$PROJECT_DIR$/test-configs/yazino-checkstyle-suppressions.xml" />
+        <entry key="property-9.checkstyle.suppressions.file" value="$PROJECT_DIR$/test-configs/yazino-checkstyle-suppressions.xml" />
         <entry key="suppress-errors" value="false" />
-        <entry key="thirdparty-classpath" value="$PROJECT_DIR$/../Third Party/CreateYourOwnCheckStyleCheck/BlundellCheckstyle/target/blundell-checkstyle-checks-1.0.jar" />
+        <entry key="thirdparty-classpath" value="$PROJECT_DIR$/../Third Party/CreateYourOwnCheckStyleCheck/BlundellCheckstyle/target/blundell-checkstyle-checks-1.0.jar;$PRJ_DIR$/test-configs/issue-164/vdna-checkstyle-2.1.1-SNAPSHOT.jar" />
       </map>
     </option>
   </component>
@@ -274,17 +276,16 @@
     <find-history />
   </component>
   <component name="libraryTable">
-    <library name="com.puppycrawl.tools:checkstyle:6.6" type="repository">
-      <properties maven-id="com.puppycrawl.tools:checkstyle:6.6" />
+    <library name="com.puppycrawl.tools:checkstyle:6.7" type="repository">
+      <properties maven-id="com.puppycrawl.tools:checkstyle:6.7" />
       <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/puppycrawl/tools/checkstyle/6.6/checkstyle-6.6.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/com/puppycrawl/tools/checkstyle/6.7/checkstyle-6.7.jar!/" />
         <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
         <root url="jar://$MAVEN_REPOSITORY$/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" />
         <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.5/antlr4-runtime-4.5.jar!/" />
-        <root url="jar://$MAVEN_REPOSITORY$/org/abego/treelayout/org.abego.treelayout.core/1.0.1/org.abego.treelayout.core-1.0.1.jar!/" />
         <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils-core/1.8.3/commons-beanutils-core-1.8.3.jar!/" />
         <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
-        <root url="jar://$MAVEN_REPOSITORY$/commons-cli/commons-cli/1.2/commons-cli-1.2.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/commons-cli/commons-cli/1.3/commons-cli-1.3.jar!/" />
         <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/18.0/guava-18.0.jar!/" />
         <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.4/ant-1.9.4.jar!/" />
         <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.4/ant-launcher-1.9.4.jar!/" />

diff --git a/README.md b/README.md
@@ -128,6 +128,7 @@ This code is released under a BSD licence, as specified in the accompanying LICE
 
 ## Version History
 
+* **4.16.0** New: Updated to CheckStyle 6.7 (#168).
 * **4.15.0** New: Updated to CheckStyle 6.6 (#150).
 * **4.14.2** Fixed: Cached checkers are now cleaned by a background task (#141).
 * **4.14.2** Fixed: Updated icons to more closely resemble current CheckStyle icon.

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 sourceCompatibility = 1.8
-version = '4.15.0'
+version = '4.16.0'
 
 repositories {
     mavenCentral()
@@ -14,7 +14,7 @@ configurations {
 dependencies {
     ideaSdkLibs fileTree(dir: "$ideaSdk", include: '*.jar')
 
-    compile(group: 'com.puppycrawl.tools', name: 'checkstyle', version: '6.6') {
+    compile(group: 'com.puppycrawl.tools', name: 'checkstyle', version: '6.7') {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
     compile group: 'commons-io', name: 'commons-io', version: '2.4'

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -6,11 +6,11 @@
         <![CDATA[
 <p>
     This plugin provides both real-time and on-demand scanning
-    of Java files with CheckStyle 6.6 from within IDEA.
+    of Java files with CheckStyle 6.7 from within IDEA.
 </p>
         ]]>
     </description>
-    <version>4.15.0</version>
+    <version>4.16.0</version>
     <idea-version since-build="141.178"/>
     <vendor url="http://infernus.org/" email="james@infernus.org">James Shiell</vendor>
 
@@ -19,6 +19,7 @@
     <change-notes>
         <![CDATA[
 <ul>
+    <li>4.16.0: New: Updated to CheckStyle 6.7 (#168).</li>
     <li>4.15.0: New: Updated to CheckStyle 6.6 (#150).</li>
     <li>4.14.2: Fixed: Cached checkers are now cleaned by a background task (#141).</li>
     <li>4.14.2: Fixed: Updated icons to more closely resemble current CheckStyle icon.</li>