Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andreas Beeker 2021-09-03 21:13:36 +00:00
parent 1eace7a0c4
commit f63f3ff09d
20 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@ -22,7 +22,7 @@ buildscript {
}
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 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.3'
}
@ -56,8 +56,8 @@ configurations {
}
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",
@ -101,16 +101,16 @@ subprojects {
apply plugin: 'de.thetaphi.forbiddenapis'
apply plugin: 'com.github.spotbugs'
version = '5.0.1-SNAPSHOT'
version = '5.1.0'
ext {
bouncyCastleVersion = '1.69'
commonsCodecVersion = '1.15'
commonsCompressVersion = '1.21'
commonsIoVersion = '2.11.0'
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'
xmlbeansVersion = '5.0.1'
batikVersion = '1.14'
@ -400,6 +400,10 @@ subprojects {
ignoreFailures = true
showStackTraces = false
}
build {
dependsOn 'signPOIPublication'
}
}
// initial try to provide a combined JavaDoc, grouping is still missing here, though!

2
osgi/pom.xml
View File

@ -24,7 +24,7 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-bundle</artifactId>
<packaging>bundle</packaging>
<version>5.0.1-SNAPSHOT</version>
<version>5.1.0</version>
<name>Apache POI OSGi bundle</name>
<properties>

6
poi-excelant/build.gradle
View File

@ -35,7 +35,7 @@ sourceSets {
}
dependencies {
api 'org.apache.ant:ant:1.10.9'
api 'org.apache.ant:ant:1.10.11'
api project(':poi-ooxml')
api project(path: ':poi-ooxml', configuration: 'archives')
@ -45,8 +45,8 @@ dependencies {
testImplementation(project(path: ':poi-ooxml', configuration: 'tests')) {
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'

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

Binary file not shown.

10
poi-integration/build.gradle
View File

@ -40,9 +40,9 @@ sourceSets {
}
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 'com.google.guava:guava:30.0-jre'
testImplementation 'com.google.guava:guava:30.1.1-jre'
testImplementation(project(':poi-ooxml')) {
if (NO_SCRATCHPAD) {
@ -73,7 +73,7 @@ dependencies {
}
}
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'
@ -176,4 +176,6 @@ javadoc.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

Binary file not shown.

3
poi-ooxml-full/build.gradle
View File

@ -164,4 +164,5 @@ publishing {
spotbugsTest.enabled = false
spotbugsMain.enabled = false
javadoc.enabled = false
javadoc.enabled = false
javadocJar.enabled = false

8
poi-ooxml-lite-agent/build.gradle
View File

@ -24,8 +24,8 @@ sourceSets {
}
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}"
}
@ -77,3 +77,7 @@ jar {
}
}
spotbugsMain.enabled = false
javadoc.enabled = false
javadocJar.enabled = false

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

@ -58,7 +58,7 @@ public class OOXMLLiteAgent {
new AgentBuilder.Default()
// .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) ->
builder
.constructor(ElementMatchers.any())

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

Binary file not shown.

23
poi-ooxml-lite/build.gradle
View File

@ -115,17 +115,21 @@ task cacheJava9(type: Copy, dependsOn: 'compileJava9') {
}
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}")
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) {
into('META-INF/versions/9') {
from JAVA9_SRC include '*.class'
@ -143,4 +147,5 @@ jar {
spotbugsTest.enabled = false
spotbugsMain.enabled = false
javadoc.enabled = false
javadoc.enabled = false
javadocJar.enabled = false

10
poi-ooxml/build.gradle
View File

@ -70,15 +70,15 @@ dependencies {
}
testImplementation project(path:':poi', configuration:'tests')
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.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
// 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}"

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

2
poi/build.gradle
View File

@ -45,7 +45,7 @@ dependencies {
implementation 'javax.activation:activation:1.1.1'
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}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"

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

Binary file not shown.

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

Binary file not shown.

2
sonar/pom.xml
View File

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