You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/09/03 21:13:36 UTC
svn commit: r1892887 - in /poi/trunk: ./ osgi/ poi-excelant/
poi-excelant/src/test/java9/ poi-integration/
poi-integration/src/test/java9/ poi-ooxml-full/ poi-ooxml-lite-agent/
poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/
poi-ooxml-lit...
Author: kiwiwings
Date: Fri Sep 3 21:13:36 2021
New Revision: 1892887
URL: http://svn.apache.org/viewvc?rev=1892887&view=rev
Log:
update to release 5.1.0
fix ooxml-lite build
Modified:
poi/trunk/build.gradle
poi/trunk/osgi/pom.xml
poi/trunk/poi-excelant/build.gradle
poi/trunk/poi-excelant/src/test/java9/module-info.class
poi/trunk/poi-integration/build.gradle
poi/trunk/poi-integration/src/test/java9/module-info.class
poi/trunk/poi-ooxml-full/build.gradle
poi/trunk/poi-ooxml-lite-agent/build.gradle
poi/trunk/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class
poi/trunk/poi-ooxml-lite/build.gradle
poi/trunk/poi-ooxml/build.gradle
poi/trunk/poi-ooxml/src/main/java9/module-info.class
poi/trunk/poi-ooxml/src/test/java9/module-info.class
poi/trunk/poi-scratchpad/src/main/java9/module-info.class
poi/trunk/poi-scratchpad/src/test/java9/module-info.class
poi/trunk/poi/build.gradle
poi/trunk/poi/src/main/java9/module-info.class
poi/trunk/poi/src/test/java9/module-info.class
poi/trunk/sonar/pom.xml
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Fri Sep 3 21:13:36 2021
@@ -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!
Modified: poi/trunk/osgi/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/osgi/pom.xml?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/osgi/pom.xml (original)
+++ poi/trunk/osgi/pom.xml Fri Sep 3 21:13:36 2021
@@ -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>
Modified: poi/trunk/poi-excelant/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-excelant/build.gradle?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/poi-excelant/build.gradle (original)
+++ poi/trunk/poi-excelant/build.gradle Fri Sep 3 21:13:36 2021
@@ -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'
Modified: poi/trunk/poi-excelant/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-excelant/src/test/java9/module-info.class?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-integration/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-integration/build.gradle?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/poi-integration/build.gradle (original)
+++ poi/trunk/poi-integration/build.gradle Fri Sep 3 21:13:36 2021
@@ -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 }
\ No newline at end of file
+sourcesJar.onlyIf { false }
+
+generateMetadataFileForPOIPublication.enabled = false
\ No newline at end of file
Modified: poi/trunk/poi-integration/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-integration/src/test/java9/module-info.class?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-ooxml-full/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-full/build.gradle?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-full/build.gradle (original)
+++ poi/trunk/poi-ooxml-full/build.gradle Fri Sep 3 21:13:36 2021
@@ -164,4 +164,5 @@ publishing {
spotbugsTest.enabled = false
spotbugsMain.enabled = false
-javadoc.enabled = false
\ No newline at end of file
+javadoc.enabled = false
+javadocJar.enabled = false
\ No newline at end of file
Modified: poi/trunk/poi-ooxml-lite-agent/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/build.gradle?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite-agent/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite-agent/build.gradle Fri Sep 3 21:13:36 2021
@@ -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
+
Modified: poi/trunk/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java (original)
+++ poi/trunk/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java Fri Sep 3 21:13:36 2021
@@ -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())
Modified: poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-ooxml-lite/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite/build.gradle?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/poi-ooxml-lite/build.gradle (original)
+++ poi/trunk/poi-ooxml-lite/build.gradle Fri Sep 3 21:13:36 2021
@@ -115,17 +115,21 @@ task cacheJava9(type: Copy, dependsOn: '
}
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
\ No newline at end of file
+javadoc.enabled = false
+javadocJar.enabled = false
\ No newline at end of file
Modified: poi/trunk/poi-ooxml/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/build.gradle?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/build.gradle (original)
+++ poi/trunk/poi-ooxml/build.gradle Fri Sep 3 21:13:36 2021
@@ -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}"
Modified: poi/trunk/poi-ooxml/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java9/module-info.class?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-ooxml/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java9/module-info.class?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-scratchpad/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java9/module-info.class?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-scratchpad/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java9/module-info.class?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/poi/build.gradle?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/poi/build.gradle (original)
+++ poi/trunk/poi/build.gradle Fri Sep 3 21:13:36 2021
@@ -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}"
Modified: poi/trunk/poi/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java9/module-info.class?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java9/module-info.class?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/sonar/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/pom.xml?rev=1892887&r1=1892886&r2=1892887&view=diff
==============================================================================
--- poi/trunk/sonar/pom.xml (original)
+++ poi/trunk/sonar/pom.xml Fri Sep 3 21:13:36 2021
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org