replaced forrest ant integration with ant invocation - copying xml-resolver.jar in $ANT_HOME/lib isn't necessary anymore

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1836402 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2018-07-21 10:28:53 +00:00
parent eca7a55932
commit fc044c7840

View File

@ -24,9 +24,7 @@ under the License.
updated to forrest 0.9:
To build the documentation you will need to install forrest and set
the FORREST_HOME environment variable. Forrest 0.9 required.
check https://forrest.apache.org/docs_0_90/your-project.html#invoking_from_ant
TODO: cp forrest/lib/core/xml-commons-resolver-*.jar $ANT_HOME/lib
the FORREST_HOME environment variable.
Since POI 4.0 you will need JDK 1.8 or newer to build and run POI.
@ -56,13 +54,6 @@ under the License.
<property name="ooxml.lib" location="ooxml-lib"/>
<property name="compile.lib" location="compile-lib"/>
<!-- apache forrest settings -->
<property name="forrest.home" location="${env.FORREST_HOME}"/>
<property name="project.home" location="."/>
<!--<property name="project.build-dir" location="build"/>-->
<!--<property name="project.site" value="tmp/site"/>-->
<import file="${env.FORREST_HOME}/main/forrest.build.xml"/>
<!-- compiler options options -->
<property name="jdk.version.source" value="1.8" description="JDK version of source code"/>
<property name="jdk.version.class" value="1.8" description="JDK version of generated class files"/>
@ -1757,9 +1748,11 @@ under the License.
<fail message="Apache Forrest is not installed."/>
</target>
<target name="docs" depends="init, -check-forrest-installed, -check-docs, check-java-version, init-props, init-skins, init-plugins, site, javadocs"
<target name="docs" depends="init, -check-forrest-installed, -check-docs, javadocs"
unless="main.docs.notRequired" description="Builds the POI website">
<exec executable="${env.FORREST_HOME}/bin/forrest"/>
<echo>Broken links:</echo>
<echo file="${build.site}/../tmp/brokenlinks.xml"/>
@ -2111,7 +2104,7 @@ under the License.
</mvn:mvn>
</target>
<target name="dist" depends="clean, compile-all, test-all, rat-check, forbidden-apis-check, site, jar, release-notes, assemble"
<target name="dist" depends="clean, compile-all, test-all, rat-check, forbidden-apis-check, docs, jar, release-notes, assemble"
description="Creates the entire distribution into build/dist, from scratch">
</target>