Browse Source

update to release 5.1.0

fix ooxml-lite build

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1892887 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_5_1_0
Andreas Beeker 2 years ago
parent
commit
f63f3ff09d

+ 11
- 7
build.gradle View File

} }


dependencies { dependencies {
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3'
classpath 'de.thetaphi:forbiddenapis:3.1' classpath 'de.thetaphi:forbiddenapis:3.1'
classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.3' classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.3'
} }
} }


dependencies { dependencies {
antLibs("org.junit.jupiter:junit-jupiter:5.7.1")
antLibs("org.apache.ant:ant-junitlauncher:1.10.9")
antLibs("org.junit.jupiter:junit-jupiter:5.7.2")
antLibs("org.apache.ant:ant-junitlauncher:1.10.11")
} }


ant.taskdef(name: "junit", ant.taskdef(name: "junit",
apply plugin: 'de.thetaphi.forbiddenapis' apply plugin: 'de.thetaphi.forbiddenapis'
apply plugin: 'com.github.spotbugs' apply plugin: 'com.github.spotbugs'


version = '5.0.1-SNAPSHOT'
version = '5.1.0'
ext { ext {
bouncyCastleVersion = '1.69' bouncyCastleVersion = '1.69'
commonsCodecVersion = '1.15' commonsCodecVersion = '1.15'
commonsCompressVersion = '1.21' commonsCompressVersion = '1.21'
commonsIoVersion = '2.11.0' commonsIoVersion = '2.11.0'
commonsMathVersion = '3.6.1' commonsMathVersion = '3.6.1'
junitVersion = '5.7.1'
log4jVersion = '2.14.0'
mockitoVersion = '3.6.0'
junitVersion = '5.7.2'
log4jVersion = '2.14.1'
mockitoVersion = '3.12.4'
hamcrestVersion = '2.2' hamcrestVersion = '2.2'
xmlbeansVersion = '5.0.1' xmlbeansVersion = '5.0.1'
batikVersion = '1.14' batikVersion = '1.14'
ignoreFailures = true ignoreFailures = true
showStackTraces = false showStackTraces = false
} }

build {
dependsOn 'signPOIPublication'
}
} }


// initial try to provide a combined JavaDoc, grouping is still missing here, though! // initial try to provide a combined JavaDoc, grouping is still missing here, though!

+ 1
- 1
osgi/pom.xml View File

<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-bundle</artifactId> <artifactId>poi-bundle</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<version>5.0.1-SNAPSHOT</version>
<version>5.1.0</version>


<name>Apache POI OSGi bundle</name> <name>Apache POI OSGi bundle</name>
<properties> <properties>

+ 3
- 3
poi-excelant/build.gradle View File

} }


dependencies { dependencies {
api 'org.apache.ant:ant:1.10.9'
api 'org.apache.ant:ant:1.10.11'


api project(':poi-ooxml') api project(':poi-ooxml')
api project(path: ':poi-ooxml', configuration: 'archives') api project(path: ':poi-ooxml', configuration: 'archives')
testImplementation(project(path: ':poi-ooxml', configuration: 'tests')) { testImplementation(project(path: ':poi-ooxml', configuration: 'tests')) {
exclude group: 'org.apache.poi', module: 'poi-scratchpad' exclude group: 'org.apache.poi', module: 'poi-scratchpad'
} }
testImplementation 'com.google.guava:guava:30.0-jre'
testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
testImplementation 'com.google.guava:guava:30.1.1-jre'
testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
} }


final String MODULE_NAME = 'org.apache.poi.excelant' final String MODULE_NAME = 'org.apache.poi.excelant'

BIN
poi-excelant/src/test/java9/module-info.class View File


+ 6
- 4
poi-integration/build.gradle View File

} }


dependencies { dependencies {
testImplementation 'org.apache.ant:ant:1.10.9'
testImplementation 'org.apache.ant:ant:1.10.11'
testImplementation 'org.apache.commons:commons-collections4:4.4' testImplementation 'org.apache.commons:commons-collections4:4.4'
testImplementation 'com.google.guava:guava:30.0-jre'
testImplementation 'com.google.guava:guava:30.1.1-jre'


testImplementation(project(':poi-ooxml')) { testImplementation(project(':poi-ooxml')) {
if (NO_SCRATCHPAD) { if (NO_SCRATCHPAD) {
} }
} }
testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives') testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives')
testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
} }


final String MODULE_NAME = 'org.apache.poi.stress' final String MODULE_NAME = 'org.apache.poi.stress'


javadocJar.onlyIf { false } javadocJar.onlyIf { false }


sourcesJar.onlyIf { false }
sourcesJar.onlyIf { false }

generateMetadataFileForPOIPublication.enabled = false

BIN
poi-integration/src/test/java9/module-info.class View File


+ 2
- 1
poi-ooxml-full/build.gradle View File



spotbugsTest.enabled = false spotbugsTest.enabled = false
spotbugsMain.enabled = false spotbugsMain.enabled = false
javadoc.enabled = false
javadoc.enabled = false
javadocJar.enabled = false

+ 6
- 2
poi-ooxml-lite-agent/build.gradle View File

} }


dependencies { dependencies {
api 'net.bytebuddy:byte-buddy:1.10.19'
api 'net.bytebuddy:byte-buddy-agent:1.10.19'
api 'net.bytebuddy:byte-buddy:1.11.13'
api 'net.bytebuddy:byte-buddy-agent:1.11.13'
api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
} }


} }
} }


