You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2014/06/28 21:11:13 UTC
[1/2] git commit: update checkstyle (check 'DoubleCheckLocking' was
removed in CS)
Repository: ant
Updated Branches:
refs/heads/master 6e88f92ea -> 66329f7fe
update checkstyle (check 'DoubleCheckLocking' was removed in CS)
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/211b7188
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/211b7188
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/211b7188
Branch: refs/heads/master
Commit: 211b7188af7eb761ab8646f9a8cd847aca9db026
Parents: 7472cb0
Author: Jan Mat�rne <jh...@apache.org>
Authored: Sat Jun 28 21:09:33 2014 +0200
Committer: Jan Mat�rne <jh...@apache.org>
Committed: Sat Jun 28 21:09:33 2014 +0200
----------------------------------------------------------------------
check.xml | 2 +-
src/etc/checkstyle/checkstyle-config | 35 ++++++++++++++++++-------------
2 files changed, 21 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/211b7188/check.xml
----------------------------------------------------------------------
diff --git a/check.xml b/check.xml
index 41551b9..9fdf963 100644
--- a/check.xml
+++ b/check.xml
@@ -91,7 +91,7 @@
</target>
<target name="checkstyle" description="--> checks Ant codebase according to ${config.dir}/checkstyle-config" depends="init-ivy">
- <ivy:cachepath organisation="checkstyle" module="checkstyle" revision="4.4"
+ <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="5.7"
inline="true" conf="default" pathid="checkstyle.classpath" transitive="true"/>
<taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath" />
<mkdir dir="${checkstyle.reportdir}"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/211b7188/src/etc/checkstyle/checkstyle-config
----------------------------------------------------------------------
diff --git a/src/etc/checkstyle/checkstyle-config b/src/etc/checkstyle/checkstyle-config
index 160b098..b3232be 100644
--- a/src/etc/checkstyle/checkstyle-config
+++ b/src/etc/checkstyle/checkstyle-config
@@ -18,6 +18,19 @@
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
<module name="Checker">
+
+ <!-- required licence file -->
+ <module name="Header">
+ <property name="headerFile" value="${config.dir}/RequiredHeader.txt"/>
+ <property name="ignoreLines" value="2"/>
+ </module>
+
+ <!-- size limits -->
+ <module name="FileLength"/>
+
+ <module name="FileTabCharacter"/>
+
+
<module name="TreeWalker">
<!-- Javadoc requirements -->
<module name="JavadocType">
@@ -42,12 +55,6 @@
<module name="ParameterName"/>
<module name="StaticVariableName"/>
- <!-- required licence file -->
- <module name="Header">
- <property name="headerFile" value="${config.dir}/RequiredHeader.txt"/>
- <property name="ignoreLines" value="2"/>
- </module>
-
<!-- Import conventions -->
<module name="AvoidStarImport"/>
<module name="IllegalImport"/>
@@ -55,7 +62,6 @@
<module name="UnusedImports"/>
<!-- size limits -->
- <module name="FileLength"/>
<module name="LineLength">
<property name="max" value="100"/>
<property name="ignorePattern" value="^ *\* *[^ ]+$"/>
@@ -69,7 +75,6 @@
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap"/>
<module name="ParenPad"/>
- <module name="TabCharacter"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>
@@ -77,7 +82,6 @@
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
-
<!-- Checks for blocks -->
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock">
@@ -87,10 +91,8 @@
<module name="NeedBraces"/>
<module name="RightCurly"/>
-
<!-- Checks for common coding problems -->
<!--<module name="AvoidInlineConditionals"/> -->
- <module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="IllegalInstantiation">
@@ -116,19 +118,22 @@
<!-- Miscellaneous other checks. -->
<module name="ArrayTypeStyle"/>
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
<!-- <module name="TodoComment"/> -->
<module name="UpperEll"/>
<!-- allow comment suppression of checks -->
<module name="FileContentsHolder"/>
</module>
+
+ <module name="RegexpSingleline">
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$"/>
+ </module>
+
<!-- <module name="au.com.redhillconsulting.simian.SimianCheck"/> -->
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
<property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
<property name="checkFormat" value="$1"/>
</module>
+
</module>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ant
Posted by jh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/66329f7f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/66329f7f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/66329f7f
Branch: refs/heads/master
Commit: 66329f7fedd62a756c3fc8fce80edf2eb9b4f84e
Parents: 211b718 6e88f92
Author: Jan Mat�rne <jh...@apache.org>
Authored: Sat Jun 28 21:10:26 2014 +0200
Committer: Jan Mat�rne <jh...@apache.org>
Committed: Sat Jun 28 21:10:26 2014 +0200
----------------------------------------------------------------------
CONTRIBUTORS | 2 +
ReleaseInstructions | 6 -
WHATSNEW | 20 ++
contributors.xml | 8 +
manual/Types/filterchain.html | 29 ++-
src/etc/testcases/filters/build.xml | 33 ++++
.../filters/expected/replacetokens.double.test | 2 +
.../filters/input/replacetokens.double.test | 2 +
.../filters/input/replacetokens.mustache.test | 2 +
.../apache/tools/ant/filters/ReplaceTokens.java | 185 +++++++++----------
.../optional/junit/XMLJUnitResultFormatter.java | 8 +-
.../org/apache/tools/tar/TarInputStream.java | 14 +-
src/main/org/apache/tools/tar/TarUtils.java | 22 ++-
.../tools/ant/filters/ReplaceTokensTest.java | 26 ++-
14 files changed, 232 insertions(+), 127 deletions(-)
----------------------------------------------------------------------