diff --git a/build.gradle b/build.gradle index 8d40eb1152..784c8bfef6 100644 --- 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 a8d866575a..ba4f2171b4 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -24,7 +24,7 @@ org.apache.poi poi-bundle bundle - 5.0.1-SNAPSHOT + 5.1.0 Apache POI OSGi bundle diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle index e22a80f1f2..d8df08c117 100644 --- 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 20d23dce88..53c59b85a3 100644 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 28e961ed4a..cb491e01c0 100644 --- 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 c129e09467..fa531a8ff8 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-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index aa1b816013..8808c6fcc2 100644 --- 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 fc0cf7b2df..d28a236275 100644 --- 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 64cec25ac6..87f488b814 100644 --- 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 4623f875fc..7839f4047c 100644 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 9c037d54ad..ff5fca3a66 100644 --- 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 1179633f17..92c816df93 100644 --- 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 528608ee33..6ca2bc5ba0 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/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class index a9e3c22655..a6a4e2ae74 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-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class index 2a5c5f5de4..ffe0e5c1fc 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/test/java9/module-info.class b/poi-scratchpad/src/test/java9/module-info.class index 43ba0ddeec..e4d2abd3d2 100644 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 4e4507d51f..889fb6d95b 100644 --- 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 726f47f15c..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 2cd1356efd..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/pom.xml b/sonar/pom.xml index 085cedf7e0..1a75f148ee 100644 --- a/sonar/pom.xml +++ b/sonar/pom.xml @@ -4,7 +4,7 @@ org.apache.poi poi-parent pom - 5.0.1-SNAPSHOT + 5.1.0 Apache POI - the Java API for Microsoft Documents Maven build of Apache POI for Sonar checks https://poi.apache.org/