You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/06/08 08:41:22 UTC
ant-ivy git commit: Sync Checkstyle setup with IvyDE
Repository: ant-ivy
Updated Branches:
refs/heads/master cbe4dfac4 -> 9f0fdedbd
Sync Checkstyle setup with IvyDE
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/9f0fdedb
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/9f0fdedb
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/9f0fdedb
Branch: refs/heads/master
Commit: 9f0fdedbd55994cb39693000e23a14f852d651b8
Parents: cbe4dfa
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Jun 8 10:41:11 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Jun 8 10:41:11 2018 +0200
----------------------------------------------------------------------
build.properties | 3 +++
build.xml | 4 ++--
src/etc/checkstyle/checkstyle-config | 6 ++----
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9f0fdedb/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 60606d9..d13a796 100644
--- a/build.properties
+++ b/build.properties
@@ -50,6 +50,9 @@ ivy.install.version=1.4.1
#status=integration
+# Comment out to fail builds if Checkstyle fails
+#ignore.checkstyle=
+
test.class.pattern = *Test
source.. = src/java/
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9f0fdedb/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 95f1767..69a39cd 100644
--- a/build.xml
+++ b/build.xml
@@ -558,7 +558,7 @@
</target>
<target name="init-checkstyle" depends="jar">
- <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="7.8.2"
+ <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="6.19"
inline="true" conf="default" pathid="checkstyle.classpath" log="download-only"/>
<taskdef uri="antlib:com.puppycrawl.tools.checkstyle.ant"
resource="com/puppycrawl/tools/checkstyle/ant/antlib.xml" classpathref="checkstyle.classpath"/>
@@ -585,7 +585,7 @@
<target name="checkstyle" depends="checkstyle-internal"
description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config">
- <fail if="checkstyle.failed"
+ <fail if="checkstyle.failed" unless="ignore.checkstyle"
message="Checkstyle has errors. See report in ${checkstyle.report.dir}"/>
</target>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9f0fdedb/src/etc/checkstyle/checkstyle-config
----------------------------------------------------------------------
diff --git a/src/etc/checkstyle/checkstyle-config b/src/etc/checkstyle/checkstyle-config
index a4bce65..2e2da7c 100644
--- a/src/etc/checkstyle/checkstyle-config
+++ b/src/etc/checkstyle/checkstyle-config
@@ -19,8 +19,7 @@
under the License.
-->
<module name="Checker">
-
- <!-- required license file -->
+ <!-- required licence file -->
<module name="Header">
<property name="headerFile" value="${checkstyle.src.dir}/RequiredHeader.txt"/>
<property name="ignoreLines" value="2"/>
@@ -91,7 +90,6 @@
<module name="NeedBraces"/>
<module name="RightCurly"/>
-
<!-- Checks for common coding problems -->
<!-- <module name="AvoidInlineConditionals"/> -->
<!-- <module name="DoubleCheckedLocking"/> --> <!-- removed in checkstyle 5.6 -->
@@ -147,7 +145,7 @@
</module>
<module name="SuppressionFilter">
- <property name="file" value="${basedir}/src/etc/checkstyle/checkstyle-suppress.xml"/>
+ <property name="file" value="${checkstyle.src.dir}/checkstyle-suppress.xml"/>
</module>
</module>