aboutsummaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorGlenn Adams <gadams@apache.org>2012-04-14 17:11:40 +0000
committerGlenn Adams <gadams@apache.org>2012-04-14 17:11:40 +0000
commiteab33874f3cd217d1946e7f0c0fd4edadbdaba8e (patch)
treee6894b4061e980648f0aa07ac04b66a29a2a0977 /build.xml
parent01388f7ca30e5d5e48f41c65f7453b068205c539 (diff)
downloadxmlgraphics-fop-eab33874f3cd217d1946e7f0c0fd4edadbdaba8e.tar.gz
xmlgraphics-fop-eab33874f3cd217d1946e7f0c0fd4edadbdaba8e.zip
Bugzilla #53083: Update to use of checkstyle-5.5 as default configuration. Remove checkstyle-4.0 configuration. Also, import environment build properties before local properties, so that latter can refer to former.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1326154 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/build.xml b/build.xml
index f84f83a84..3cd62f862 100644
--- a/build.xml
+++ b/build.xml
@@ -54,9 +54,9 @@ list of possible build targets.
<project default="all" basedir="." name="fop">
<!-- See build.properties and build-local.properties for overriding build settings. -->
<!-- build-local.properties is not stored in SVN and overrides values from build.properties -->
+ <property environment="env"/>
<property file="${basedir}/build-local.properties"/>
<property file="${basedir}/build.properties"/>
- <property environment="env"/>
<fileset dir="${basedir}" id="dist.bin">
<include name="conf/**"/>
<include name="examples/**"/>
@@ -1019,9 +1019,9 @@ NOTE:
<!-- =================================================================== -->
<!-- Checkstyle -->
<!-- =================================================================== -->
- <property name="checkstyle.location" value="${lib-tools}/checkstyle-all-5.1.jar" />
+ <property name="checkstyle.location" value="${lib-tools}/checkstyle-5.5-all.jar" />
<property name="checkstyle.noframes.xslt" value="${basedir}/checkstyle-noframes.xsl" />
- <property name="checkstyle.config" value="${basedir}/checkstyle-5.1.xml" />
+ <property name="checkstyle.config" value="${basedir}/checkstyle-5.5.xml" />
<path id="checkstyle-classpath">
<path refid="libs-build-classpath"/>
<pathelement location="${checkstyle.location}"/>