Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ant-Java 11+: Add support for a 4th module to be able to add slf4j module 

Otherwise running test-ooxml may fail because of a missing class

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906220 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2022-12-26 16:25:26 +00:00
parent c0d3f16b87
commit cf559d3ae4
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.xml
View File

@ -1345,6 +1345,7 @@ under the License.
<attribute name="module1" default=""/>
<attribute name="module2" default=""/>
<attribute name="module3" default=""/>
<attribute name="module4" default=""/>
<attribute name="outputDir"/>
<element name="elements" implicit="true"/>
<sequential>
@ -1398,6 +1399,7 @@ under the License.
<local name="use_module1"/>
<local name="use_module2"/>
<local name="use_module3"/>
<local name="use_module4"/>
<condition property="use_module1" value="true" unless:true="${isJava8}">
<length string="@{module1}" when="greater" length="0"/>
</condition>
@ -1407,6 +1409,9 @@ under the License.
<condition property="use_module3" value="true" unless:true="${isJava8}">
<length string="@{module3}" when="greater" length="0"/>
</condition>
<condition property="use_module4" value="true" unless:true="${isJava8}">
<length string="@{module4}" when="greater" length="0"/>
</condition>
<!-- As of 2018, JaCoCo is managing expectations and stay on Java 5 and therefore don't support junitlauncher -->
<!-- https://github.com/jacoco/jacoco/issues/673 ... m( -->
@ -1447,11 +1452,13 @@ under the License.
<modulepath refid="@{modulepath-ref}" unless:true="${isJava8}"/>
<!--jvmarg line="-verbose:module"/-->
<jvmarg line="--add-modules org.junit.platform.launcher" unless:true="${isJava8}"/>
<jvmarg line="--add-modules org.junit.jupiter.params" unless:true="${isJava8}"/>
<jvmarg line="--add-modules org.apache.poi.@{module1}" if:set="use_module1"/>
<jvmarg line="--add-modules org.apache.poi.@{module2}" if:set="use_module2"/>
<jvmarg line="--add-modules @{module3}" if:set="use_module3"/>
<jvmarg line="--add-modules @{module4}" if:set="use_module4"/>
</fork>
<listener classname="Junit5Progress" />
@ -1478,7 +1485,8 @@ under the License.
</path>
<poiunit failureproperty="ooxml.test.failed" heap="768" modulepath-ref="restest.modules"
module1="ooxml" module2="scratchpad" module3="org.bouncycastle.pkix" outputDir="${ooxml.reports.test}">
module1="ooxml" module2="scratchpad" module3="org.bouncycastle.pkix" module4="org.slf4j"
outputDir="${ooxml.reports.test}">
<zipfileset src="build/dist/maven/poi-ooxml-tests/poi-ooxml-${version.id}-tests.jar">
<include name="**/${testpattern}.class"/>
<exclude name="**/*$*.class"/>
@ -1799,7 +1807,8 @@ under the License.
<attribute name="type"/>
<sequential>
<poiunit failureproperty="ooxml.test.failed" heap="768" jacocodest="build/jacoco-@{type}.exec"
modulepath-ref="@{modulepath-ref}" module1="ooxml" module2="scratchpad" module3="org.bouncycastle.pkix" outputDir="${ooxml.reports.test}">
modulepath-ref="@{modulepath-ref}" module1="ooxml" module2="scratchpad" module3="org.bouncycastle.pkix"
module4="org.slf4j" outputDir="${ooxml.reports.test}">
<zipfileset src="build/dist/maven/poi-ooxml-tests/poi-ooxml-${version.id}-tests.jar">
<include name="**/${testpattern}.class"/>
<exclude name="**/*$*.class"/>