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

diff --git a/build.gradle b/build.gradle
index 8d40eb11526ba5b96e7156b47a015b3e6b6448f8..784c8bfef69ff75743db7eba21f840c4dc7679ac 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -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!

diff --git a/osgi/pom.xml b/osgi/pom.xml
index a8d866575a1a1f1928e9f800587a8244b32e009c..ba4f2171b4e705c860e9c5a1b80c35e0df53aaa4 100644 (file)
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -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>

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index e22a80f1f28ee9d55aa86a0b38da40906173ee26..d8df08c117f7dbb3ccf5c3601a5f94c25ad19841 100644 (file)
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -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'

diff --git a/poi-excelant/src/test/java9/module-info.class b/poi-excelant/src/test/java9/module-info.class
index 20d23dce88d239d8b878bb931f47b3d1ab7a6e59..53c59b85a32e7e7fa2fdaf491385a578c430e454 100644 (file)
Binary files a/poi-excelant/src/test/java9/module-info.class and b/poi-excelant/src/test/java9/module-info.class differ

diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index 28e961ed4a660bd05edf5a5868c779f2d67e1033..cb491e01c0d1e43c773081e80a563364dcc81420 100644 (file)
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -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

diff --git a/poi-integration/src/test/java9/module-info.class b/poi-integration/src/test/java9/module-info.class
index c129e09467837d6814c7cad1048cfd25ed400b13..fa531a8ff8e2c16b4775927e3b50e15c034cd881 100644 (file)
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-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index aa1b816013f642382bfdf687431259e80fd5de31..8808c6fcc2929682d91c55704ffefac677fc2d50 100644 (file)
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -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

diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle
index fc0cf7b2df5a0cf5458b1e24ad087e4b768e01d3..d28a236275e29c80595ceec383743d3f6d87dcc9 100644 (file)
--- a/poi-ooxml-lite-agent/build.gradle
+++ b/poi-ooxml-lite-agent/build.gradle
@@ -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
+

diff --git a/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java b/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
index 64cec25ac61c76b0d1d0737af371f6aca56eb272..87f488b814c7083f5aa080fee8578905d3dfb600 100644 (file)
--- a/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
+++ b/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
@@ -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())

diff --git a/poi-ooxml-lite-agent/src/main/java9/module-info.class b/poi-ooxml-lite-agent/src/main/java9/module-info.class
index 4623f875fc5c27e7b2cd7595a9dd3f8b91667e08..7839f4047c26fcef80aa978589ae660fcc1877b5 100644 (file)
Binary files a/poi-ooxml-lite-agent/src/main/java9/module-info.class and b/poi-ooxml-lite-agent/src/main/java9/module-info.class differ

diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
index 9c037d54ad88f34659816b42f18960a1be2f99f1..ff5fca3a66722ad40f4e4e78df53566ab57bc6cb 100644 (file)
--- a/poi-ooxml-lite/build.gradle
+++ b/poi-ooxml-lite/build.gradle
@@ -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
\ No newline at end of file
+javadoc.enabled = false
+javadocJar.enabled = false
\ No newline at end of file

diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 1179633f17778a529d39542a3709bbc8b316850b..92c816df93d2a2c2366cb340a32455b3e2474a3c 100644 (file)
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -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}"

diff --git a/poi-ooxml/src/main/java9/module-info.class b/poi-ooxml/src/main/java9/module-info.class
index 528608ee33a2bdd2da1784ffe1cd6209b6a6ee97..6ca2bc5ba02e61c3c1cae977f47eba671521f223 100644 (file)
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/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class
index a9e3c22655ef278195bf908daa6e4b3fb2c2a1a4..a6a4e2ae74690f4a403c4134bb4e32361dde61bb 100644 (file)
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-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class
index 2a5c5f5de4b4e696d65386fa422eb50aaf178a90..ffe0e5c1fca669a6d49f1867b220e071271da3fc 100644 (file)
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/test/java9/module-info.class b/poi-scratchpad/src/test/java9/module-info.class
index 43ba0ddeecccc1a021e26cd955c970d206a2c1e9..e4d2abd3d2413cc9c0d9d8393eac8b85647f85d8 100644 (file)
Binary files a/poi-scratchpad/src/test/java9/module-info.class and b/poi-scratchpad/src/test/java9/module-info.class differ

diff --git a/poi/build.gradle b/poi/build.gradle
index 4e4507d51f560bf960e7f20d11dd4f5a21cc7e72..889fb6d95bf93ff19e930c801a946b0fffe396ad 100644 (file)
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -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}"

diff --git a/poi/src/main/java9/module-info.class b/poi/src/main/java9/module-info.class
index 726f47f15c3574530d0034235c5deb876ac4841c..e9fb5065290aeb68f55022f9151d53e6f85b1b30 100644 (file)
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 2cd1356efd514aad56ecd0f7d22b7bcf09ac416f..fd6f5c8758a8e460c1e5c0a04ff7f3abd595dfc7 100644 (file)
Binary files a/poi/src/test/java9/module-info.class and b/poi/src/test/java9/module-info.class differ

diff --git a/sonar/pom.xml b/sonar/pom.xml
index 085cedf7e0ef8558444ad026c18d8509e3291cd8..1a75f148eea66c6456c8cfab05699a1a8f610ed4 100644 (file)
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -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>