From 596db3117021cea11793fff2d3018e5e2907a2c9 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Sun, 12 Sep 2021 20:31:43 +0000 Subject: [PATCH] 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 --- build.gradle | 64 ++++- jenkins/create_jobs.groovy | 51 +--- maven/poi-examples.pom | 78 ------ maven/poi-excelant.pom | 78 ------ maven/poi-ooxml-full.pom | 70 ------ maven/poi-ooxml-lite.pom | 76 ------ maven/poi-ooxml.pom | 137 ----------- maven/poi-scratchpad.pom | 68 ------ maven/poi.pom | 91 ------- poi-examples/src/main/java9/module-info.class | Bin 979 -> 978 bytes poi-excelant/build.gradle | 2 +- poi-integration/build.gradle | 14 +- .../src/test/java9/module-info.class | Bin 492 -> 683 bytes .../src/test/java9/module-info.java | 9 +- poi-ooxml/build.gradle | 112 +++++++-- poi-ooxml/src/main/java9/module-info.class | Bin 3653 -> 3689 bytes poi-ooxml/src/main/java9/module-info.java | 13 +- poi-ooxml/src/test/java9/module-info.class | Bin 5040 -> 5076 bytes poi-ooxml/src/test/java9/module-info.java | 13 +- poi-scratchpad/build.gradle | 6 +- .../src/main/java9/module-info.class | Bin 2605 -> 2641 bytes .../src/main/java9/module-info.java | 1 + poi/build.gradle | 4 +- poi/src/main/java9/module-info.class | Bin 3421 -> 3420 bytes poi/src/test/java9/module-info.class | Bin 4135 -> 4144 bytes sonar/examples/pom.xml | 74 ------ sonar/excelant/pom.xml | 117 --------- sonar/integration-test/pom.xml | 126 ---------- sonar/main/pom.xml | 143 ----------- sonar/ooxml-full/pom.xml | 151 ------------ sonar/ooxml-full/xmlbeans.marker | 1 - sonar/ooxml/pom.xml | 216 ----------------- sonar/pom.xml | 227 ------------------ sonar/scratchpad/pom.xml | 112 --------- 34 files changed, 187 insertions(+), 1867 deletions(-) delete mode 100644 maven/poi-examples.pom delete mode 100644 maven/poi-excelant.pom delete mode 100644 maven/poi-ooxml-full.pom delete mode 100644 maven/poi-ooxml-lite.pom delete mode 100644 maven/poi-ooxml.pom delete mode 100644 maven/poi-scratchpad.pom delete mode 100644 maven/poi.pom delete mode 100644 sonar/examples/pom.xml delete mode 100644 sonar/excelant/pom.xml delete mode 100644 sonar/integration-test/pom.xml delete mode 100644 sonar/main/pom.xml delete mode 100644 sonar/ooxml-full/pom.xml delete mode 100644 sonar/ooxml-full/xmlbeans.marker delete mode 100644 sonar/ooxml/pom.xml delete mode 100644 sonar/pom.xml delete mode 100644 sonar/scratchpad/pom.xml diff --git a/build.gradle b/build.gradle index 8393a48950..7e59616989 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,13 @@ limitations under the License. ==================================================================== */ +import org.w3c.dom.Node +import org.w3c.dom.NodeList + +import javax.xml.xpath.XPath +import javax.xml.xpath.XPathConstants +import javax.xml.xpath.XPathFactory + buildscript { repositories { maven { url 'https://plugins.gradle.org/m2/' } @@ -124,6 +131,15 @@ subprojects { NO_SCRATCHPAD = (findProperty("scratchpad.ignore") == "true") } + configurations { + all { + resolutionStrategy { + force "commons-io:commons-io:${commonsIoVersion}" + force 'org.slf4j:slf4j-api:1.8.0-beta4' + } + } + } + tasks.withType(JavaCompile) { options.encoding = 'UTF-8' options.compilerArgs << '-Xlint:unchecked' @@ -191,8 +207,23 @@ subprojects { } jar { + from("../legal") { + include "NOTICE" + include "LICENSE" + } + + rename('^(NOTICE|LICENSE)', 'META-INF/$1') + manifest { - attributes 'Implementation-Title': 'Apache POI', 'Implementation-Version': project.version + attributes( + 'Specification-Title': 'Apache POI', + 'Specification-Version': project.version, + 'Specification-Vendor': 'The Apache Software Foundation', + 'Implementation-Title': 'Apache POI', + 'Implementation-Version': project.version, + 'Implementation-Vendor': 'org.apache.poi', + 'Implementation-Vendor-Id': 'The Apache Software Foundation' + ) } } @@ -384,6 +415,20 @@ subprojects { // adding ASF header before root node is ignored // doc.insertBefore(asl, doc.getDocumentElement()) r.insertBefore(asl, r.getFirstChild()) + + // Replace ooxml-full with ooxml-lite + XPath xpath = XPathFactory.newInstance().newXPath() + NodeList res = (NodeList)xpath.evaluate("//dependency/artifactId[text() = 'poi-ooxml-full']", doc, XPathConstants.NODESET) + for (int i=res.getLength()-1; i>=0; i--) { + res.item(i).setTextContent('poi-ooxml-lite') + } + + // remove duplicate entries + res = (NodeList)xpath.evaluate("//dependency[artifactId = ./preceding-sibling::dependency/artifactId]", doc, XPathConstants.NODESET) + for (int i=res.getLength()-1; i>=0; i--) { + Node n = res.item(i) + n.getParentNode().removeChild(n) + } } } } @@ -392,9 +437,14 @@ subprojects { generatePomFileForPOIPublication.destination = "../build/dist/maven/${project.archivesBaseName}/${project.archivesBaseName}-${project.version}.pom" + tasks.withType(GenerateModuleMetadata) { + enabled = false + } + signing { sign publishing.publications.POI } + signPOIPublication.dependsOn('generatePomFileForPOIPublication') spotbugs { ignoreFailures = true @@ -402,9 +452,9 @@ subprojects { } build { - // disabled until next release build - only works when you've configured the signing key in your - // user gradle.properties file - // dependsOn 'signPOIPublication' + if (project.hasProperty('signing.keyId')) { + dependsOn 'signPOIPublication' + } } } @@ -525,8 +575,8 @@ task replaceVersion() { var version = subprojects[0].version var tokens = [ - [ 'sonar', '**/pom.xml', '(packaging>\\n\\s*)[0-9.]+(?:-SNAPSHOT)?', "\\1${version}" ], - [ 'sonar', '**/pom.xml', '(poi-parent</artifactId>\\n\\s*)[0-9.]+(?:-SNAPSHOT)?', "\1${version}" ], +// [ 'sonar', '**/pom.xml', '(packaging>\\n\\s*)[0-9.]+(?:-SNAPSHOT)?', "\\1${version}" ], +// [ 'sonar', '**/pom.xml', '(poi-parent</artifactId>\\n\\s*)[0-9.]+(?:-SNAPSHOT)?', "\1${version}" ], [ 'osgi', 'pom.xml', '(packaging>\\n\\s*)[0-9.]+(?:-SNAPSHOT)?', "\\1${version}" ] // [ '.', 'build.gradle', ' version = \'[0-9.]+(?:-SNAPSHOT)?\'', " version = '${version}'" ] ] @@ -582,7 +632,7 @@ distributions { duplicatesStrategy = DuplicatesStrategy.EXCLUDE eachFile { - var root = "poi-bin-${version}/" + String root = "poi-bin-${version}/" if (name.startsWith('poi')) { path = root + name } else if (poiDep.contains(file)) { diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index b8f490e272..3099e250c0 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -65,11 +65,11 @@ def poijobs = [ ], [ name: 'POI-DSL-no-scratchpad', trigger: triggerSundays, noScratchpad: true, gradle: true ], - [ name: 'POI-DSL-SonarQube', jdk: '1.11', trigger: 'H 7 * * *', maven: true, sonar: true, skipcigame: true, - email: 'kiwiwings@apache.org', - // replaced by Gradle-based build now - disabled: true - ], +// [ name: 'POI-DSL-SonarQube', jdk: '1.11', trigger: 'H 7 * * *', maven: true, sonar: true, skipcigame: true, +// email: 'kiwiwings@apache.org', +// // replaced by Gradle-based build now +// disabled: true +// ], [ name: 'POI-DSL-SonarQube-Gradle', jdk: '1.11', trigger: 'H 7 * * *', gradle: true, sonar: true, skipcigame: true ], [ name: 'POI-DSL-Windows-1.8', trigger: 'H */12 * * *', windows: true, slaves: 'Windows', gradle: true @@ -339,46 +339,7 @@ poijobs.each { poijob -> def shellcmds = (poijob.windows ? shellCmdsWin : shellCmdsUnix).replace('POIJOBSHELL', poijob.shell ?: '') // Create steps and publishers depending on the type of Job that is selected - if(poijob.maven) { - steps { - shellEx(delegate, shellcmds, poijob) - maven { - goals('clean') - rootPOM('sonar/pom.xml') - localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) - mavenInstallation(defaultMaven) - } - maven { - if (poijob.sonar) { - goals('clean package sonar:sonar') - property('sonar.login', '${POI_SONAR_TOKEN}') - } else { - goals('package') - } - rootPOM('sonar/pom.xml') - mavenOpts('-Xmx2g') - mavenOpts('-Xms256m') - mavenOpts('-XX:-OmitStackTraceInFastThrow') - localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) - mavenInstallation(defaultMaven) - } - } - publishers { - if (!poijob.skipcigame) { - configure { project -> - project / publishers << 'hudson.plugins.cigame.GamePublisher' {} - } - } - if (!poijob.sonar) { - archiveJunit('sonar/*/target/surefire-reports/TEST-*.xml') { - testDataPublishers { - publishTestStabilityData() - } - } - } - mailer(email, false, false) - } - } else if (poijob.javadoc) { + if (poijob.javadoc) { steps { shellEx(delegate, shellcmds, poijob) ant { diff --git a/maven/poi-examples.pom b/maven/poi-examples.pom deleted file mode 100644 index 70bb701037..0000000000 --- a/maven/poi-examples.pom +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - 4.0.0 - org.apache.poi - poi-examples - @VERSION@ - jar - Apache POI - https://poi.apache.org/ - Apache POI Examples - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Apache Software Foundation - http://www.apache.org/ - - - - - org.apache.poi - poi - @VERSION@ - - - org.apache.poi - poi-scratchpad - @VERSION@ - - - org.apache.poi - poi-ooxml - @VERSION@ - - - diff --git a/maven/poi-excelant.pom b/maven/poi-excelant.pom deleted file mode 100644 index 7fcb5b8978..0000000000 --- a/maven/poi-excelant.pom +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - 4.0.0 - org.apache.poi - poi-excelant - @VERSION@ - jar - Apache POI - https://poi.apache.org/ - Apache POI Excel Ant Tasks - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Apache Software Foundation - http://www.apache.org/ - - - - - org.apache.poi - poi - @VERSION@ - - - org.apache.poi - poi-ooxml - @VERSION@ - - - org.apache.ant - ant - 1.10.9 - - - diff --git a/maven/poi-ooxml-full.pom b/maven/poi-ooxml-full.pom deleted file mode 100644 index e6795ea940..0000000000 --- a/maven/poi-ooxml-full.pom +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - 4.0.0 - org.apache.poi - poi-ooxml-full - @VERSION@ - jar - Apache POI - OOXML schemas (full) - XmlBeans generated from the Ecma supplied xsds (since POI 5.0.0, the 5th edition is used): - https://www.ecma-international.org/publications/standards/Ecma-376.htm - https://poi.apache.org/ - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - Apache Software Foundation - http://www.apache.org/ - - - - - org.apache.xmlbeans - xmlbeans - 5.0.1 - - - diff --git a/maven/poi-ooxml-lite.pom b/maven/poi-ooxml-lite.pom deleted file mode 100644 index 2d09069b9b..0000000000 --- a/maven/poi-ooxml-lite.pom +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - 4.0.0 - org.apache.poi - poi-ooxml-lite - @VERSION@ - jar - Apache POI - OOXML Schemas (lite) - https://poi.apache.org/ - Apache POI - Java API To Access Microsoft Format Files - - - - apache-releases-repo - apache releases repo - https://repository.apache.org/content/repositories/releases - - - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Apache Software Foundation - http://www.apache.org/ - - - - - org.apache.xmlbeans - xmlbeans - 5.0.1 - - - diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom deleted file mode 100644 index 769f7578aa..0000000000 --- a/maven/poi-ooxml.pom +++ /dev/null @@ -1,137 +0,0 @@ - - - - - 4.0.0 - org.apache.poi - poi-ooxml - @VERSION@ - jar - Apache POI - API based on OPC and OOXML schemas - https://poi.apache.org/ - Apache POI - Java API To Access Microsoft Format Files - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Apache Software Foundation - http://www.apache.org/ - - - - - org.apache.poi - poi - @VERSION@ - - - org.apache.poi - poi-ooxml-lite - @VERSION@ - - - org.apache.commons - commons-compress - 1.21 - - - commons-io - commons-io - 2.11.0 - - - com.github.virtuald - curvesapi - 1.06 - - - org.bouncycastle - bcpkix-jdk15on - 1.69 - - - org.bouncycastle - bcprov-jdk15on - 1.69 - - - org.bouncycastle - bcutil-jdk15on - 1.69 - - - org.apache.santuario - xmlsec - 2.2.2 - - - org.apache.xmlgraphics - batik-svggen - 1.14 - - - org.apache.xmlgraphics - batik-bridge - 1.14 - - - org.apache.xmlgraphics - batik-script - - - - - org.apache.xmlgraphics - batik-codec - 1.14 - - - de.rototor.pdfbox - graphics2d - 0.31 - - - commons-logging - commons-logging - - - - - diff --git a/maven/poi-scratchpad.pom b/maven/poi-scratchpad.pom deleted file mode 100644 index 0a155edf03..0000000000 --- a/maven/poi-scratchpad.pom +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - 4.0.0 - org.apache.poi - poi-scratchpad - @VERSION@ - jar - Apache POI - https://poi.apache.org/ - Apache POI - Java API To Access Microsoft Format Files - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Apache Software Foundation - http://www.apache.org/ - - - - - org.apache.poi - poi - @VERSION@ - - - diff --git a/maven/poi.pom b/maven/poi.pom deleted file mode 100644 index 44a32abea9..0000000000 --- a/maven/poi.pom +++ /dev/null @@ -1,91 +0,0 @@ - - - - - 4.0.0 - org.apache.poi - poi - @VERSION@ - jar - Apache POI - https://poi.apache.org/ - Apache POI - Java API To Access Microsoft Format Files - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Apache Software Foundation - http://www.apache.org/ - - - - - org.apache.logging.log4j - log4j-api - 2.14.0 - - - commons-codec - commons-codec - 1.15 - - - org.apache.commons - commons-collections4 - 4.4 - - - org.apache.commons - commons-math3 - 3.6.1 - - - commons-io - commons-io - 2.11.0 - - - com.zaxxer - SparseBitSet - 1.2 - - - - diff --git a/poi-examples/src/main/java9/module-info.class b/poi-examples/src/main/java9/module-info.class index 9b2245bc12d54284dbb44e739e349615e8ed867e..274689a12ceb9569e6a4e6019d7a9d17807911c5 100644 GIT binary patch literal 978 zcmaiz%T9wp6o&s(wc2{Cg4X-}UIjI}cjeBNPcY)tVxSNPwC-H`OfGx?AIf+h;f6w-Lw*NER53;8;ci|G2`YEl{G+oTv3=^?2XEkCr z76^^LQ;cc)`a!qz!sv{X)O_+K!j83}%U!XJe@uD&8eyT|ZpOISAZ+xn`^_Yai%7ZH zBCJ}xR{j+KeGf>4S*7$uK7tBe%tEgd$SHKa@2{{3pD0jPd$L@A4>|1DBI3OGnjtIwu6T&H>MK~jz6D|msgf`)da80lY4xuAZooFJk z6~<4tjHKIFb`*NH%487vN((If3}8P(3t z>DtIUN1J4i@^^>3Ub4N%MuSm`~w%lB@f91k%oy1B8-r%VqKsHVU zn45HF0(Ab2BS4tnWqg%TGMf@+Fl*K~%yD@Z^CO^)3J%Qu0&~&q%BZ1gR$z&_%v@ov aGHc8=<~q}25_5yO$=qUYGwaL-lkp8NFAWm_ diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle index cda39d2910..2876eb965c 100644 --- a/poi-excelant/build.gradle +++ b/poi-excelant/build.gradle @@ -46,7 +46,7 @@ dependencies { exclude group: 'org.apache.poi', module: 'poi-scratchpad' } testImplementation 'com.google.guava:guava:30.1.1-jre' - 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.excelant' 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 e5d258d7ee61ab6f1b19d787ec22def8cf10d85f..91f8145f2568953996eaf503dff8fcbd9258c904 100644 GIT binary patch literal 683 zcmZ8f+j7$|5Ist1LemD?s--ue1m@%@$J`NToZPh|glovBPlOO0jM>GsR4hoh*np z7DOCzJYFj=s=`FEs7e#Hr#gmV^GbZJmG;+4_bH|HGN<|n41+>PFM*n zyi&S4%FJ)d@O$DDZoctFI z%FC$crOY_a8O~baAd6T@Z=6`>HfY81Vx2#ARiRc&hG=P`-rbr^dyZG@f!q(@m?g(+ zhW%PvxlGSx6=(-?IcC_Hi17j5HHpJ!M?-3Q_-{ua7*6ZNW`d=a@!I*EbkgPT07kz^ z^K`I5hYlWKldMHIeIDT99ni-%c>_Em+{Io(PI!nXgnb+n0;dU|CVZaoBH_z~mxOPq N-rM9gmf?Nv{RJQ`rzHRY literal 492 zcmY*WTT;R>6g@$CgQ5XJe6Ruobzt0qfBNGJLK|vo+jQF0kw4buhYN5~j<*G8YG!io z$$gxA@8tXE^9#TVvnDu0=f&iys~&Zz7zUB?@=)FBcwazf+#I`#$GWpF4D@>p9Dxd0U2F z*~wGcn>7i;tkTRiQDovwxF!shYc=sD!?==BjI2Inl!S_;i)H5fW#$x_|1C2uD)!SP zp|l&5MxMywOLXf1 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; diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index 55ba4d6b25..f8ac5a93ae 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -18,12 +18,20 @@ import java.util.regex.Pattern configurations { - all { + runtimeClasspath { exclude group: 'xalan', module: 'xalan' if (JavaVersion.current() != JavaVersion.VERSION_1_8) { exclude group: 'xml-apis', module: 'xml-apis' } } + + compileClasspath { + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } + broken tests javadocs @@ -42,27 +50,80 @@ sourceSets { } } +java { + registerFeature('signing') { + usingSourceSet(sourceSets.main) + } + registerFeature('render') { + usingSourceSet(sourceSets.main) + } + registerFeature('rendersign') { + usingSourceSet(sourceSets.main) + } +} + dependencies { api project(':poi') api project(':poi-ooxml-full') api project(path: ':poi-ooxml-full', configuration: 'archives') - - implementation 'org.apache.commons:commons-collections4:4.4' + api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" api "org.apache.commons:commons-compress:${commonsCompressVersion}" api "commons-io:commons-io:${commonsIoVersion}" - api 'org.apache.santuario:xmlsec:2.2.2' - api "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}" - api "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}" api 'com.github.virtuald:curvesapi:1.06' - implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" + api "org.apache.logging.log4j:log4j-api:${log4jVersion}" + api 'org.apache.commons:commons-collections4:4.4' + + signingImplementation 'org.apache.santuario:xmlsec:2.2.2' + signingImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}" + signingImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}" + + rendersignImplementation 'org.apache.santuario:xmlsec:2.2.2' + rendersignImplementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}" + rendersignImplementation "org.bouncycastle:bcutil-jdk15on:${bouncyCastleVersion}" + + renderImplementation 'de.rototor.pdfbox:graphics2d:0.32' + renderImplementation "org.apache.xmlgraphics:batik-svggen:${batikVersion}" + renderImplementation("org.apache.xmlgraphics:batik-svgrasterizer:${batikVersion}") { + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } + renderImplementation("org.apache.xmlgraphics:batik-codec:${batikVersion}") { + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } + renderImplementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") { + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } - implementation "org.apache.xmlgraphics:batik-svggen:${batikVersion}" - implementation "org.apache.xmlgraphics:batik-bridge:${batikVersion}" - implementation "org.apache.xmlgraphics:batik-codec:${batikVersion}" - implementation "org.apache.xmlgraphics:batik-svgrasterizer:${batikVersion}" + rendersignImplementation 'de.rototor.pdfbox:graphics2d:0.32' + rendersignImplementation "org.apache.xmlgraphics:batik-svggen:${batikVersion}" + rendersignImplementation("org.apache.xmlgraphics:batik-svgrasterizer:${batikVersion}") { + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } + rendersignImplementation("org.apache.xmlgraphics:batik-codec:${batikVersion}") { + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } + rendersignImplementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") { + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } - api 'de.rototor.pdfbox:graphics2d:0.32' if (!NO_SCRATCHPAD) { testImplementation project(':poi-scratchpad') @@ -78,10 +139,15 @@ dependencies { // prevent slf4j warnings coming from xmlsec -> slf4j-api 1.7.32 dependency // see https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/ - testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}" + testImplementation "org.apache.logging.log4j:log4j-slf4j18-impl:${log4jVersion}" - broken "org.apache.xmlgraphics:batik-script:${batikVersion}" + broken("org.apache.xmlgraphics:batik-script:${batikVersion}"){ + exclude group: 'xalan', module: 'xalan' + if (JavaVersion.current() != JavaVersion.VERSION_1_8) { + exclude group: 'xml-apis', module: 'xml-apis' + } + } javadocs project(':poi') javadocs project(':poi-scratchpad') @@ -245,19 +311,13 @@ publishing { pom { name = 'Apache POI - API based on OPC and OOXML schemas' description = 'Apache POI - Java API To Access Microsoft Format Files' - - withXml { - // Update dependencies with resolved versions - def hasDependencies = !asNode().dependencies.isEmpty() - if (hasDependencies) { - asNode().dependencies.first().each { - String artifactId = it.get("artifactId").first().value().first() - String modifiedName = artifactId.equals("poi-ooxml-full") ? "poi-ooxml-lite" : artifactId - it.get("artifactId").first().value = modifiedName - } - } - } } + suppressPomMetadataWarningsFor('renderApiElements') + suppressPomMetadataWarningsFor('renderRuntimeElements') + suppressPomMetadataWarningsFor('signingApiElements') + suppressPomMetadataWarningsFor('signingRuntimeElements') + suppressPomMetadataWarningsFor('rendersignApiElements') + suppressPomMetadataWarningsFor('rendersignRuntimeElements') } } } diff --git a/poi-ooxml/src/main/java9/module-info.class b/poi-ooxml/src/main/java9/module-info.class index 6ca2bc5ba02e61c3c1cae977f47eba671521f223..6e355946d831ce4876d2fafb5c8470b24705e9a4 100644 GIT binary patch literal 3689 zcma)zw5QnP)Sy^rp?n}7@goIrN#T!u;Q4nMl*4v(>CzIVI9h1!LEM9ou_kG{@ zeJd*7`ksH3&q`%BlSyU;c<-B}`&U)n)m2IMpMQ@W1%NH^cMnWpFx8c2-4PpYuPPbz zmSsIK#DMJx2D36#+7NGW29x)YT7e!0sthcR``oAr&6l<&Wz%&On8IL6EY>PKL?@H` zO4=r^Ux8^1=Hx8UN`V;+l*~B#s0i+b3d~}#Br}nQ&_aypa#YM=usowMr0YsA)C}o3 z!ia3VE-9cgSkP5u3PXW;3>J5tb^Snu7-Ip0xm^UdRA3Q<>0>cn9@RE0u!O<1vd@E1 zY`3Gbh!j}X8QzhWWqX!}zoj9}PQQlv=~LijG^DJx1PZJi8!<&V97$h+)tEujguol%kJCiDKL<(fzAuJd{H_Q8iDPj&BYAnCGo-<4}_^n$u zgQe(DPug3@-qV{SepScB2HZd+6)NLM>Y)hm!66(K%%sE$URu-DE*?y)BS?+Gviv#{ zi6MOIa22qP3TurunT0qER(ErgN_1?A*qsU<1MRq^x+SD5qF_`7pTWvw*wnZ$R0xjk zJQiY_+uMs6%GRIFvlXv$pgISK;QO9nI*bXsB>& z@l2B0OmQ48o_wN->sp07x*eI>ab$NfSW(z^R-#83PlbEB<-S8_VC$mrzM@e2!oxI{ zhB^}dK=R({$V)1ezM;ZH#d2!9LWOR7*ytX|oj$^#FSm{EQr*S3Mvdc}D+pD1jKSvP zGplP0shC8H zmP+)RaD2+fD-71=vXPTwDF`o&-}oxL#$Zu5b;b60+^ugEYm>aSo=R_xv-B_u1b6Y> zt-?FS{z%qC#r3)`c6J<{qpWf9_ zrw;?&3~k)N7Yx?qQj{0zRc?p~)A>~~`2{T=e8V;bs=xXF@R4x+9{7&I`ds+**`eE^0fL@piC*l2c;!NUfnpcQ(iSvmIiHnI#k;_Tl3oG!t7giD15ZA&s{9RAnK-7?% zppULM6SojgC!Rq(i+B$4JmUGp3y3?2JBho9mk{?5_YyB7mWfvo4-&5=UQN7~xB;%m z6#{UgK@>!bXcLEtE>RM1B!xQsxjE)~$Q{%>35VJAefCz*{?Wd3(iKE z`ESCDV%v)&3zi{do5_g76|J!1bM2L_(3yxWIJXs6>l}_CG&^w@^e^=+IIq=2V26atsXR_fa|cuHoVkzoq~_rR z+)p1qNPnjKwCxDp^jB(5)(^@G9!{F)h&HA>@KN&9L)zmAgUwWqj;1^DN%|$-t38Ea z(MZPPqQo1Vc>JY2ORF;T@cAT7yE0k6loyk_BN@e^rM-;M*9?qKzDvi8T;GcnyozvA zGLb8}o*iygFoiHDNn~pL+4i2G@uu^hjoKa74n zNIm8densod0qtvqfuuC;Hs|8Ebi|yGN9cERO|}3j{+$BMr*?ygPleiGp%kvg- zqgWCv;;1+#-X@NVo*0Os7>jjrLcBw~3*`LwNN}%szqn0&NZcVlB0eTQA?_5P7M~HH z6JHQt5?>Kt6L*Qb#W%&b0oL+hj|A_DABcO!kHt?!grph%yJR)k$D_~T3-$mUVh_VN H?05eFTe3B; diff --git a/poi-ooxml/src/main/java9/module-info.java b/poi-ooxml/src/main/java9/module-info.java index 151948597d..a81eba5604 100644 --- a/poi-ooxml/src/main/java9/module-info.java +++ b/poi-ooxml/src/main/java9/module-info.java @@ -86,9 +86,10 @@ module org.apache.poi.ooxml { /* optional dependencies for xml signatures - you need to add a require entry to your module-info * or add them via the --add-modules JVM argument */ requires java.xml.crypto; - requires org.apache.santuario.xmlsec; - requires org.bouncycastle.provider; - requires org.bouncycastle.pkix; + requires static org.apache.santuario.xmlsec; + requires static org.bouncycastle.provider; + requires static org.bouncycastle.pkix; + requires static org.codehaus.stax2; /* optional dependencies for slideshow rendering via PPTX2PNG */ requires static batik.anim; @@ -112,7 +113,7 @@ module org.apache.poi.ooxml { requires static batik.xml; requires static xmlgraphics.commons; - requires org.apache.pdfbox; - requires org.apache.fontbox; - requires de.rototor.pdfbox.graphics2d; + requires static org.apache.pdfbox; + requires static org.apache.fontbox; + requires static de.rototor.pdfbox.graphics2d; } \ No newline at end of file diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class index a6a4e2ae74690f4a403c4134bb4e32361dde61bb..d5e072f647d1dad105c852a83d40017a43a2669c 100644 GIT binary patch literal 5076 zcmd5<_n+Lv6@O#E2gVdzq8A%%Otr+F&w+$u>VXp*9F~AXfJ7_JYIUcT6iK^x=L9gl zqz6c$x6nfk5IRXnqa~0)dV?gC^!x#Qc<*UetCjXJKVpAA-|vp*&CDy`Dfi6Vk30bY z%i;e+FiXJZtFajRnqn7x{1(DL^ZH$2scK3K9*r7O-=n zBVWQuaK)B|7V`xxC|KBGs}%-`VTZmi?bO5HqZ;S}wjXHZNLzz#1#HnB*Rs;)G7YvD zFt-+2aUzfK(wa;)*s*^KKXhF$a1G?qag1=pz!--$*aZi2G->OeWGW(qK2t z0^20gZpU6aZH&7KhO$V&R{R~~H|%&iN<$6y5U^9h^~4I&wiSD!fkrr9gFOZ8KnC@& z9oW;hm83q_A`UyABV!Hr7O+jVd%~O2U|&@YJ9K2zY9~gLT2mteHX5Z`8K{K1m3k9~ z6?iQT_7||FYEPy{JN2;6XgoLjR*yZ$l^TqqnzAo6E4udq466Gfzy*R7BRvrHp*~XJ zAIh6fh$|hOH{}#&{?NSXcCdL^?w2=wV4%Sfxer_~4Ed=1OJc`fgk#18Y@4l@G_6=V zMl2H+IWB%IR$ujXT!S6>aBqT+>q=Z?6$&&riZRDB_SR8)kHamJb)+#WmV(BwYjPj6 zJe`n-z}w?QoDF}tu@yBvo5aeZ)!-xn^9sd|oJKvwLapuJHjOYy`THrjI~-}mVT%7_ zBQrO;(~dYAoT{on-VVIf7;i@&dX5{`6R^p0;{dAjCzY`KO)!^M3$ug!eIB}JxMAp` zt};(`um$Xbj+)ulH*sH@Q`%&7@nIMRlW-l^Gnj zZ;=TByO#aPOl%qP?$@C;!!!j)@YLI5&@{P;iCc}P)8W$sjQ3<}x-x9ZG@jNW5wK_j zW13bZb!cyRax%m;_rjYLu-%}^QD8buXT|NyFy)72sl#Vx=q1l}I3qjWi(~nC*Ws+{ zIPNhW+0o(bYE81|P1GXkwle%6*@mjYk3+ zey(a5Ml!%Oj*j;w{0rHg)R&jsFpO*+zEqV{Zz{Afy#TjiU||WqB4D@_#$Z#kg||`D z!dop)bhuQ&viCNu9rO*nyqekGdRg+no?XVp_@8~766*lQeytjJQ zyLyJH3MSW9lgO*(CT3Im5ohCi0eh9QQ8Gm-$RMHDfDShb*m00`-3u(*t>3C@lV?+> z(k(N%o}{s~TKFc=;kN4j$o%15cgLV!zhOGDHL1h52ThN?dDuGKJ;*^cQ4Zca!~9uw z@6X;##p>ee-AGJ+aF|ZwVE_*ZSW-$+*~n~IwoEad4^@+2vBko7JX@mm!|%R)DqE2b zk5*5R{OmCKoY3I$tcrN2(aje5R@w;TR`)8^;Yk5|mO|(Wo%SGJWs&b$fsN=Hf`V1;b#IC&$J#*ghr<9&q#1`m3tS zsiT{)-wZmXd_1LoH^ThPy(VoGNT-xnx{zYOpI-#|m~nt**u z)8~tuM|WRHYt$2c2>vEudC9(XVVY}>U%7Vms(kDizp#Uk@PgZ{Fli=FcqZd|#&a0Y zW4wUzBF0M?KhO9@#xFB|mGLshuQ7gu@e0PP7_VWxj`0S@n;36qyp{2G#yc7BV!Vg( zKF04bKFIi8#zznZJO)oFeoFE86+f-`M~Z)<_!-5|DSkom&lSI<_?L=bQT%Jgzg7Hu z#eY=%XT>Xkax@E7`WU=leIyN0?np(%q$6Td5;19s*jG$?qBbdtm^4L9sv;&`5tFir z*C{4-QJeHdyk0SBjN0cZCY@26ltxTiBPN{@lhTMuYs92BV$vHiDUSFG#iTlFlkSMG zQ%u^U_DzaOf7B)g5|ajrNrl9uLt;`QF=>&Q)JRNvBql`?<6#A_;;+BL-x1${w-Emc I|3>`pJ2BXyD*ylh literal 5040 zcmd5<`Jd!O6@RtB4lFkb_qE)xvI#RgD>us_0}H#b&>Rb>kWN>pGm}n*B;7NE0;_V$ z;lYh^qnrvVx4H@nD&E|O3Lba>%74Iz_g<7-|uAKm?YzTZyjRn zfqV-q!5!NUT5KU;=YoZ++HDmkmaBq5x~Y%9M-4CqY%|cPAzcHu60mV^UfW4qiwxLC zz(%#mi4%FGpVnk*z;^vh1j_UL(6f+7$1%bY3u7EMU`L$Dk!u43cJ94t$Ydf_kpa74 z7T6|{ZYTEBX=~g|FqGW{Y|8I3e#?!gqf{BNhk)%1t|v~IcAVH(78>Dv1NIWIEg95R zCv>M>CrJaWMXb7hL&gT|BVfzw@Pt2Qz$dWQbtm;FEGP8a1}qe?iGH3;txoD=C2jOR zdsmPBh9?aeM!jTjT*c{Igl_jv|SDaLmjC zUC)!a$x@VHZWLn{W$d3v2|ON~AR94}lxtBwP)Dc(D_;e3#_N zvNWJ3VDmybqeio?uoS2EH%3#1DZf7*_1}Tl-VjeOgPm-vo2%v@tuMMUT)u%TvljtmVPo>Xm_#?vN50(M)=oR$+w6XLZmPKKD~neb8pTMt?s z1!h7wD{fzgId*Jc6Q*VvCC^PbFFU}CbNK)_;q%pbJYqLw*MtkIHOWQ`;#gI!d}c%a zV!{^(m8{WMvWo=lS_!*oVyC#D36~7YeV?6+M*z0YVs?#Sop5*O0<4#&D*E49hvY%^#sY!4x7&j1D?vNh<6&@Y*FB( zO%=C$SE&g<60lb(gc+ez58_o81-=uycOo8O875LH2w##eFuNz%k)B0(PHmKUxTlY}us~ z>URS6S({}OKQ8rc`-e3IQqb@V1Jc!tHxuehRh82~FJZ3?I;8?UrCyt*fpP_z@CJSk zmO|qG^py#JswSp%mhgRna`?*t5AYjk2;LU3ptO9xxqWo+3u%S^2p@vK30PdRFI|}S ziW8TvT)r%yJI3Ew(?jqN0sEGwVy*K$+o!8|qOR1$%x3?rUO1)rR@Q1`y?OaY{}!;Y zyirits21QK6t$L`oZ0DJ0VAa;Q%Uh8vsc!ZjpY;bt=_Lz06U3JM|)}8@#M)e#E)zl z55fPc(&Qc3wszVvedenG1pZZ<{hI^p;Ey@5F02Qz?rNCJuNT1js{rP~hAzKj;*evBiGql}+qJb>{a z#zPnnV?3PkNXAbwjxip~cpT$0#uFG}uVB22@hgm9W4wm(I>s9q zZ({rg<1LK0G2X#=7vr}W?_s=;@d3u~Fh0ciJ;om}KFatwqJSsihnjz^`6rs6*8DTg z&uadK=3i<4wdUVy{=McuYJO4k%bH)+{JQ2hHUC-j5}+K-L47_6|F1rhhA4NWB4W}J zF)4|dv_$M{COy$JDT5Q0^Mod~GCbbch-iS$Y#5ZUr)zLHQj+m53OxhzR^%0Z)h)IFOq(Nd*Au;KYn3PCN jS|lbl5|bW@Ns+{OOu<|D>#y*4#CPCdi2s525dZrTAeNIp diff --git a/poi-ooxml/src/test/java9/module-info.java b/poi-ooxml/src/test/java9/module-info.java index 152cab9e5c..4d7612ba00 100644 --- a/poi-ooxml/src/test/java9/module-info.java +++ b/poi-ooxml/src/test/java9/module-info.java @@ -84,9 +84,10 @@ module org.apache.poi.ooxml { /* optional dependencies for xml signatures - you need to add a require entry your module-info * or add them via the --add-modules JVM argument */ requires java.xml.crypto; - requires org.apache.santuario.xmlsec; - requires org.bouncycastle.provider; - requires org.bouncycastle.pkix; + requires static org.apache.santuario.xmlsec; + requires static org.bouncycastle.provider; + requires static org.bouncycastle.pkix; + requires static org.codehaus.stax2; /* optional dependencies for slideshow rendering via PPTX2PNG */ @@ -111,9 +112,9 @@ module org.apache.poi.ooxml { requires static batik.xml; requires static xmlgraphics.commons; - requires org.apache.pdfbox; - requires org.apache.fontbox; - requires de.rototor.pdfbox.graphics2d; + requires static org.apache.pdfbox; + requires static org.apache.fontbox; + requires static de.rototor.pdfbox.graphics2d; // test specific exports diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle index 400884c8f5..078bb7e5bc 100644 --- a/poi-scratchpad/build.gradle +++ b/poi-scratchpad/build.gradle @@ -38,9 +38,9 @@ sourceSets { dependencies { api project(':poi') api project(path:':poi', configuration: 'archives') - implementation "commons-codec:commons-codec:${commonsCodecVersion}" - implementation "org.apache.commons:commons-math3:${commonsMathVersion}" - implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" + api "org.apache.logging.log4j:log4j-api:${log4jVersion}" + api "org.apache.commons:commons-math3:${commonsMathVersion}" + api "commons-codec:commons-codec:${commonsCodecVersion}" testImplementation project(path: ':poi', configuration: 'tests') testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" diff --git a/poi-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class index ffe0e5c1fca669a6d49f1867b220e071271da3fc..53efc695f7baf77bb61cfbc0809422ff9175a6a0 100644 GIT binary patch delta 714 zcmZuvOKTHR6h3F>&Lfjp0=dn@<{f-gi9=fyifAb!A|fJErKm_UnWn)`CY?;$s`V}E zPQqCUBKQNuiaQr>1sAn$TnPRI5$RG0-kAn*;pT9^^Z3qp&bhDo7jAqSy#D|Ihv8}8 z_!hTZ$8p=;LzdgHtpp_dU-x2$ekloxqmmy(NV#6qtaWPEqHT8EmbvKI3ueP!;gF*# zEMtK#3R?hsu9yL|~_85B1f=NC3OOXV;uAhkdjq2*zm}OL&k*r3zMQS}LF! zP)1fef^tGo(uTyvjrk~PS%wF@on&rD5hiTf9Qe?o$w_FZ02!)|z7tYeUT)-3bLeAkyLBMHK9>G)eT`uG4K#SU`3oU0T z!?Jjmj<7PGqj{ER=Mjo@g=GwL*{ZjEG13Kk$+Bz?VK=>EJm%S!>oquBLa{SclEz=5 z^E6-;b~*5iMEb2oWDZwpLrEF+rB;W-wLrfJMICXUB@Q)&{bA~JC5e_u%%M%2N*S9% zVVbpqMRimj2^V!e;1!6Dt5N3cfPb31iB$#D|pC$El}tdL!#p(>Z&Ba6s^; xsjpWfKB(d!0%-J6uS5Vw#XAKP@3!?47S_U0U}U%n2G4IE0@>ks2___WL0LI|q zQ|mJ+=!|C&(tc2NE3Jw*C)}1_bLSdjmO~#x=06wij9B2XgQjqhPN739*u@G`gF2X2 zITYzNW?2a(qJ!KD+kvPwLJm76Ax&S9b&JJzQ1RM+z+s3|N|6mC=b4i8H zp%+X4(rgrD>kd|Fm!8F1+&!n;cqOi$>$O+LqWXu!Q_G)0CK$4vDR)&zWat>Zio^G$VPD*^G2Zsn@Q=PJx~0 z+U%|$D47-CizA6k(~4y6*>*+Z@-*!1bA2ifl@oL zMxzsI%MYoN*A)boIG2h227$FjX1m_qB(SbX+}q*id|hkF4yoK!)oQ4#D%MojTShq3 zRkbLYhXuBb-p#aXDvTv=6WBUVi(69SX#QMgU9;%4N!)QBTVW@NeTie^!wj63AIECe z)e?7)2s2a4dq!C6tC%(I20EmqmGg(5gJ{MMb=7?W>xVKy-CBwIy?HWUzOF(Nn8btm zglFVbKAN8r4-4!l-X^hP&N`k7JE1i#@#uI>i_@tB8YqtoY#(DYij`-pZ82z96Cyk{P{@t z2tuD~9(N?@{@PHOn}|l8s!~Os6j(K+5xJ%vsi*G{cv@ijuy2%=XA9Ov*-3OdpSCEXOCh9-P~!Rgoa#!Ou9A2$pVfibRB<5j za(>WeRA?L|XO4DyHGkkTdb*{k@m|k&@Q_a8cs;pI-yFMbrRniogT&kUhRB%g=}{uz z9UE#8S0&ybtI|wv(+>;FktyTHh5qyv1|#azg0mQz>45q?-%u1(A~P+zT-(a6OMIEX zThrBF=Y4DkgBOMgd?T=H=&1FNv3a=na&SEKTaK;634AB8dq_WVr}vs-o}`-1`hI<| z;s=2}!zxz&wae^a*TXZe#9XUc$VLxr@1*Sz_*G?qg0f zuVh}$yq0-A^G4=D<{{>-%o*kp=IzWonRhXdGfyz@W!}$xfcX&f5$0peCz!KLn^|Gj zm~%{*=`jOl$c&jS<|*b=%x9R-G0!kxV7|nBh4~uu4dz?ScbM-nKVW{u{Dk=#^9$xz cOi(?~;#+)=AE~})sop=+FM(g_x4`fJ16u~-=>Px# literal 3421 zcmai$_mAg`xBJCy{dI^Cn2@nV|5ISh3Yg=ns5|V6ZsY~y@_uhE| z{@?+45FUfWXxy~d%4W~m&-R_UqbYah>YxAq`WwI@{8_^N1{PPsR_v%r&sPRkHbb}N ztNmV34b5r0Z5vp4LYB&Spo|9%l*Y%+F>`#ZjEBm2xQs{2c(jbi%E(j?nBx;Bi>AtO z%5VvaP$kp|b%IBjCNu~>p-Bh`At53>PKXH!Atkg3Z9<1|hA=~Tg775aDZ>X%1J%`K4D;ep@yp*18WLIUT9!h z-%`^~>jw=itweU5s3TrlQR!TZepst{LCxgPiD}jp*LsWnpRP(8X&4z;G3_?YR*Bc#_ZnY8>bHbEwU{B%Bp@vlrgEZ-;G;hgutKE?D zi|R}o+fEwB2FjY%6&6mP?6UT)6|~I24P`P zxiS^n8OW`=@*@>7HUoqNjT*1D<@iVYWcZNeB*^%U*q?aa1cpAriyBN?XNKe%A z`O4RmHk4U*%J+#r^Kx=-+U)4?1N3u~Q&Mfa;Ns8}GEW=XT{X|ss;xlo+tIU}GuBrs zm})t#D6P#Kcq_ZE3bLK6kKRvgeIOkUkC7wAS~5DaSBm^p$+ok=a`^V@*nVU5@+uxV zooM)21A8^AgL7yd?ccR0%4Fa7!5%#=eOLHh zt7%7b9GV3TezorYEx-c)vH<7dd|v(+7s&ErESv>OxKMsA>aArTOXT}f;WFlOtYDU~ zQn*TZ7_0dcC<{rrMz~hEPPksULAX)4Nw`_KMYvVCO}JgSL%378OSoIOM|hF&V&Nsi zOND!dmkIX?_X|y-B^(ou3l9hn3MYhzgqI7i5MC*~N_e&K8sW9V>x9<}Zx9|9-Y7gG zyh(Vo@ThQ7c#H6u@VM|+;cdd(g(rk}2=5f06y7BSSMwAqxEuFyWlwRv@8w?xPV;XA G_x%qv>f$5- diff --git a/poi/src/test/java9/module-info.class b/poi/src/test/java9/module-info.class index fabf8f27eda563fa84f9f568220345986b015bfb..fd6f5c8758a8e460c1e5c0a04ff7f3abd595dfc7 100644 GIT binary patch literal 4144 zcmai1X`9qU5UxgGvnd~Gp?8CnAcDlN{y5H*R=HLJR{s#bd!(T%%O~9O*XVo3G-FC-4 z0kex=ks^2h{+vs1%>h6}I^2XdH+K>=2@zgQ})MxI}QRRR`F zSXHg=hIQZff=F2fSc5^hD$+`=NR{fA)eByB^3We-L)e`-;Pv(TVxBE zv0K|i`>-*IZ>k9{!Kj52HVc@K4)l0eb=*-27sXCf-}HDFBwQSCYPL(Shblnzlq2C1 z0h_1#OvZPO^l{IPaQf}BsA+$eH7-GqgHC@}$D_b7BQKCJETGUcLB$Vo*e(HUays1@A**YJW{CTBqg)PD*@zVC zdazG0iK&U3d6R&3{b$q7iV;K-4hdL4$cj(3gj=(DnGVgwY?E-?IeY~zKk_6L2QSmN z8(tI{B}YlPqt7x^QXcK&tz)8Bl;f)aH|_3h((@wfk&UP7UID9mb^=f9c-T3c_h;ox z3}|5z9?WidsvqUU5-b5r?xy@{$ctXGT_b1(=71{a49?0F!12Ll0CsaHWYYOVg9~0aN6;@ z%MT9;Z)6Wd%4ORQH}b84OZB6&gm(s-)af>TFISF~j34C2(=q6lsE=}TG1TJ%^-1-g-m@vZh%T>X-lknb1~WfMO4 z_}M4nn{4$<-w<5Yhu~WQTYK`kb5`{I?H9=5z-!o+3Wnf&0o!`)Y0d4okbV>sqvUzj z?uZ`+Z0{Z6q(&4S^jxfX&F+w&vo)=K$PdyvJ)&F;hQj$Z>%1HOA;We%OBmy)RBH%+ z7ckrtPkiZg)^MO$9BZ$mGwjdoMzv$YhjGpDr$jahAn<3dXA#uVLKFILf$>ag6Z*!+Y{+T zZBmMuv?3<8h)FMEQjC~1Bi@_vXu|svChe&IK*FRSwMju@(vX-`ByO*S^rSW^N=%v( zld8m|D={fcOxhA3OSqJfS1pJ0=0e}1t2iao) literal 4135 zcmai0XLsC06uk-|O9>%lA2pb@Q~nP z!Ct{5f=3092_6?bA$U^ol;CN>GlFLY&k3FvydZc{@RHzV!7GAS1+NKS7rY^OQ}CAH zZNWQ&cLnbW-WPlz_)zeX;A6ojf=>mX2|gEmA^1}8mEdc^H-c{k-wD1K{7}V@f}bk* zxq@FR__c!HD)_yEKPvds!Qr{sIan4Y&6*c`^>M!zM*;sG9LkW^M!i%+y((u=kJ{}h zOl$S1)$;3EpudM599L@5@aqna=+9_-+4$KG7LUYUlKNYMY{bv@o!N?-%^+;nl!qtO z(p>0u_L~hqoy?-x!I2Y<$yz5&J8>K(ncvVag??5Woyq*sPNOm7;AlEE(Fuc0F%B|6 z(Ov4+%-MbW)g`Z;I#{Ap+-@jb3j^24b-3NlbVD-O?{-o@(b)Pe2kT2`&RMu)QJCo` z8U6f9jfQ3@UCej-d$PoODjlEpTdm13nhr}=O}Xl^#Z|S} zZTM3TR+f$UQ+}BBw!e122Dup34s7H$I_>sM;@6`@B_7xY9m;L<__76i9-UA&)?c`& z);JgL4!T~mnfOgF^Hr@<2YPmOjo9k_f5feidx>WJn)yuZbPc9g-krMU%>hlFsU9hfvb z4ea!kJ7ULYOgEIyq?z9y%!2L;d5iL}w!L~1mFUr(9|oElMajEEaT2MLnbyt|OJk5~ z1@fAjF~<~!)0W#vyy-!mdjoFMk90#tcXc#(c#G9WM}xL~u4LY9`Z+kN=!|ZCU`Cq% zQc;>T)oPsR1?8YvL3%@-mOdzoL7N+My-cs9V$I8q>!D@p=m&~7P=iPXR*HuZhbNZC{FgrR|JO)xKb-Sg5uaEp) zsLpY~t?TVI?X~pXR=g6+OU`sWcli$L%xl!u=T4wc7M7#l!y#^Y8B;^wJNE7wEJp)H z)xqfnk7sk--P*s$cO=nN(D1cPoLMmD_WG{~cb95C8by0Q2Ag|`h+UbYt1HC9NJLmFtF9>Jd-e!*wtq(&5H@c;M*6*uEMz-~RpPf?-OWzfJ z3bws?ABXk=jz0Xme+#fce=NX3SO_d!hJ&qpF&6CwDmcVihZ-Jcc(~zW#Urppv4SHF zml__W2rSe8D#UOLj%F8*F+A4rIK$%&PcU3=c%tD7!{a;c14a8=hf!rr`#|nxSjB(QwG{EW@)6hYdFwo@2P#@La?549_>b!0huGGuB)raI*QO4NyMDn+JNWU578-D4`oHZ>ztH8OQ0Q#mrV zBU3#x^&?Y3GBqSqMRI>9)RS#0N~We{s!FD=WGYLhwq&YHroLn|529TKpWM%=Gc|c|+keLf)W&@e|KxRge tnG64sAKOQ`-*i`XBl!KGy&M diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml deleted file mode 100644 index 92777b4de2..0000000000 --- a/sonar/examples/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - 4.0.0 - - org.apache.poi - poi-parent - 5.1.1-SNAPSHOT - - poi-examples - jar - - Apache POI Examples package - - - - true - - - - - - - maven-resources-plugin - ${maven.plugin.resources.version} - - - copy-sources - - generate-sources - - copy-resources - - - ${basedir}/src/main/java - - - ../../poi-examples/src/main/java - - - - - - - - - maven-clean-plugin - ${maven.plugin.clean.version} - - - - src - false - - - - - - - - - - ${project.groupId} - poi-main - ${project.version} - - - ${project.groupId} - poi-ooxml - ${project.version} - - - diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml deleted file mode 100644 index f54c92222e..0000000000 --- a/sonar/excelant/pom.xml +++ /dev/null @@ -1,117 +0,0 @@ - - 4.0.0 - - org.apache.poi - poi-parent - 5.1.1-SNAPSHOT - - poi-excelant - jar - - Apache POI ExcelAnt package - - - - - - maven-resources-plugin - ${maven.plugin.resources.version} - - - copy-sources - - generate-sources - - copy-resources - - - ${basedir}/src/main/java - - - ../../poi-excelant/src/main/java - - - - - - copy-resources - - generate-resources - - copy-resources - - - ${basedir}/src/main/resources - - - ../../poi-excelant/src/main/resources - - - ../../poi-excelant/src/test/resources - - - - - - copy-tests - - generate-test-sources - - copy-resources - - - ${basedir}/src/test/java - - - ../../poi-excelant/src/test/java - - - - - - - - - maven-clean-plugin - ${maven.plugin.clean.version} - - - - src - false - - - - - - - - - - ${project.groupId} - poi-main - ${project.version} - - - ${project.groupId} - poi-main - ${project.version} - test-jar - test - - - ${project.groupId} - poi-ooxml - ${project.version} - - - - org.apache.ant - ant - 1.10.9 - - - diff --git a/sonar/integration-test/pom.xml b/sonar/integration-test/pom.xml deleted file mode 100644 index 72990a0716..0000000000 --- a/sonar/integration-test/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - 4.0.0 - - org.apache.poi - poi-parent - 5.1.1-SNAPSHOT - - - integration-test - jar - - Apache POI integration test - - - - - - maven-resources-plugin - ${maven.plugin.resources.version} - - - copy-tests - generate-test-sources - - copy-resources - - - ${basedir}/src/test/java - - - ../../poi-integration/src/test/java - - - ../../poi/src/test/java - - org/apache/poi/POIDataSamples.java - org/apache/poi/util/NullPrintStream.java - org/apache/poi/util/NullOutputStream.java - org/apache/poi/hssf/HSSFTestDataSamples.java - - - - ../../poi-integration/src/test/resources - - - - - - - - - - maven-clean-plugin - ${maven.plugin.clean.version} - - - - src - false - - - build - false - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.plugin.surefire.version} - - @{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=${basedir}/target/tmp -XX:-OmitStackTraceInFastThrow - ../.. - - - - - - - - ${project.groupId} - poi-ooxml - ${project.version} - - - ${project.groupId} - poi-scratchpad - ${project.version} - - - ${project.groupId} - poi-examples - ${project.version} - - - - org.reflections - reflections - 0.9.12 - test - - - - org.openjdk.jmh - jmh-core - 1.27 - test - - - org.apache.ant - ant - 1.10.9 - test - - - - - - diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml deleted file mode 100644 index 25cd9d88b0..0000000000 --- a/sonar/main/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ - - 4.0.0 - - org.apache.poi - poi-parent - 5.1.1-SNAPSHOT - - poi-main - jar - - Apache POI Main package - - - - - - maven-resources-plugin - ${maven.plugin.resources.version} - - - copy-sources - generate-sources - - copy-resources - - - ${basedir}/src/main/java - - - ../../poi/src/main/java - - - - - - copy-resources - generate-resources - - copy-resources - - - ${basedir}/src/main/resources - - - ../../poi/src/main/resources - - - - - - copy-tests - - generate-test-sources - - copy-resources - - - ${basedir}/src/test/java - - - ../../poi/src/test/java - - - ../../poi/src/test/resources - - - - - - - - - - maven-clean-plugin - ${maven.plugin.clean.version} - - - - src - false - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.plugin.jar.version} - - - - test-jar - - - - - - - - - - org.apache.logging.log4j - log4j-api - 2.14.0 - - - commons-codec - commons-codec - 1.15 - - - org.apache.commons - commons-collections4 - 4.4 - - - org.apache.commons - commons-math3 - 3.6.1 - - - commons-io - commons-io - 2.11.0 - - - com.zaxxer - SparseBitSet - 1.2 - - - org.apache.ant - ant - 1.10.9 - test - - - diff --git a/sonar/ooxml-full/pom.xml b/sonar/ooxml-full/pom.xml deleted file mode 100644 index a921cfd1c4..0000000000 --- a/sonar/ooxml-full/pom.xml +++ /dev/null @@ -1,151 +0,0 @@ - - 4.0.0 - - org.apache.poi - poi-parent - 5.1.1-SNAPSHOT - .. - - poi-ooxml-lite - jar - - Apache POI - Openxmlformats Schema package - - - - target/generated-sources/* - true - - - - - - maven-antrun-plugin - ${maven.plugin.antrun.version} - - - copy-xmltype-and-xsdconfig - generate-sources - - run - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - process-sources - - - exec - - - - - java - - -classpath - - - org.apache.xmlbeans.impl.tool.SchemaCompiler - -srconly - -name - ooxml - -repackage - org.apache.xmlbeans.metadata:org.apache.poi.schemas.ooxml - -d - ${basedir}/target/generated-resources - -src - ${basedir}/target/generated-sources - ${basedir}/target/schemas - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - add-source - - add-source - add-resource - - - - - ${basedir}/target/generated-resources - - - ${basedir}/../../poi-ooxml-full/src/main/java9 - META-INF/versions/9 - - *.class - - - - - ${basedir}/target/generated-sources - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - - true - org.apache.poi.ooxml.schemas - - - - - - - - - - ${project.groupId} - poi-main - ${project.version} - - - ${project.groupId} - poi-scratchpad - ${project.version} - - - org.apache.xmlbeans - xmlbeans - ${xmlbeans.version} - - - diff --git a/sonar/ooxml-full/xmlbeans.marker b/sonar/ooxml-full/xmlbeans.marker deleted file mode 100644 index 2744493ace..0000000000 --- a/sonar/ooxml-full/xmlbeans.marker +++ /dev/null @@ -1 +0,0 @@ -This purpose of this marker file is solely to activate the xmlbeans maven profile. \ No newline at end of file diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml deleted file mode 100644 index 04ec4dc38d..0000000000 --- a/sonar/ooxml/pom.xml +++ /dev/null @@ -1,216 +0,0 @@ - - 4.0.0 - - org.apache.poi - poi-parent - 5.1.1-SNAPSHOT - - poi-ooxml - jar - - Apache POI OOXML package - - - - - - maven-resources-plugin - ${maven.plugin.resources.version} - - - copy-sources - generate-sources - - copy-resources - - - ${basedir}/src/main/java - - - ../../poi-ooxml/src/main/java - - - - - - copy-resources - generate-resources - - copy-resources - - - ${basedir}/src/main/resources - - - ../../poi-ooxml/src/main/resources - - - - - - copy-tests - generate-test-sources - - copy-resources - - - ${basedir}/src/test/java - - - ../../poi-ooxml/src/test/java - - - ../../poi-ooxml/src/test/resources - - - - - - - - - - maven-clean-plugin - ${maven.plugin.clean.version} - - - - src - false - - - build - false - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.plugin.surefire.version} - - @{argLine} -Duser.language=en -Duser.country=US -Xmx1024m - -Djava.io.tmpdir=${basedir}/target/tmp -XX:-OmitStackTraceInFastThrow - - - - - - - - - ${project.groupId} - poi-ooxml-lite - ${project.version} - - - ${project.groupId} - poi-main - ${project.version} - - - ${project.groupId} - poi-main - ${project.version} - test-jar - test - - - - org.apache.xmlbeans - xmlbeans - ${xmlbeans.version} - - - - org.bouncycastle - bcpkix-jdk15on - 1.69 - - - org.bouncycastle - bcprov-jdk15on - 1.69 - - - org.bouncycastle - bcutil-jdk15on - 1.69 - - - org.apache.santuario - xmlsec - 2.2.2 - - - org.apache.commons - commons-compress - 1.21 - - - commons-io - commons-io - 2.11.0 - - - com.github.virtuald - curvesapi - 1.06 - - - org.apache.xmlgraphics - batik-svggen - 1.14 - - - org.apache.xmlgraphics - batik-bridge - 1.14 - - - org.apache.xmlgraphics - batik-script - - - - - org.apache.xmlgraphics - batik-codec - 1.14 - - - de.rototor.pdfbox - graphics2d - 0.32 - - - - org.reflections - reflections - 0.9.12 - test - - - org.openjdk.jmh - jmh-core - 1.27 - test - - - org.openjdk.jmh - jmh-generator-annprocess - 1.27 - test - - - com.google.guava - guava - 30.1-jre - test - - - diff --git a/sonar/pom.xml b/sonar/pom.xml deleted file mode 100644 index ba2cf34251..0000000000 --- a/sonar/pom.xml +++ /dev/null @@ -1,227 +0,0 @@ - - 4.0.0 - org.apache.poi - poi-parent - pom - 5.1.1-SNAPSHOT - Apache POI - the Java API for Microsoft Documents - Maven build of Apache POI for Sonar checks - https://poi.apache.org/ - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Apache Software Foundation - http://www.apache.org/ - - - - Bugzilla - https://bz.apache.org/bugzilla/ - - - - scm:svn:https://svn.apache.org/repos/asf/poi/trunk - scm:svn:https://svn.apache.org/repos/asf/poi/trunk - https://svn.apache.org/viewvc/poi - - - - - apache-releases-repo - apache releases repo - https://repository.apache.org/content/repositories/releases - - - - - main - ooxml-full - ooxml - scratchpad - excelant - examples - integration-test - - - - UTF-8 - - true - - apache - poi-parent - ${project.artifactId} - - https://sonarcloud.io - - target/site/jacoco/jacoco.xml - - - 5.0.1 - 5.7.1 - 2.8.2 - 3.6.28 - 3.2.0 - 3.2.0 - 3.1.0 - 1.6.0 - 3.0.0 - 3.0.0-M5 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.plugin.surefire.version} - - false - - ${basedir}/../../test-data - true - - - @{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=${basedir}/target/tmp -XX:-OmitStackTraceInFastThrow - - **/All*Tests.java - **/TestUnfixedBugs.java - **/TestcaseRecordInputStream.java - **/POITestCase.java - - **/TestWordToConverterSuite*.java - **/TestExcelConverterSuite*.java - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.6 - - - - prepare-agent - - - - report - prepare-package - - report - - - - - - - - - - org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - org.xmlunit - xmlunit-core - ${xmlunit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.hamcrest - hamcrest - 2.2 - test - - - org.apache.logging.log4j - log4j-core - 2.14.0 - test - - - - - - - - - - - - - 32bitstuff - - - sun.arch.data.model - 32 - - - - 512m - -Xmx768m - - - - - 64bitstuff - - - sun.arch.data.model - 64 - - - - 768m - -Xmx1024m - - - - - diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml deleted file mode 100644 index 073823e419..0000000000 --- a/sonar/scratchpad/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - 4.0.0 - - org.apache.poi - poi-parent - 5.1.1-SNAPSHOT - - poi-scratchpad - jar - - Apache POI Scratchpad package - - - - src/main/java/org/apache/poi/hwpf/model/types/*,src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/* - - - - - - - - maven-resources-plugin - ${maven.plugin.resources.version} - - - copy-sources - - generate-sources - - copy-resources - - - ${basedir}/src/main/java - - - ../../poi-scratchpad/src/main/java - - - - - - copy-resources - - generate-resources - - copy-resources - - - ${basedir}/src/main/resources - - - ../../poi-scratchpad/src/main/resources - - - - - - copy-tests - - generate-test-sources - - copy-resources - - - ${basedir}/src/test/java - - - ../../poi-scratchpad/src/test/java - - - ../../poi-scratchpad/src/test/resources - - - - - - - - - maven-clean-plugin - ${maven.plugin.clean.version} - - - - src - false - - - - - - - - - - ${project.groupId} - poi-main - ${project.version} - - - ${project.groupId} - poi-main - ${project.version} - test-jar - test - - - -- 2.39.5