whitespace
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1739662 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal
parent
1e07b01af3
commit
c03fd6374b
86
build.xml
86
build.xml
@ -519,18 +519,18 @@ under the License.
|
|||||||
<include name="junit-3*"/>
|
<include name="junit-3*"/>
|
||||||
<include name="junit-4.11*"/>
|
<include name="junit-4.11*"/>
|
||||||
<include name="findbugs-*-2.0.3*"/>
|
<include name="findbugs-*-2.0.3*"/>
|
||||||
<include name="forbiddenapis-1.*.jar"/>
|
<include name="forbiddenapis-1.*.jar"/>
|
||||||
|
</fileset>
|
||||||
|
<fileset dir="${ooxml.lib}">
|
||||||
|
<!-- remove jars from previous versions, but not the current version -->
|
||||||
|
<include name="ooxml-schemas-src-1.1.jar"/>
|
||||||
|
<include name="ooxml-schemas-1.1-sources.jar"/>
|
||||||
|
<include name="ooxml-schemas-1.1.jar"/>
|
||||||
|
<include name="ooxml-schemas-1.2-sources.jar"/>
|
||||||
|
<include name="ooxml-schemas-1.2.jar"/>
|
||||||
|
<include name="ooxml-security-1.0-sources.jar"/>
|
||||||
|
<include name="ooxml-security-1.0.jar"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
<fileset dir="${ooxml.lib}">
|
|
||||||
<!-- remove jars from previous versions, but not the current version -->
|
|
||||||
<include name="ooxml-schemas-src-1.1.jar"/>
|
|
||||||
<include name="ooxml-schemas-1.1-sources.jar"/>
|
|
||||||
<include name="ooxml-schemas-1.1.jar"/>
|
|
||||||
<include name="ooxml-schemas-1.2-sources.jar"/>
|
|
||||||
<include name="ooxml-schemas-1.2.jar"/>
|
|
||||||
<include name="ooxml-security-1.0-sources.jar"/>
|
|
||||||
<include name="ooxml-security-1.0.jar"/>
|
|
||||||
</fileset>
|
|
||||||
<fileset dir="${compile.lib}">
|
<fileset dir="${compile.lib}">
|
||||||
<include name="xercesImpl-*.jar"/>
|
<include name="xercesImpl-*.jar"/>
|
||||||
<include name="xmlsec-2.0.1.jar"/>
|
<include name="xmlsec-2.0.1.jar"/>
|
||||||
@ -609,10 +609,10 @@ under the License.
|
|||||||
<downloadfile src="${ooxml.curvesapi.url}" dest="${ooxml.curvesapi.jar}"/>
|
<downloadfile src="${ooxml.curvesapi.url}" dest="${ooxml.curvesapi.jar}"/>
|
||||||
<downloadfile src="${ooxml.xmlbeans23.url}" dest="${ooxml.xmlbeans23.jar}.orig"/>
|
<downloadfile src="${ooxml.xmlbeans23.url}" dest="${ooxml.xmlbeans23.jar}.orig"/>
|
||||||
<downloadfile src="${ooxml.xmlbeans26.url}" dest="${ooxml.xmlbeans26.jar}.orig"/>
|
<downloadfile src="${ooxml.xmlbeans26.url}" dest="${ooxml.xmlbeans26.jar}.orig"/>
|
||||||
<!-- remove piccolo parser, so we don't use unsafe calls to it instead of using jaxp -->
|
<!-- remove piccolo parser, so we don't use unsafe calls to it instead of using jaxp -->
|
||||||
<zip destfile="${ooxml.xmlbeans23.jar}">
|
<zip destfile="${ooxml.xmlbeans23.jar}">
|
||||||
<zipfileset src="${ooxml.xmlbeans23.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/>
|
<zipfileset src="${ooxml.xmlbeans23.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/>
|
||||||
</zip>
|
</zip>
|
||||||
<zip destfile="${ooxml.xmlbeans26.jar}">
|
<zip destfile="${ooxml.xmlbeans26.jar}">
|
||||||
<zipfileset src="${ooxml.xmlbeans26.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/>
|
<zipfileset src="${ooxml.xmlbeans26.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/>
|
||||||
</zip>
|
</zip>
|
||||||
@ -755,7 +755,7 @@ under the License.
|
|||||||
nopvr="@{nopvr}"
|
nopvr="@{nopvr}"
|
||||||
>
|
>
|
||||||
<classpath>
|
<classpath>
|
||||||
<path location="${ooxml.xmlbeans23.jar}.orig"/>
|
<path location="${ooxml.xmlbeans23.jar}.orig"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
</xmlbean>
|
</xmlbean>
|
||||||
|
|
||||||
@ -764,24 +764,24 @@ under the License.
|
|||||||
<replacevalue>org.apache.poi.POIXMLTypeLoader</replacevalue>
|
<replacevalue>org.apache.poi.POIXMLTypeLoader</replacevalue>
|
||||||
</replace>
|
</replace>
|
||||||
|
|
||||||
<!-- remove deprecated warnings, as we prefer the array methods - see #56854 -->
|
<!-- remove deprecated warnings, as we prefer the array methods - see #56854 -->
|
||||||
<replace dir="${xmlbean.sources.dir}" includes="**/*.java" excludes="**/impl/**">
|
<replace dir="${xmlbean.sources.dir}" includes="**/*.java" excludes="**/impl/**">
|
||||||
<replacetoken><![CDATA[ * @deprecated
|
<replacetoken><![CDATA[ * @deprecated
|
||||||
]]></replacetoken>
|
]]></replacetoken>
|
||||||
</replace>
|
</replace>
|
||||||
|
|
||||||
<copy todir="${xmlbean.sources.dir}">
|
<copy todir="${xmlbean.sources.dir}">
|
||||||
<fileset dir="${ooxml.src}">
|
<fileset dir="${ooxml.src}">
|
||||||
<include name="org/apache/poi/POIXMLTypeLoader.java"/>
|
<include name="org/apache/poi/POIXMLTypeLoader.java"/>
|
||||||
<include name="org/apache/poi/util/DocumentHelper.java"/>
|
<include name="org/apache/poi/util/DocumentHelper.java"/>
|
||||||
<include name="org/apache/poi/util/SAXHelper.java"/>
|
<include name="org/apache/poi/util/SAXHelper.java"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
<fileset dir="${main.src}">
|
<fileset dir="${main.src}">
|
||||||
<include name="org/apache/poi/util/POILogFactory.java"/>
|
<include name="org/apache/poi/util/POILogFactory.java"/>
|
||||||
<include name="org/apache/poi/util/POILogger.java"/>
|
<include name="org/apache/poi/util/POILogger.java"/>
|
||||||
<include name="org/apache/poi/util/NullLogger.java"/>
|
<include name="org/apache/poi/util/NullLogger.java"/>
|
||||||
<include name="org/apache/poi/util/Internal.java"/>
|
<include name="org/apache/poi/util/Internal.java"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</copy>
|
</copy>
|
||||||
|
|
||||||
<javac target="${jdk.version.class}"
|
<javac target="${jdk.version.class}"
|
||||||
@ -1163,7 +1163,7 @@ under the License.
|
|||||||
<syspropertyset refid="junit.properties"/>
|
<syspropertyset refid="junit.properties"/>
|
||||||
<jvmarg value="-ea"/>
|
<jvmarg value="-ea"/>
|
||||||
<jvmarg value="-Xmx256m"/>
|
<jvmarg value="-Xmx256m"/>
|
||||||
<!-- jvmarg value="-Duser.timezone=UTC"/ -->
|
<!-- jvmarg value="-Duser.timezone=UTC"/ -->
|
||||||
<formatter type="plain"/>
|
<formatter type="plain"/>
|
||||||
<formatter type="xml"/>
|
<formatter type="xml"/>
|
||||||
<batchtest todir="${main.reports.test}">
|
<batchtest todir="${main.reports.test}">
|
||||||
@ -1204,7 +1204,7 @@ under the License.
|
|||||||
<classpath refid="test.scratchpad.classpath"/>
|
<classpath refid="test.scratchpad.classpath"/>
|
||||||
<syspropertyset refid="junit.properties"/>
|
<syspropertyset refid="junit.properties"/>
|
||||||
<jvmarg value="-ea"/>
|
<jvmarg value="-ea"/>
|
||||||
<!-- jvmarg value="-Duser.timezone=UTC"/ -->
|
<!-- jvmarg value="-Duser.timezone=UTC"/ -->
|
||||||
<!--
|
<!--
|
||||||
YK: ensure that JUnit has enough memory to run tests.
|
YK: ensure that JUnit has enough memory to run tests.
|
||||||
Without the line below tests fail on Mac OS X with jdk-1.6.26
|
Without the line below tests fail on Mac OS X with jdk-1.6.26
|
||||||
@ -1245,10 +1245,10 @@ under the License.
|
|||||||
failureproperty="ooxml.test.failed">
|
failureproperty="ooxml.test.failed">
|
||||||
<classpath refid="@{classpath}"/>
|
<classpath refid="@{classpath}"/>
|
||||||
<syspropertyset refid="junit.properties"/>
|
<syspropertyset refid="junit.properties"/>
|
||||||
<jvmarg value="-XX:MaxPermSize=256m"/>
|
<jvmarg value="-XX:MaxPermSize=256m"/>
|
||||||
<jvmarg value="-Xmx768M"/>
|
<jvmarg value="-Xmx768M"/>
|
||||||
<jvmarg value="-ea"/>
|
<jvmarg value="-ea"/>
|
||||||
<!-- jvmarg value="-Duser.timezone=UTC"/ -->
|
<!-- jvmarg value="-Duser.timezone=UTC"/ -->
|
||||||
<formatter type="plain"/>
|
<formatter type="plain"/>
|
||||||
<formatter type="xml"/>
|
<formatter type="xml"/>
|
||||||
<batchtest todir="${ooxml.reports.test}">
|
<batchtest todir="${ooxml.reports.test}">
|
||||||
@ -1269,7 +1269,7 @@ under the License.
|
|||||||
<path refid="ooxml.xmlsec.classpath"/>
|
<path refid="ooxml.xmlsec.classpath"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
<syspropertyset refid="junit.properties"/>
|
<syspropertyset refid="junit.properties"/>
|
||||||
<jvmarg value="-Xmx768M"/>
|
<jvmarg value="-Xmx768M"/>
|
||||||
<jvmarg value="-ea"/>
|
<jvmarg value="-ea"/>
|
||||||
<formatter type="plain"/>
|
<formatter type="plain"/>
|
||||||
<formatter type="xml"/>
|
<formatter type="xml"/>
|
||||||
@ -1428,9 +1428,9 @@ under the License.
|
|||||||
<echo>Broken links:</echo>
|
<echo>Broken links:</echo>
|
||||||
<echo file="${build.site}/../tmp/brokenlinks.txt"/>
|
<echo file="${build.site}/../tmp/brokenlinks.txt"/>
|
||||||
|
|
||||||
<fixcrlf srcdir="${build.site}" includes="**/*.html,**/*.css" eol="unix" eof="remove" />
|
<fixcrlf srcdir="${build.site}" includes="**/*.html,**/*.css" eol="unix" eof="remove" />
|
||||||
|
|
||||||
<touch>
|
<touch>
|
||||||
<fileset dir="${build.site}"/>
|
<fileset dir="${build.site}"/>
|
||||||
</touch>
|
</touch>
|
||||||
</target>
|
</target>
|
||||||
@ -1593,11 +1593,11 @@ under the License.
|
|||||||
<property name="build.maven.javadocs" location="build/tmp/maven-javadocs"/>
|
<property name="build.maven.javadocs" location="build/tmp/maven-javadocs"/>
|
||||||
|
|
||||||
<!-- Build and package the main javadocs -->
|
<!-- Build and package the main javadocs -->
|
||||||
<maven-javadocs src="${main.src}" dest="${jar.name}"/>
|
<maven-javadocs src="${main.src}" dest="${jar.name}"/>
|
||||||
<!-- Build and package the scratchpad javadocs -->
|
<!-- Build and package the scratchpad javadocs -->
|
||||||
<maven-javadocs src="${scratchpad.src}" dest="${jar.name}-scratchpad"/>
|
<maven-javadocs src="${scratchpad.src}" dest="${jar.name}-scratchpad"/>
|
||||||
<!-- Build and package the ooxml javadocs -->
|
<!-- Build and package the ooxml javadocs -->
|
||||||
<maven-javadocs src="${ooxml.src}" dest="${jar.name}-ooxml"/>
|
<maven-javadocs src="${ooxml.src}" dest="${jar.name}-ooxml"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<macrodef name="maven-javadocs">
|
<macrodef name="maven-javadocs">
|
||||||
@ -1627,7 +1627,7 @@ under the License.
|
|||||||
</macrodef>
|
</macrodef>
|
||||||
|
|
||||||
<target name="release-notes" depends="init">
|
<target name="release-notes" depends="init">
|
||||||
<copy file="src/documentation/RELEASE-NOTES.txt" todir="build/dist/" overwrite="true">
|
<copy file="src/documentation/RELEASE-NOTES.txt" todir="build/dist/" overwrite="true">
|
||||||
<filterset>
|
<filterset>
|
||||||
<filter token="VERSION" value="${version.id}"/>
|
<filter token="VERSION" value="${version.id}"/>
|
||||||
<filter token="DSTAMP" value="${DSTAMP}"/>
|
<filter token="DSTAMP" value="${DSTAMP}"/>
|
||||||
@ -1790,15 +1790,15 @@ under the License.
|
|||||||
</fileset>
|
</fileset>
|
||||||
</rat:report>
|
</rat:report>
|
||||||
|
|
||||||
<!-- remove clutter to compact build output -->
|
<!-- remove clutter to compact build output -->
|
||||||
<!-- replaceregexp doesn't work within loadfile ... -->
|
<!-- replaceregexp doesn't work within loadfile ... -->
|
||||||
<replaceregexp file="${rat.report}" match="\s+Printing headers for files without AL header.++" replace="" flags="s"/>
|
<replaceregexp file="${rat.report}" match="\s+Printing headers for files without AL header.++" replace="" flags="s"/>
|
||||||
|
|
||||||
<loadfile property="rat.reportcontent" srcFile="${rat.report}">
|
<loadfile property="rat.reportcontent" srcFile="${rat.report}">
|
||||||
<filterchain>
|
<filterchain>
|
||||||
<linecontainsregexp negate="true">
|
<linecontainsregexp negate="true">
|
||||||
<regexp pattern="^\s+(AL|B|N)\s+"/>
|
<regexp pattern="^\s+(AL|B|N)\s+"/>
|
||||||
</linecontainsregexp>
|
</linecontainsregexp>
|
||||||
</filterchain>
|
</filterchain>
|
||||||
</loadfile>
|
</loadfile>
|
||||||
<echo>${rat.reportcontent}</echo>
|
<echo>${rat.reportcontent}</echo>
|
||||||
@ -1861,7 +1861,7 @@ under the License.
|
|||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="findbugs">
|
<target name="findbugs">
|
||||||
<!-- NOTE: we did not update to 3.x yet because it requires Java 7, but we are still supporting Java 6 currently! -->
|
<!-- NOTE: we did not update to 3.x yet because it requires Java 7, but we are still supporting Java 6 currently! -->
|
||||||
<downloadfile
|
<downloadfile
|
||||||
src="http://prdownloads.sourceforge.net/findbugs/findbugs-noUpdateChecks-2.0.3.zip?download"
|
src="http://prdownloads.sourceforge.net/findbugs/findbugs-noUpdateChecks-2.0.3.zip?download"
|
||||||
dest="${main.lib}/findbugs-noUpdateChecks-2.0.3.zip"/>
|
dest="${main.lib}/findbugs-noUpdateChecks-2.0.3.zip"/>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user