[ENGOPS-1571] updated checkstyle

shengbokw · Nov 9, 2015 · 98335f8 · 98335f8
1 parent fc4ea82
commit 98335f8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/build.properties b/build.properties
@@ -107,11 +107,13 @@ dependency.pdi-palo-plugin.revision=6.1-SNAPSHOT
 dependency.launcher.revision=6.1-SNAPSHOT
 
 # Checkstyle Properties
+checkstyle.version=6.12
+pentaho.coding.standards.version=1.0.1
 checkstyle.dir=${basedir}/checkstyle
 checkstyle.lib.dir=${checkstyle.dir}/lib
 checkstyle.reports.dir=${checkstyle.dir}/reports
-checkstyle.config.url=http://ci.pentaho.com/job/pentaho-coding-standards/lastSuccessfulBuild/artifact/pentaho_checkStyle.xml
-checkstyle.suppressions.url=http://ci.pentaho.com/job/pentaho-coding-standards/lastSuccessfulBuild/artifact/suppressions.xml
-checkstyle.config.file=${checkstyle.dir}/pentaho_checkStyle.xml
+checkstyle.config.url=http://nexus.pentaho.org/content/repositories/public-release/com/pentaho/pentaho-coding-standards/pentaho-checkstyle/${pentaho.coding.standards.version}/pentaho-checkstyle-${pentaho.coding.standards.version}.xml
+checkstyle.suppressions.url=http://nexus.pentaho.org/content/repositories/public-release/com/pentaho/pentaho-coding-standards/pentaho-checkstyle-suppressions/${pentaho.coding.standards.version}/pentaho-checkstyle-suppressions-${pentaho.coding.standards.version}.xml
+checkstyle.config.file=${checkstyle.dir}/pentaho-checkstyle-${pentaho.coding.standards.version}.xml
 checkstyle.suppressions.file=${checkstyle.dir}/suppressions.xml
 checkstyle.stylesheet.file=${basedir}/build-res/checkstyle/checkstyle-noframes-sorted.xsl
diff --git a/build.xml b/build.xml
@@ -957,7 +957,7 @@
     <mkdir dir="${checkstyle.dir}/lib"/>
     <ivy-resolve directory="${checkstyle.lib.dir}" ivyfile="${ivyfile}" conf="checkstyle"/>
 
-    <taskdef resource="checkstyletask.properties">
+    <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties">
       <classpath>
         <fileset dir="${checkstyle.lib.dir}" includes="*.jar"/>
       </classpath>

diff --git a/ivy.xml b/ivy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0">
+<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
   <info organisation="pentaho" module="pentaho-kettle" revision="${project.revision}" />
   <configurations>
     <conf name="default" />
@@ -25,7 +25,9 @@
     <dependency org="org.mockito"              name="mockito-all"          rev="1.9.5"  transitive="false" conf="test->default"/>
     <dependency org="org.eclipse.jetty"        name="test-jetty-servlet" rev="8.1.15.v20140411" transitive="false" conf="test->default"/>
     <dependency org="net.sourceforge.nekohtml" name="nekohtml"             rev="1.9.7"  transitive="false" conf="test->default"/>
-    <dependency org="com.puppycrawl.tools"     name="checkstyle"           rev="5.7"    transitive="true"  conf="checkstyle->default"/>
+    <dependency org="com.puppycrawl.tools"     name="checkstyle"           rev="${checkstyle.version}" transitive="true" conf="checkstyle->default">
+      <artifact name="checkstyle" ext="jar" m:classifier="all"/>
+    </dependency>
 
     <!-- Apache Mina for settling up SFTP and FTPS servers' instances -->
     <dependency org="org.apache.sshd"     name="sshd-sftp"     rev="0.11.0"  conf="test->default" transitive="true" />