spotbugsMain.enabled = false
javadoc.enabled = false
javadocJar.enabled = false


+ 1
- 1
poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java View File



new AgentBuilder.Default() new AgentBuilder.Default()
// .with(AgentBuilder.Listener.StreamWriting.toSystemOut()) // .with(AgentBuilder.Listener.StreamWriting.toSystemOut())
.type(named("org.apache.xmlbeans.impl.schema.SchemaTypeSystemImpl$XsbReader"))
.type(named("org.apache.xmlbeans.impl.schema.XsbReader"))
.transform((builder, type, cl, m) -> .transform((builder, type, cl, m) ->
builder builder
.constructor(ElementMatchers.any()) .constructor(ElementMatchers.any())

BIN
poi-ooxml-lite-agent/src/main/java9/module-info.class View File


+ 14
- 9
poi-ooxml-lite/build.gradle View File

} }


jar { jar {
File clazzFile = file("${OOXML_LITE_REPORT}.clazz")
File xsbsFile = file("${OOXML_LITE_REPORT}.xsb")
if (clazzFile.exists() && xsbsFile.exists()) {
List clazz = clazzFile.collect { "${it}.class" }
List clazzInner = clazzFile.collect { "${it}\$*.class" }
List xsbs = xsbsFile.collect { "org/apache/poi/schemas/ooxml/system/ooxml/${it}.xsb" }
includes = clazz + clazzInner + xsbs + ['META-INF/versions/**', 'org/apache/poi/schemas/ooxml/element/**']
}
dependsOn ':poi-ooxml:test', ':poi-integration:test'


destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}") destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")


doFirst {
File clazzFile = file("${OOXML_LITE_REPORT}.clazz")
File xsbsFile = file("${OOXML_LITE_REPORT}.xsb")
if (clazzFile.exists() && xsbsFile.exists()) {
List clazz = clazzFile.collect { "${it}.class" }
List clazzInner = clazzFile.collect { "${it}\$*.class" }
List xsbs = xsbsFile.collect { "org/apache/poi/schemas/ooxml/system/ooxml/${it}.xsb" }
includes = clazz + clazzInner + xsbs + ['META-INF/versions/**', 'org/apache/poi/schemas/ooxml/element/**']
}
}

if (JavaVersion.current() == JavaVersion.VERSION_1_8) { if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
into('META-INF/versions/9') { into('META-INF/versions/9') {
from JAVA9_SRC include '*.class' from JAVA9_SRC include '*.class'


spotbugsTest.enabled = false spotbugsTest.enabled = false
spotbugsMain.enabled = false spotbugsMain.enabled = false
javadoc.enabled = false
javadoc.enabled = false
javadocJar.enabled = false

+ 5
- 5
poi-ooxml/build.gradle View File

} }
testImplementation project(path:':poi', configuration:'tests') testImplementation project(path:':poi', configuration:'tests')
testImplementation project(path:':poi-ooxml-lite-agent', configuration: 'archives') testImplementation project(path:':poi-ooxml-lite-agent', configuration: 'archives')
testImplementation 'org.xmlunit:xmlunit-core:2.8.0'
testImplementation 'org.xmlunit:xmlunit-core:2.8.2'
testImplementation 'org.reflections:reflections:0.9.12' testImplementation 'org.reflections:reflections:0.9.12'
testImplementation 'org.openjdk.jmh:jmh-core:1.26'
testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.26'
testImplementation 'com.google.guava:guava:30.0-jre'
testImplementation 'org.openjdk.jmh:jmh-core:1.32'
testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.32'
testImplementation 'com.google.guava:guava:30.1.1-jre'


// prevent slf4j warnings coming from xmlsec -> slf4j-api 1.7.31 dependency // prevent slf4j warnings coming from xmlsec -> slf4j-api 1.7.31 dependency
// see https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/ // see https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/
testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1'
testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"




broken "org.apache.xmlgraphics:batik-script:${batikVersion}" broken "org.apache.xmlgraphics:batik-script:${batikVersion}"

BIN
poi-ooxml/src/main/java9/module-info.class View File


BIN
poi-ooxml/src/test/java9/module-info.class View File


BIN
poi-scratchpad/src/main/java9/module-info.class View File


BIN
poi-scratchpad/src/test/java9/module-info.class View File


+ 1
- 1
poi/build.gradle View File

implementation 'javax.activation:activation:1.1.1' implementation 'javax.activation:activation:1.1.1'


testImplementation 'org.reflections:reflections:0.9.12' testImplementation 'org.reflections:reflections:0.9.12'
testImplementation 'org.apache.ant:ant:1.10.9'
testImplementation 'org.apache.ant:ant:1.10.11'


testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"

BIN
poi/src/main/java9/module-info.class View File


BIN
poi/src/test/java9/module-info.class View File


+ 1
- 1
sonar/pom.xml View File

<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>5.0.1-SNAPSHOT</version>
<version>5.1.0</version>
<name>Apache POI - the Java API for Microsoft Documents</name> <name>Apache POI - the Java API for Microsoft Documents</name>
<description>Maven build of Apache POI for Sonar checks</description> <description>Maven build of Apache POI for Sonar checks</description>
<url>https://poi.apache.org/</url> <url>https://poi.apache.org/</url>

Loading…
Cancel
Save