Repository: ant-ivy Updated Branches: refs/heads/master 1493fda3d -> 990eb7500
Replace emma with jacoco; upgrade checkstyle and sync its config with Apache Ant; run all documentation targets Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/f8962c6a Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/f8962c6a Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/f8962c6a Branch: refs/heads/master Commit: f8962c6aa412c778ebd01d2a68725c36099ba1be Parents: 1493fda Author: twogee <g.grigelio...@gmail.com> Authored: Mon May 29 21:08:43 2017 +0200 Committer: twogee <g.grigelio...@gmail.com> Committed: Thu Jun 1 18:14:53 2017 +0200 ---------------------------------------------------------------------- build-release.xml | 2 +- build.properties | 1 + build.xml | 239 +++++++++----------- src/etc/checkstyle/checkstyle-config | 305 +++++++++++++------------- src/etc/checkstyle/checkstyle-frames.xsl | 2 +- 5 files changed, 265 insertions(+), 284 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f8962c6a/build-release.xml ---------------------------------------------------------------------- diff --git a/build-release.xml b/build-release.xml index 752e8d2..0fa4a9c 100644 --- a/build-release.xml +++ b/build-release.xml @@ -510,7 +510,7 @@ </target> <target name="prepare-snapshot" - depends="/localivy, clean-ivy-home, clean, clean-lib, snapshot-version, install, clean-examples, coverage-report" /> + depends="/localivy, clean-ivy-home, clean, clean-lib, snapshot-version, install, clean-examples, test-report"/> <target name="snapshot" depends="prepare-snapshot, snapshot-src, snapshot-bin, snapshot-maven2, snapshot-checksums" description="used for nightly and integration builds"/> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f8962c6a/build.properties ---------------------------------------------------------------------- diff --git a/build.properties b/build.properties index 5b28e22..673aac5 100644 --- a/build.properties +++ b/build.properties @@ -33,6 +33,7 @@ distrib.dir=${basedir}/build/distrib doc.build.dir=${basedir}/build/doc reports.dir=${doc.build.dir}/reports test.xml.dir=${build.dir}/test-report +jacoco.log=${build.dir}/jacoco.data test.report.dir=${reports.dir}/test coverage.report.dir=${reports.dir}/coverage javadoc.build.dir=${reports.dir}/api http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f8962c6a/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 54064c3..ab74a8a 100644 --- a/build.xml +++ b/build.xml @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> -<project name="ivy" default="coverage-report" xmlns:ivy="antlib:org.apache.ivy.ant"> +<project name="ivy" default="test-report" xmlns:ivy="antlib:org.apache.ivy.ant"> <property environment="env"/> <property file="version.properties"/> @@ -58,7 +58,7 @@ <target name="install-ant" depends="init-ivy-home,jar" description="build Ivy and install it in Ant home lib"> <condition property="ant.home" value="${env.ANT_HOME}"> - <isset property="env.ANT_HOME"/> + <isset property="env.ANT_HOME"/> </condition> <fail unless="ant.home" message="ANT_HOME environment variable or ant.home property required"/> <copy file="${artifacts.build.dir}/jars/${final.name}" tofile="${ant.home}/lib/ivy.jar"/> @@ -115,13 +115,13 @@ <mkdir dir="${test.build.dir}"/> <mkdir dir="${artifacts.build.dir}"/> <mkdir dir="${test.report.dir}"/> - <mkdir dir="${ivy.report.dir}"/> </target> <target name="clean" description="delete all generated files keeping sources only"> <delete dir="${classes.build.dir}"/> <delete dir="${test.build.dir}"/> <delete dir="${artifacts.build.dir}"/> + <delete dir="${ivy.report.dir}"/> <delete dir="${test.report.dir}"/> <delete dir="${javadoc.build.dir}"/> <delete dir="${doc.build.dir}"/> @@ -345,6 +345,22 @@ <!-- ================================================================= TESTS ================================================================= --> + <target name="build-test" depends="jar"> + <javac srcdir="${test.dir}" + destdir="${test.build.dir}" + classpathref="run.classpath" + source="${ivy.minimum.javaversion}" + target="${ivy.minimum.javaversion}" + debug="${debug.mode}" + encoding="UTF-8" + includeantruntime="no"/> + <copy todir="${test.build.dir}"> + <fileset dir="${test.dir}"> + <exclude name="**/*.java"/> + </fileset> + </copy> + </target> + <target name="build-custom-resolver-jar" depends="jar"> <mkdir dir="${build.dir}/custom-classpath"/> <javac srcdir="${basedir}/test/custom-classpath" @@ -375,58 +391,6 @@ <target name="init-tests" depends="init-tests-offline,init-tests-online"/> - <target name="emma" depends="jar" unless="skip.test"> - <ivy:cachepath organisation="emma" module="emma" revision="2.0.5312" - inline="true" conf="default" pathid="emma.classpath" - log="download-only"/> - <ivy:cachepath organisation="emma" module="emma_ant" revision="2.0.5312" - inline="true" conf="default" pathid="emma.ant.classpath" transitive="false" - log="download-only"/> - <taskdef resource="emma_ant.properties"> - <classpath refid="emma.classpath"/> - <classpath refid="emma.ant.classpath"/> - </taskdef> - <property name="emma.enabled" value="true"/> - <property name="coverage.dir" value="${build.dir}/coverage"/> - <property name="coverage.classes.dir" value="${coverage.dir}/classes"/> - <mkdir dir="${coverage.dir}"/> - <mkdir dir="${coverage.classes.dir}"/> - <emma enabled="${emma.enabled}"> - <instr mode="copy" - destdir="${coverage.dir}/classes" - metadatafile="${coverage.dir}/metadata.emma"> - <instrpath> - <pathelement location="${core.classes.build.dir}"/> - <pathelement location="${ant.classes.build.dir}"/> - <pathelement location="${optional.classes.build.dir}"/> - </instrpath> - </instr> - </emma> - <delete file="${coverage.dir}/coverage.emma"/> - <!-- add emma path to test path, because emma jars need to be available when running - instrumented classes --> - <ivy:addpath topath="test.classpath" first="true"> - <pathelement location="${coverage.dir}/classes"/> - <path refid="emma.classpath"/> - </ivy:addpath> - </target> - - <target name="build-test" depends="jar"> - <javac srcdir="${test.dir}" - destdir="${test.build.dir}" - classpathref="run.classpath" - source="${ivy.minimum.javaversion}" - target="${ivy.minimum.javaversion}" - debug="${debug.mode}" - encoding="ISO-8859-1" - includeantruntime="no"/> - <copy todir="${test.build.dir}"> - <fileset dir="${test.dir}"> - <exclude name="**/*.java"/> - </fileset> - </copy> - </target> - <target name="prepare-osgi-tests" depends="resolve" unless="skip.test"> <ant dir="${basedir}/test/test-repo" target="generate-bundles"/> </target> @@ -441,48 +405,55 @@ </jar> </target> - <target name="test-internal" depends="build-test,init-tests,prepare-osgi-tests,prepare-test-jar-repositories" unless="skip.test"> + <target name="init-jacoco" depends="jar" unless="skip.test"> + <ivy:cachepath organisation="org.jacoco" module="org.jacoco.ant" revision="0.7.9" + inline="true" conf="default" pathid="jacoco.classpath" log="download-only"/> + <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" + classpathref="jacoco.classpath"/> + </target> + + <target name="test-internal" depends="build-test,init-tests,prepare-osgi-tests,prepare-test-jar-repositories,init-jacoco" unless="skip.test"> <mkdir dir="${test.xml.dir}"/> - <junit - haltonfailure="off" - haltonerror="off" - errorproperty="test.failed" - failureproperty="test.failed" - showoutput="no" - printsummary="yes" - includeantruntime="yes" - dir="${basedir}" - tempdir="${build.dir}" - fork="true"> - <classpath> - <path refid="test.classpath"/> - <pathelement path="${ant.home}/lib/ant-nodeps.jar"/> - <pathelement path="${ant.home}/lib/ant-trax.jar"/> - </classpath> + <jacoco:coverage xmlns:jacoco="antlib:org.jacoco.ant" destfile="${jacoco.log}" + exclclassloader="sun.reflect.DelegatingClassLoader:javassist.Loader"> + <junit + haltonfailure="off" + haltonerror="off" + errorproperty="test.failed" + failureproperty="test.failed" + showoutput="no" + printsummary="yes" + includeantruntime="yes" + dir="${basedir}" + tempdir="${build.dir}" + fork="true"> + <classpath> + <path refid="test.classpath"/> + </classpath> + + <!-- pass the proxy properties to the forked junit process to use correct proxy --> + <syspropertyset> + <propertyref prefix="http"/> + </syspropertyset> + + <!-- Added this to test IVY-65 --> + <jvmarg value="-Duser.region=TR"/> + <jvmarg value="-Duser.language=tr"/> + + <formatter type="xml"/> + <batchtest todir="${test.xml.dir}"> + <fileset refid="test.fileset"/> + </batchtest> + </junit> + </jacoco:coverage> + </target> - <!-- pass the proxy properties to the forked junit process to use correct proxy --> - <syspropertyset> - <propertyref prefix="http"/> - </syspropertyset> - <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma"/> - <jvmarg value="-Demma.coverage.out.merge=true"/> - <!-- Added so that the bytecode generated by Emma (in Java 7) isn't verified in "Strict" mode - which fails due to Emma's inability to create Java 7 bytecode. Can be removed if/when we - move to a different code coverage tool --> - <jvmarg value="-noverify"/> - - <!-- Added this to test IVY-65 --> - <jvmarg value="-Duser.region=TR"/> - <jvmarg value="-Duser.language=tr"/> - - <formatter type="xml"/> - <batchtest todir="${test.xml.dir}"> - <fileset refid="test.fileset"/> - </batchtest> - </junit> + <target name="test" depends="test-internal" description="Run the test"> + <fail if="test.failed" + message="At least one test has failed. See logs (in ${test.xml.dir}) for details (use the target test-report to run the test with a report)"/> </target> - + <target name="x" depends="init,build-test"> <java classname="org.apache.ivy.plugins.resolver.FileSystemResolverTest"> <classpath> @@ -493,41 +464,44 @@ </java> </target> - <target name="test" depends="test-internal" description="Run the test"> - <fail if="test.failed" - message="At least one test has failed. See logs (in ${test.xml.dir}) for details (use the target test-report to run the test with a report)"/> - </target> - <!-- ================================================================= REPORTS AND DOCUMENTATION ================================================================= --> - <target name="test-report" depends="test-internal" unless="skip.test"> + <target name="test-report" depends="test-internal" unless="skip.test" + description="run tests with instrumentation and generate coverage report"> <junitreport todir="${test.xml.dir}"> <fileset dir="${test.xml.dir}"> <include name="TEST-*.xml"/> </fileset> <report format="frames" todir="${test.report.dir}"/> </junitreport> - <fail if="test.failed" - message="At least one test has failed. See logs (in ${test.xml.dir}) or report (in ${test.report.dir})"/> - </target> - <target name="coverage-report" depends="emma,test-report" unless="skip.test" - description="run tests with instrumentation and generate coverage report"> <mkdir dir="${coverage.report.dir}"/> - <emma> - <report sourcepath="${src.dir}"> - <fileset dir="${coverage.dir}"> - <include name="*.emma"/> - </fileset> + <jacoco:report xmlns:jacoco="antlib:org.jacoco.ant"> + <executiondata> + <file file="${jacoco.log}"/> + </executiondata> + + <structure name="Ivy"> + <classfiles> + <fileset dir="${classes.build.dir}"/> + </classfiles> + <sourcefiles encoding="UTF-8"> + <fileset dir="${src.dir}"/> + </sourcefiles> + </structure> + + <html destdir="${coverage.report.dir}"/> + </jacoco:report> - <txt outfile="${coverage.report.dir}/coverage.txt"/> - <html outfile="${coverage.report.dir}/coverage.html"/> - </report> - </emma> + <fail if="test.failed" + message="At least one test has failed. See logs (in ${test.xml.dir}) or report (in ${test.report.dir})"/> </target> + <target name="coverage-report" depends="test-report"/> + <target name="ivy-report" depends="resolve"> + <mkdir dir="${ivy.report.dir}"/> <ivy:report todir="${ivy.report.dir}"/> </target> @@ -578,16 +552,19 @@ excludes="${eol.native.excludes}"/> </target> + <target name="init-checkstyle" depends="jar"> + <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="7.8" + 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"/> + </target> + <!-- Checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config --> - <target name="checkstyle-internal" depends="jar"> - <ivy:cachepath organisation="checkstyle" module="checkstyle" revision="5.0" - inline="true" conf="default" pathid="checkstyle.classpath" transitive="true" - log="download-only"/> - <taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath"/> - + <target name="checkstyle-internal" depends="init-checkstyle"> <mkdir dir="${checkstyle.report.dir}"/> - <checkstyle config="${checkstyle.src.dir}/checkstyle-config" - failOnViolation="false" failureProperty="checkstyle.failed"> + <cs:checkstyle xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant" + config="${checkstyle.src.dir}/checkstyle-config" + failOnViolation="false" failureProperty="checkstyle.failed"> <classpath> <path refid="run.classpath"/> </classpath> @@ -598,10 +575,11 @@ <fileset dir="${example.dir}"> <include name="**/*.java"/> </fileset> - </checkstyle> - </target> + </cs:checkstyle> + </target> - <target name="checkstyle" depends="checkstyle-internal" description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config"> + <target name="checkstyle" depends="checkstyle-internal" + description="checks Ivy codebase according to ${checkstyle.src.dir}/checkstyle-config"> <fail if="checkstyle.failed" message="Checkstyle has errors. See report in ${checkstyle.report.dir}"/> </target> @@ -612,6 +590,7 @@ style="${checkstyle.src.dir}/checkstyle-frames.xsl" out="${checkstyle.report.dir}/output.txt"> <param name="basedir" expression="${checkstyle.basedir}"/> + <param name="output.dir" expression="${checkstyle.report.dir}"/> </xslt> </target> @@ -644,10 +623,10 @@ description="Where to store Findbugs results"/> <property name="findbugs.raw" value="raw.xml" - description="Findbugs Output xml-file"/> + description="Findbugs output xml file"/> <property name="findbugs.xsl" value="fancy.xsl" - description="Which XSL to use for generating Output: default, fancy, plain, summary"/> + description="Which XSL to use for generating output: default, fancy, plain, summary"/> <property name="findbugs.jvmargs" value="-Xms128m -Xmx512m" description="JVMArgs for invoking Findbugs"/> @@ -657,15 +636,13 @@ usetimestamp="true" skipexisting="true"/> <unzip src="${findbugs.download.to}/${findbugs.download.file}" dest="${findbugs.download.to}"/> <property name="findbugs.home" location="${findbugs.download.to}/${findbugs.download.name}"/> - <mkdir dir="${findbugs.home}/plugin"/> </target> <target name="findbugs" description="checks Ivy codebase with Findbugs" depends="init-findbugs,compile-core" xmlns:fb="http://findbugs.sourceforge.net/"> + <!-- Load the Findbugs AntTasks --> <path id="findbugs.real.classpath"> - <fileset dir="${findbugs.home}/lib" includes="*.jar"/> + <fileset dir="${findbugs.home}/lib" includes="*.jar"/> </path> - - <!-- Load the Findbugs AntTasks --> <taskdef uri="http://findbugs.sourceforge.net/" resource="edu/umd/cs/findbugs/anttask/tasks.properties" classpathref="findbugs.real.classpath"/> <!-- Start Findbugs --> @@ -688,6 +665,8 @@ </xslt> </target> + <target name="docs" depends="test-report,checkstyle-report,findbugs,ivy-report,javadoc"/> + <!-- ================================================================= IDE SPECIFIC ================================================================= --> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f8962c6a/src/etc/checkstyle/checkstyle-config ---------------------------------------------------------------------- diff --git a/src/etc/checkstyle/checkstyle-config b/src/etc/checkstyle/checkstyle-config index ae186c8..a4bce65 100644 --- a/src/etc/checkstyle/checkstyle-config +++ b/src/etc/checkstyle/checkstyle-config @@ -1,152 +1,153 @@ -<?xml version="1.0"?> -<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<module name="Checker"> - - <!-- required license file --> - <module name="Header"> - <property name="headerFile" value="${checkstyle.src.dir}/RequiredHeader.txt"/> - <property name="ignoreLines" value="2"/> - </module> - - <!-- Items moved out of TreeWalker for new versions of Checkstyle --> - <module name="FileLength"/> - <module name="FileTabCharacter"/> - - <module name="TreeWalker"> - <!-- Javadoc requirements --> - <!-- TODO uncomment this when javadoc will be improved - <module name="JavadocType"> - <property name="scope" value="protected"/> - </module> - <module name="JavadocMethod"> - <property name="scope" value="protected"/> - <property name="allowUndeclaredRTE" value="true"/> - </module> - <module name="JavadocVariable"> - <property name="scope" value="public"/> - </module> - --> - - <!-- element naming --> - <module name="PackageName"/> - <module name="TypeName"/> - <module name="ConstantName"/> - <module name="LocalFinalVariableName"/> - <module name="LocalVariableName"/> - <module name="MemberName"/> - <module name="MethodName"/> - <module name="ParameterName"/> - <module name="StaticVariableName"/> - - <!-- Import conventions --> - <module name="AvoidStarImport"/> - <!-- <module name="IllegalImport"/> --> - <module name="RedundantImport"/> - <module name="UnusedImports"/> - - <!-- size limits --> - <module name="LineLength"> - <property name="max" value="100"/> - <property name="ignorePattern" value="^ *\* *[^ ]+$"/> - <property name="tabWidth" value="4"/> - </module> - <module name="MethodLength"/> - <module name="ParameterNumber"/> - - <!-- whitespace checks --> - <module name="EmptyForIteratorPad"/> - <module name="NoWhitespaceAfter"/> - <module name="NoWhitespaceBefore"/> - <module name="OperatorWrap"/> - <module name="ParenPad"/> - <module name="WhitespaceAfter"/> - <module name="WhitespaceAround"/> - - <!-- Modifier Checks --> - <module name="ModifierOrder"/> - - - <!-- Checks for blocks --> - <module name="AvoidNestedBlocks"/> - <module name="EmptyBlock"> - <property name="option" value="text"/> - </module> - <module name="LeftCurly"/> - <module name="NeedBraces"/> - <module name="RightCurly"/> - - - <!-- Checks for common coding problems --> - <!--<module name="AvoidInlineConditionals"/> --> - <!--<module name="DoubleCheckedLocking"/>--> <!-- removed in checkstyle 5.6 --> - <module name="EmptyStatement"/> - <module name="EqualsHashCode"/> - <module name="IllegalInstantiation"> - <property name="classes" value="java.lang.Boolean"/> - </module> - <module name="InnerAssignment"/> - <module name="MagicNumber"/> - <module name="MissingSwitchDefault"/> - <module name="RedundantThrows"> - <property name="allowUnchecked" value="true"/> - </module> - <module name="SimplifyBooleanExpression"/> - <module name="SimplifyBooleanReturn"/> - - <!-- Checks for class design --> - <!-- <module name="DesignForExtension"/> --> - <module name="FinalClass"/> - <module name="HideUtilityClassConstructor"/> - <module name="InterfaceIsType"/> - <module name="VisibilityModifier"/> - - <!-- 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> - - <!--TODO: comment this out, if Simian is not present --> - <!-- - <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 name="SuppressionFilter"> - <property name="file" value="${basedir}/src/etc/checkstyle/checkstyle-suppress.xml"/> - </module> - -</module> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<module name="Checker"> + + <!-- required license file --> + <module name="Header"> + <property name="headerFile" value="${checkstyle.src.dir}/RequiredHeader.txt"/> + <property name="ignoreLines" value="2"/> + </module> + + <!-- Items moved out of TreeWalker for new versions of Checkstyle --> + <module name="FileLength"/> + <module name="FileTabCharacter"/> + + <module name="TreeWalker"> + <!-- Javadoc requirements --> + <module name="JavadocType"> + <property name="scope" value="protected"/> + </module> + <module name="JavadocMethod"> + <property name="scope" value="protected"/> + <property name="allowUndeclaredRTE" value="true"/> + </module> + <module name="JavadocVariable"> + <property name="scope" value="public"/> + </module> + + <!-- element naming --> + <module name="PackageName"/> + <module name="TypeName"/> + <module name="ConstantName"/> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"/> + <module name="MethodName"/> + <module name="ParameterName"/> + <module name="StaticVariableName"/> + + <!-- Import conventions --> + <module name="AvoidStarImport"/> + <module name="IllegalImport"/> + <module name="RedundantImport"/> + <module name="UnusedImports"/> + + <!-- size limits --> + <module name="LineLength"> + <property name="max" value="100"/> + <property name="ignorePattern" value="^ *\* *[^ ]+$"/> + <property name="tabWidth" value="4"/> + </module> + <module name="MethodLength"/> + <module name="ParameterNumber"/> + + <!-- whitespace checks --> + <module name="EmptyForIteratorPad"/> + <module name="NoWhitespaceAfter"/> + <module name="NoWhitespaceBefore"/> + <module name="OperatorWrap"/> + <module name="ParenPad"/> + <module name="WhitespaceAfter"/> + <module name="WhitespaceAround"/> + + <!-- Modifier Checks --> + <module name="ModifierOrder"/> + <module name="RedundantModifier"/> + + <!-- Checks for blocks --> + <module name="AvoidNestedBlocks"/> + <module name="EmptyBlock"> + <property name="option" value="text"/> + </module> + <module name="LeftCurly"/> + <module name="NeedBraces"/> + <module name="RightCurly"/> + + + <!-- Checks for common coding problems --> + <!-- <module name="AvoidInlineConditionals"/> --> + <!-- <module name="DoubleCheckedLocking"/> --> <!-- removed in checkstyle 5.6 --> + <module name="EmptyStatement"/> + <module name="EqualsHashCode"/> + <module name="IllegalInstantiation"> + <property name="classes" value="java.lang.Boolean"/> + </module> + <module name="InnerAssignment"/> + <module name="MagicNumber"/> + <module name="MissingSwitchDefault"/> + <!-- Allow redundant throw declarations for doc purposes + <module name="RedundantThrows"> + <property name="allowUnchecked" value="true"/> + </module> + --> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> + + <!-- Checks for class design --> + <!-- <module name="DesignForExtension"/> --> + <module name="FinalClass"/> + <module name="HideUtilityClassConstructor"/> + <module name="InterfaceIsType"/> + <module name="VisibilityModifier"/> + + <!-- 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 name="SuppressionFilter"> + <property name="file" value="${basedir}/src/etc/checkstyle/checkstyle-suppress.xml"/> + </module> + +</module> http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/f8962c6a/src/etc/checkstyle/checkstyle-frames.xsl ---------------------------------------------------------------------- diff --git a/src/etc/checkstyle/checkstyle-frames.xsl b/src/etc/checkstyle/checkstyle-frames.xsl index 7fe4954..30bbfe3 100644 --- a/src/etc/checkstyle/checkstyle-frames.xsl +++ b/src/etc/checkstyle/checkstyle-frames.xsl @@ -1,6 +1,6 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:redirect="org.apache.xalan.lib.Redirect" + xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="redirect"> <!--