aboutsummaryrefslogtreecommitdiffstats
path: root/poi-integration
diff options
context:
space:
mode:
authorAndreas Beeker <kiwiwings@apache.org>2021-09-12 20:31:43 +0000
committerAndreas Beeker <kiwiwings@apache.org>2021-09-12 20:31:43 +0000
commit596db3117021cea11793fff2d3018e5e2907a2c9 (patch)
tree2af7961416ce3c30cc037de1a62c7b58783faae4 /poi-integration
parent99047b5245ea588419cd45b8a8ac3a1ca15494ea (diff)
downloadpoi-596db3117021cea11793fff2d3018e5e2907a2c9.tar.gz
poi-596db3117021cea11793fff2d3018e5e2907a2c9.zip
XmlSec/BouncyCastle and Batik are now optional
disable SonarQube build based on ant remove sonar and maven directory, because POMs are now created via Gradle remove maven section from seed-build fix duplicated maven dependencies on POM export git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1893289 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poi-integration')
-rw-r--r--poi-integration/build.gradle14
-rw-r--r--poi-integration/src/test/java9/module-info.classbin492 -> 683 bytes
-rw-r--r--poi-integration/src/test/java9/module-info.java9
3 files changed, 17 insertions, 6 deletions
diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index cb491e01c0..7093336061 100644
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -24,6 +24,7 @@ final boolean IBMVM = System.getProperty("java.vendor").contains("IBM")
configurations {
tests
+ misc
}
sourceSets {
@@ -44,7 +45,10 @@ dependencies {
testImplementation 'org.apache.commons:commons-collections4:4.4'
testImplementation 'com.google.guava:guava:30.1.1-jre'
- testImplementation(project(':poi-ooxml')) {
+ misc(project(':poi-ooxml')) {
+ capabilities {
+ requireCapability("${project.group}:poi-ooxml-rendersign")
+ }
if (NO_SCRATCHPAD) {
exclude group: 'org.apache.poi', module: 'poi-scratchpad'
}
@@ -73,14 +77,14 @@ dependencies {
}
}
testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives')
- testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
+ testImplementation "org.apache.logging.log4j:log4j-slf4j18-impl:${log4jVersion}"
}
final String MODULE_NAME = 'org.apache.poi.stress'
final Pattern MODULE_NOT_REGEX = ~'((poi|poi-scratchpad|poi-ooxml)[/\\\\][^/\\\\]+$|batik-script)'
final Pattern MODULE_REGEX = ~'\\.jar$'
-final List MODULE_COMPILE_PATH = sourceSets.test.compileClasspath.findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique()
-final List MODULE_RUNTIME_PATH = sourceSets.test.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique()
+final List MODULE_COMPILE_PATH = (sourceSets.test.compileClasspath + configurations.misc.files).findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique()
+final List MODULE_RUNTIME_PATH = (sourceSets.test.runtimeClasspath + configurations.misc.files).findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique()
final String OOXML_LITE_AGENT = "../build/dist/maven/poi-ooxml-lite-agent/poi-ooxml-lite-agent-${project.version}.jar"
final String OOXML_LITE_REPORT = '../build/ooxml-lite-report'
@@ -178,4 +182,4 @@ javadocJar.onlyIf { false }
sourcesJar.onlyIf { false }
-generateMetadataFileForPOIPublication.enabled = false \ No newline at end of file
+generateMetadataFileForPOIPublication.enabled = false
diff --git a/poi-integration/src/test/java9/module-info.class b/poi-integration/src/test/java9/module-info.class
index e5d258d7ee..91f8145f25 100644
--- a/poi-integration/src/test/java9/module-info.class
+++ b/poi-integration/src/test/java9/module-info.class
Binary files differ
diff --git a/poi-integration/src/test/java9/module-info.java b/poi-integration/src/test/java9/module-info.java
index 82eb9f6591..b5c8d064a0 100644
--- a/poi-integration/src/test/java9/module-info.java
+++ b/poi-integration/src/test/java9/module-info.java
@@ -24,7 +24,14 @@ module org.apache.poi.stress {
requires org.apache.commons.collections4;
requires org.apache.poi.examples;
- requires static org.apache.poi.scratchpad;
+ requires org.apache.poi.scratchpad;
+
+ requires org.apache.santuario.xmlsec;
+ requires org.bouncycastle.provider;
+ requires org.bouncycastle.pkix;
+ requires org.codehaus.stax2;
+
+
exports org.apache.poi.stress;