You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2026/10/18 11:35:19 UTC
(poi) branch trunk updated: Fix poi-integration tests when scratchpad is ignored (#1445)
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 bf7c9b6a14 Fix poi-integration tests when scratchpad is ignored (#1445)
bf7c9b6a14 is described below
commit bf7c9b6a1490046517cbd8e1504e702a89be4bc9
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Sun Oct 18 12:35:14 2026 +0100
Fix poi-integration tests when scratchpad is ignored (#1445)
Since module-info.class moved to the jar root (#1365), the
org.apache.poi.stress module hard-requires org.apache.poi.scratchpad,
so the POI-DSL-no-scratchpad job fails with
"FindException: Module org.apache.poi.scratchpad not found".
Make the dependency static (as poi-examples already does) and add the
scratchpad module explicitly when it is not ignored.
Co-authored-by: Claude Opus 5.5 <no...@anthropic.com>
---
build.xml | 2 +-
poi-integration/build.gradle | 4 ++++
poi-integration/src/test/jpms/module-info.java | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 4973b419c6..00e6356b09 100644
--- a/build.xml
+++ b/build.xml
@@ -1873,7 +1873,7 @@ under the License.
</path>
<poiunit failureproperty="integration.test.failed" heap="3072" showoutput="true" jacocodest="build/jacoco-integration.exec"
- modulepath-ref="test-integration.modules" module1="stress" outputDir="${integration.reports.test}">
+ modulepath-ref="test-integration.modules" module1="stress" module2="scratchpad" outputDir="${integration.reports.test}">
<zipfileset src="build/dist/maven/poi-integration/poi-integration-${version.id}.jar">
<include name="**/${testpattern}.class"/>
<exclude name="**/*$*.class"/>
diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index c9bf1b30ef..e3d2fc5d4b 100644
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -157,6 +157,10 @@ test {
]
if (NO_SCRATCHPAD) {
systemProperty 'scratchpad.ignore', 'true'
+ } else {
+ // org.apache.poi.stress only has a static (optional) dependency on scratchpad,
+ // so it has to be added to the module graph explicitly
+ jvmArgs += ['--add-modules', 'org.apache.poi.scratchpad']
}
}
}
diff --git a/poi-integration/src/test/jpms/module-info.java b/poi-integration/src/test/jpms/module-info.java
index a75333f468..c43946b3f9 100644
--- a/poi-integration/src/test/jpms/module-info.java
+++ b/poi-integration/src/test/jpms/module-info.java
@@ -27,7 +27,7 @@ module org.apache.poi.stress {
requires ant;
requires transitive org.apache.poi.poi;
requires org.apache.poi.examples;
- requires org.apache.poi.scratchpad;
+ requires static org.apache.poi.scratchpad;
requires org.apache.santuario.xmlsec;
requires org.bouncycastle.provider;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org