From 596db3117021cea11793fff2d3018e5e2907a2c9 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Sun, 12 Sep 2021 20:31:43 +0000 Subject: 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 +- poi-integration/src/test/java9/module-info.class | Bin 492 -> 683 bytes poi-integration/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 +- poi-scratchpad/src/main/java9/module-info.class | Bin 2605 -> 2641 bytes poi-scratchpad/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 9b2245bc12..274689a12c 100644 Binary files a/poi-examples/src/main/java9/module-info.class and b/poi-examples/src/main/java9/module-info.class differ 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 e5d258d7ee..91f8145f25 100644 Binary files a/poi-integration/src/test/java9/module-info.class and b/poi-integration/src/test/java9/module-info.class 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; 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 6ca2bc5ba0..6e355946d8 100644 Binary files a/poi-ooxml/src/main/java9/module-info.class and b/poi-ooxml/src/main/java9/module-info.class differ 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 a6a4e2ae74..d5e072f647 100644 Binary files a/poi-ooxml/src/test/java9/module-info.class and b/poi-ooxml/src/test/java9/module-info.class differ 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 ffe0e5c1fc..53efc695f7 100644 Binary files a/poi-scratchpad/src/main/java9/module-info.class and b/poi-scratchpad/src/main/java9/module-info.class differ diff --git a/poi-scratchpad/src/main/java9/module-info.java b/poi-scratchpad/src/main/java9/module-info.java index 57070d405b..f2b2732ec5 100644 --- a/poi-scratchpad/src/main/java9/module-info.java +++ b/poi-scratchpad/src/main/java9/module-info.java @@ -20,6 +20,7 @@ module org.apache.poi.scratchpad { requires java.desktop; requires commons.math3; requires org.apache.commons.io; + requires org.apache.commons.codec; requires org.apache.logging.log4j; provides org.apache.poi.extractor.ExtractorProvider with org.apache.poi.extractor.ole2.OLE2ScratchpadExtractorFactory; diff --git a/poi/build.gradle b/poi/build.gradle index 889fb6d95b..d71e86bc51 100644 --- a/poi/build.gradle +++ b/poi/build.gradle @@ -41,8 +41,8 @@ dependencies { api "org.apache.commons:commons-math3:${commonsMathVersion}" api "commons-io:commons-io:${commonsIoVersion}" api 'com.zaxxer:SparseBitSet:1.2' - implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" - implementation 'javax.activation:activation:1.1.1' + api "org.apache.logging.log4j:log4j-api:${log4jVersion}" + // implementation 'javax.activation:activation:1.1.1' testImplementation 'org.reflections:reflections:0.9.12' testImplementation 'org.apache.ant:ant:1.10.11' diff --git a/poi/src/main/java9/module-info.class b/poi/src/main/java9/module-info.class index 26498b44bd..e9fb506529 100644 Binary files a/poi/src/main/java9/module-info.class and b/poi/src/main/java9/module-info.class differ diff --git a/poi/src/test/java9/module-info.class b/poi/src/test/java9/module-info.class index fabf8f27ed..fd6f5c8758 100644 Binary files a/poi/src/test/java9/module-info.class and b/poi/src/test/java9/module-info.class differ 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 - - - -- cgit v1.2.3