This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git
The following commit(s) were added to refs/heads/trunk by this push:
new f0d1dc34fd Bring build.xml dependency versions in line with Gradle
(#1429)
f0d1dc34fd is described below
commit f0d1dc34fd65848f4cc875a46bbaf41f314bd017
Author: PJ Fanning <[email protected]>
AuthorDate: Sat Oct 17 16:59:56 2026 +0100
Bring build.xml dependency versions in line with Gradle (#1429)
* Bring build.xml dependency versions in line with Gradle
Update the Ant third-party jar versions to match what the Gradle build
resolves, and add the replaced versions to check-jars so that stale jars
in a cached lib/ directory get removed. Also fix the stale gradleVersion
in the wrapper task (the wrapper itself is already on 9.8.1).
Co-Authored-By: Claude Opus 5.5 <[email protected]>
* ant: resolve commons-logging explicitly for ooxml tests
commons-logging 1.4.0 ships a module-info, so it is no longer an automatic
module and pdfbox's use of it fails with NoClassDefFoundError unless it is
added as a root module. Also check for the commons-logging jar so that a
version bump triggers the download.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
---------
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
build.gradle | 2 +-
build.xml | 78 +++++++++++++++++++++++++++++++++++++++++-------------------
2 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/build.gradle b/build.gradle
index 510eb302aa..9ffa70c8b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,7 +94,7 @@ ant.taskdef(name: "junit",
wrapper {
- gradleVersion = '9.6.1'
+ gradleVersion = '9.8.1'
}
group = 'org.apache.poi'
diff --git a/build.xml b/build.xml
index 227c8153f1..f5b1db5f1a 100644
--- a/build.xml
+++ b/build.xml
@@ -259,17 +259,17 @@ under the License.
<!-- jars in the /lib directory, see the fetch-jars target-->
- <dependency prefix="main.commons-codec"
artifact="commons-codec:commons-codec:1.22.1" usage="main"/>
- <dependency prefix="main.commons-collections4"
artifact="org.apache.commons:commons-collections4:4.5.0" usage="main"/>
+ <dependency prefix="main.commons-codec"
artifact="commons-codec:commons-codec:1.23.0" usage="main"/>
+ <dependency prefix="main.commons-collections4"
artifact="org.apache.commons:commons-collections4:4.6.0" usage="main"/>
<dependency prefix="main.commons-math3"
artifact="org.apache.commons:commons-math3:3.6.1" usage="main"/>
<dependency prefix="main.commons-io"
artifact="commons-io:commons-io:2.22.0" usage="main"/>
<dependency prefix="main.com.zaxxer"
artifact="com.zaxxer:SparseBitSet:1.3" usage="main"/>
- <dependency prefix="main.log4j-api"
artifact="org.apache.logging.log4j:log4j-api:2.26.0" usage="main"/>
+ <dependency prefix="main.log4j-api"
artifact="org.apache.logging.log4j:log4j-api:2.26.1" usage="main"/>
<dependency prefix="main.junit-api"
artifact="org.junit.jupiter:junit-jupiter-api:6.1.3" usage="main-tests"/>
<dependency prefix="main.junit-jengine"
artifact="org.junit.jupiter:junit-jupiter-engine:6.1.3" usage="main-tests"/>
<dependency prefix="main.junit-params"
artifact="org.junit.jupiter:junit-jupiter-params:6.1.3" usage="main-tests"/>
- <dependency prefix="main.junit-opentest4j"
artifact="org.opentest4j:opentest4j:1.2.0" usage="main-tests"/>
+ <dependency prefix="main.junit-opentest4j"
artifact="org.opentest4j:opentest4j:1.3.0" usage="main-tests"/>
<dependency prefix="main.junit-apiguardian"
artifact="org.apiguardian:apiguardian-api:1.1.2" usage="main-tests"/>
<dependency prefix="main.junit-jspecify"
artifact="org.jspecify:jspecify:1.0.1" usage="main-tests"/>
<dependency prefix="main.junit-pcommons"
artifact="org.junit.platform:junit-platform-commons:6.1.3" usage="main-tests"/>
@@ -277,28 +277,28 @@ under the License.
<dependency prefix="main.junit-plauncher"
artifact="org.junit.platform:junit-platform-launcher:6.1.3" usage="main-tests"/>
- <dependency prefix="main.jmh" artifact="org.openjdk.jmh:jmh-core:1.35"
usage="main-tests"/>
- <dependency prefix="main.jmhAnnotation"
artifact="org.openjdk.jmh:jmh-generator-annprocess:1.35" usage="main-tests"/>
+ <dependency prefix="main.jmh" artifact="org.openjdk.jmh:jmh-core:1.37"
usage="main-tests"/>
+ <dependency prefix="main.jmhAnnotation"
artifact="org.openjdk.jmh:jmh-generator-annprocess:1.37" usage="main-tests"/>
<dependency prefix="main.hamcrest" artifact="org.hamcrest:hamcrest:3.0"
usage="main-tests"/>
- <dependency prefix="main.xmlunit"
artifact="org.xmlunit:xmlunit-core:2.10.3" usage="main-tests"/>
- <dependency prefix="main.mockito"
artifact="org.mockito:mockito-core:5.20.0" usage="main-tests"/>
- <dependency prefix="main.byte-buddy"
artifact="net.bytebuddy:byte-buddy:1.18.10" usage="main-tests"/>
- <dependency prefix="main.byte-buddy-agent"
artifact="net.bytebuddy:byte-buddy-agent:1.18.10" usage="main-tests"/>
- <dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:3.1"
usage="main-tests"/>
+ <dependency prefix="main.xmlunit"
artifact="org.xmlunit:xmlunit-core:2.14.0" usage="main-tests"/>
+ <dependency prefix="main.mockito"
artifact="org.mockito:mockito-core:5.24.0" usage="main-tests"/>
+ <dependency prefix="main.byte-buddy"
artifact="net.bytebuddy:byte-buddy:1.18.15" usage="main-tests"/>
+ <dependency prefix="main.byte-buddy-agent"
artifact="net.bytebuddy:byte-buddy-agent:1.18.15" usage="main-tests"/>
+ <dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:3.3"
usage="main-tests"/>
<dependency prefix="main.log4j-core"
artifact="org.apache.logging.log4j:log4j-core:2.26.1" usage="main-tests"/>
- <dependency prefix="main.commons-logging"
artifact="commons-logging:commons-logging:1.2" usage="main-tests"/>
+ <dependency prefix="main.commons-logging"
artifact="commons-logging:commons-logging:1.4.0" usage="main-tests"/>
<dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.18"
usage="excelant"/>
<dependency prefix="main.antlauncher"
artifact="org.apache.ant:ant-launcher:1.10.18" usage="excelant"/>
<!-- xml signature libs - not part of the distribution -->
<dependency prefix="dsig.xmlsec"
artifact="org.apache.santuario:xmlsec:3.0.6" usage="ooxml-provided"/>
- <dependency prefix="dsig.bouncycastle-prov"
artifact="org.bouncycastle:bcprov-jdk18on:1.85" usage="ooxml-provided"/>
- <dependency prefix="dsig.bouncycastle-pkix"
artifact="org.bouncycastle:bcpkix-jdk18on:1.85" usage="ooxml-provided"/>
- <dependency prefix="dsig.bouncycastle-util"
artifact="org.bouncycastle:bcutil-jdk18on:1.85" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-prov"
artifact="org.bouncycastle:bcprov-jdk18on:1.86" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-pkix"
artifact="org.bouncycastle:bcpkix-jdk18on:1.86" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-util"
artifact="org.bouncycastle:bcutil-jdk18on:1.86" usage="ooxml-provided"/>
<!-- only used for signing the release - not used with the ooxml
signatures -->
- <dependency prefix="dsig.bouncycastle-bcpg"
artifact="org.bouncycastle:bcpg-jdk18on:1.85" usage="util"/>
- <dependency prefix="ooxml.test.stax2"
artifact="org.codehaus.woodstox:stax2-api:4.2.1" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-bcpg"
artifact="org.bouncycastle:bcpg-jdk18on:1.86" usage="util"/>
+ <dependency prefix="ooxml.test.stax2"
artifact="org.codehaus.woodstox:stax2-api:4.3.1" usage="ooxml-provided"/>
<!-- svg/batik/pdf libs - not part of the distribution - move batik to its
own directory because of JPMS module-path issues -->
<dependency prefix="svg.xml-apis-ext"
artifact="xml-apis:xml-apis-ext:1.3.04" usage="ooxml-batik"/>
@@ -322,10 +322,10 @@ under the License.
<dependency prefix="svg.batik-transcoder"
artifact="org.apache.xmlgraphics:batik-transcoder:1.19" usage="ooxml-batik"/>
<dependency prefix="svg.batik-util"
artifact="org.apache.xmlgraphics:batik-util:1.19" usage="ooxml-batik"/>
<dependency prefix="svg.batik-xml"
artifact="org.apache.xmlgraphics:batik-xml:1.19" usage="ooxml-batik"/>
- <dependency prefix="pdf.pdfbox" artifact="org.apache.pdfbox:pdfbox:3.0.5"
usage="ooxml-provided"/>
- <dependency prefix="pdf.pdfbox.io"
artifact="org.apache.pdfbox:pdfbox-io:3.0.5" usage="ooxml-provided"/>
- <dependency prefix="pdf.fontbox"
artifact="org.apache.pdfbox:fontbox:3.0.5" usage="ooxml-provided"/>
- <dependency prefix="pdf.graphics2d"
artifact="de.rototor.pdfbox:graphics2d:3.0.3" usage="ooxml-provided"/>
+ <dependency prefix="pdf.pdfbox" artifact="org.apache.pdfbox:pdfbox:3.0.8"
usage="ooxml-provided"/>
+ <dependency prefix="pdf.pdfbox.io"
artifact="org.apache.pdfbox:pdfbox-io:3.0.8" usage="ooxml-provided"/>
+ <dependency prefix="pdf.fontbox"
artifact="org.apache.pdfbox:fontbox:3.0.8" usage="ooxml-provided"/>
+ <dependency prefix="pdf.graphics2d"
artifact="de.rototor.pdfbox:graphics2d:3.0.5" usage="ooxml-provided"/>
<!-- jars in the ooxml-lib directory, see the fetch-ooxml-jars target-->
<dependency prefix="ooxml.curvesapi"
artifact="com.github.virtuald:curvesapi:1.08" usage="ooxml"/>
@@ -336,10 +336,10 @@ under the License.
<!-- jars in the ooxml-test-lib directory, see the fetch-ooxml-jars
target-->
<dependency prefix="ooxml.test.commons-csv"
artifact="org.apache.commons:commons-csv:1.14.1" usage="ooxml-tests"/>
<dependency prefix="ooxml.test.reflections"
artifact="org.reflections:reflections:0.10.2" usage="ooxml-tests"/>
- <dependency prefix="ooxml.test.guava"
artifact="com.google.guava:guava:33.7.1-jre" usage="ooxml-tests"/>
+ <dependency prefix="ooxml.test.guava"
artifact="com.google.guava:guava:33.7.2-jre" usage="ooxml-tests"/>
<dependency prefix="ooxml.test.guava.failureaccess"
artifact="com.google.guava:failureaccess:1.0.3" usage="ooxml-tests"/>
- <dependency prefix="ooxml.test.javassist"
artifact="org.javassist:javassist:3.27.0-GA" usage="ooxml-tests"/>
- <dependency prefix="ooxml.test.slf4j-api"
artifact="org.slf4j:slf4j-api:2.0.17" usage="ooxml-tests"/>
+ <dependency prefix="ooxml.test.javassist"
artifact="org.javassist:javassist:3.28.0-GA" usage="ooxml-tests"/>
+ <dependency prefix="ooxml.test.slf4j-api"
artifact="org.slf4j:slf4j-api:2.0.20" usage="ooxml-tests"/>
<dependency prefix="ooxml.test.opczip"
artifact="com.github.rzymek:opczip:1.2.0" usage="ooxml-tests"/>
<!-- coverage libs -->
@@ -667,6 +667,9 @@ under the License.
<include name="log4j-api-2.17*.jar"/>
<include name="commons-logging-1.2.jar"/>
<include name="*slf4j*.jar"/>
+ <include name="commons-codec-1.22.1.jar"/>
+ <include name="commons-collections4-4.5.0.jar"/>
+ <include name="log4j-api-2.26.0.jar"/>
</fileset>
<fileset dir="${basedir}/lib/main-tests">
<include name="byte-buddy-*1.12*.jar"/>
@@ -683,6 +686,13 @@ under the License.
<include name="log4j-core-2.15*.jar"/>
<include name="log4j-core-2.16*.jar"/>
<include name="log4j-core-2.17*.jar"/>
+ <include name="byte-buddy-*1.18.10.jar"/>
+ <include name="commons-logging-1.2.jar"/>
+ <include name="jmh-*-1.35.jar"/>
+ <include name="mockito-core-5.20.0.jar"/>
+ <include name="objenesis-3.1.jar"/>
+ <include name="opentest4j-1.2.0.jar"/>
+ <include name="xmlunit-core-2.10.3.jar"/>
</fileset>
<fileset dir="${basedir}/lib/ooxml">
<include name="xmlbeans-3*.jar"/>
@@ -699,12 +709,22 @@ under the License.
<include name="slf4j*-1.*.jar"/>
<include name="xmlsec-2*.jar"/>
<include name="xmlgraphics-commons-*.jar"/>
+ <include name="bc*-jdk18on-1.85.jar"/>
+ <include name="pdfbox-3.0.5.jar"/>
+ <include name="pdfbox-io-3.0.5.jar"/>
+ <include name="fontbox-3.0.5.jar"/>
+ <include name="graphics2d-3.0.3.jar"/>
+ <include name="stax2-api-4.2.1.jar"/>
</fileset>
<fileset dir="${basedir}/lib/ooxml-tests">
<include name="guava-20.0.jar"/>
+ <include name="guava-33.7.1-jre.jar"/>
+ <include name="javassist-3.27.0-GA.jar"/>
+ <include name="slf4j-api-2.0.17.jar"/>
</fileset>
<fileset dir="${basedir}/lib/util">
<include name="asm*7.2.jar"/>
+ <include name="bcpg-jdk18on-1.85.jar"/>
<include name="asm*9.0.jar"/>
<include name="asm*9.3.jar"/>
<include name="org.jacoco.*-0.8.5.*.jar"/>
@@ -768,6 +788,7 @@ under the License.
<available file="${dsig.bouncycastle-util.jar}"/>
<available file="${dsig.xmlsec.jar}"/>
<available file="${main.commons-collections4.jar}"/>
+ <available file="${main.commons-logging.jar}"/>
<available file="${main.commons-math3.jar}"/>
<available file="${main.commons-io.jar}"/>
<available file="${main.com.zaxxer.jar}"/>
@@ -1312,6 +1333,7 @@ under the License.
<attribute name="module2" default=""/>
<attribute name="module3" default=""/>
<attribute name="module4" default=""/>
+ <attribute name="module5" default=""/>
<attribute name="outputDir"/>
<element name="elements" implicit="true"/>
<sequential>
@@ -1367,6 +1389,7 @@ under the License.
<local name="use_module2"/>
<local name="use_module3"/>
<local name="use_module4"/>
+ <local name="use_module5"/>
<condition property="use_module1" value="true">
<length string="@{module1}" when="greater" length="0"/>
</condition>
@@ -1379,6 +1402,9 @@ under the License.
<condition property="use_module4" value="true">
<length string="@{module4}" when="greater" length="0"/>
</condition>
+ <condition property="use_module5" value="true">
+ <length string="@{module5}" 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( -->
@@ -1425,6 +1451,7 @@ under the License.
<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"/>
+ <jvmarg line="--add-modules @{module5}"
if:set="use_module5"/>
</fork>
<listener classname="Junit5Progress" />
@@ -1452,6 +1479,7 @@ under the License.
<poiunit failureproperty="ooxml.test.failed" heap="768"
modulepath-ref="restest.modules"
module1="ooxml" module2="scratchpad"
module3="org.bouncycastle.pkix" module4="org.slf4j"
+ module5="org.apache.commons.logging"
outputDir="${ooxml.reports.test}">
<zipfileset
src="build/dist/maven/poi-ooxml-tests/poi-ooxml-${version.id}-tests.jar">
<include name="**/${testpattern}.class"/>
@@ -1771,7 +1799,7 @@ under the License.
<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"
- module4="org.slf4j" outputDir="${ooxml.reports.test}">
+ module4="org.slf4j" module5="org.apache.commons.logging"
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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]