From f63f3ff09d8bfc5afbbc60dde5053c14f407120b Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Fri, 3 Sep 2021 21:13:36 +0000 Subject: [PATCH] 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 --- build.gradle | 18 ++++++++------ osgi/pom.xml | 2 +- poi-excelant/build.gradle | 6 ++--- poi-excelant/src/test/java9/module-info.class | Bin 422 -> 422 bytes poi-integration/build.gradle | 10 +++++--- .../src/test/java9/module-info.class | Bin 528 -> 538 bytes poi-ooxml-full/build.gradle | 3 ++- poi-ooxml-lite-agent/build.gradle | 8 ++++-- .../apache/poi/ooxml/lite/OOXMLLiteAgent.java | 2 +- .../src/main/java9/module-info.class | Bin 268 -> 278 bytes poi-ooxml-lite/build.gradle | 23 +++++++++++------- poi-ooxml/build.gradle | 10 ++++---- poi-ooxml/src/main/java9/module-info.class | Bin 3653 -> 3653 bytes poi-ooxml/src/test/java9/module-info.class | Bin 5040 -> 5040 bytes .../src/main/java9/module-info.class | Bin 2605 -> 2605 bytes .../src/test/java9/module-info.class | Bin 3288 -> 3288 bytes poi/build.gradle | 2 +- poi/src/main/java9/module-info.class | Bin 3420 -> 3420 bytes poi/src/test/java9/module-info.class | Bin 4134 -> 4144 bytes sonar/pom.xml | 2 +- 20 files changed, 51 insertions(+), 35 deletions(-) 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 20d23dce88d239d8b878bb931f47b3d1ab7a6e59..53c59b85a32e7e7fa2fdaf491385a578c430e454 100644 GIT binary patch delta 11 TcmZ3+yo`CmK1QR7`=0{<8iEB2 delta 11 TcmZ3+yo`CmK1Rcd`=0{<8h!-| 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 c129e09467837d6814c7cad1048cfd25ed400b13..fa531a8ff8e2c16b4775927e3b50e15c034cd881 100644 GIT binary patch delta 152 zcmbQhGK+=l)W2Q(7#J8#8I&e+ZDTZ=c+gOuk%8S%&k%@=g&D*d8F;c1%M$fcQj4=o z@(Y9+Bqy^osxV4V)?t)kl%4F!C?^BdAevv4uAf+tn4FQSUyz@vUtCg@T3js5pg6gi lF-~8UK@4aG7lQ 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 GIT binary patch delta 51 zcmeBSn#RO+>ff$?3=9mW3_=sR=JPT#up8ff$?3=9mW41yE6<}-^h2u$1-$j`vQ$N(f@008J52hRWi 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 528608ee33a2bdd2da1784ffe1cd6209b6a6ee97..6ca2bc5ba02e61c3c1cae977f47eba671521f223 100644 GIT binary patch delta 14 WcmX>qb5v%-WJX5A%~KdR@&EuUFaqb5v%-WJX4V%~KdR@&EuUDg`|N diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class index a9e3c22655ef278195bf908daa6e4b3fb2c2a1a4..a6a4e2ae74690f4a403c4134bb4e32361dde61bb 100644 GIT binary patch delta 14 Wcmdm>zCnG%Yi35H&2N~G@B;uY(*^Ya delta 14 Wcmdm>zCnG%Yi35n&2N~G@B;uY%?0!T diff --git a/poi-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class index 2a5c5f5de4b4e696d65386fa422eb50aaf178a90..ffe0e5c1fca669a6d49f1867b220e071271da3fc 100644 GIT binary patch delta 20 ccmZ20vQ}imPZmQF2Jy)sS%o(XFv@ZQ07?M`@&Et; delta 20 ccmZ20vQ}imPZk3a2Jy)sS%o(XFv@ZQ07>)(@c;k- diff --git a/poi-scratchpad/src/test/java9/module-info.class b/poi-scratchpad/src/test/java9/module-info.class index 43ba0ddeecccc1a021e26cd955c970d206a2c1e9..e4d2abd3d2413cc9c0d9d8393eac8b85647f85d8 100644 GIT binary patch delta 18 acmca1c|&r-Jx0Tc_mvopHZw6^;|2gqGzQ-Q delta 18 acmca1c|&r-Jw}6x_mvn8H#0F_;|2gqBL>|7 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 726f47f15c3574530d0034235c5deb876ac4841c..e9fb5065290aeb68f55022f9151d53e6f85b1b30 100644 GIT binary patch delta 14 Vcmca3bw_H0EF+`gW;sSX9snkC1PK5D delta 14 Vcmca3bw_H0EF+`AW;sSX9snk61PA~C diff --git a/poi/src/test/java9/module-info.class b/poi/src/test/java9/module-info.class index 2cd1356efd514aad56ecd0f7d22b7bcf09ac416f..fd6f5c8758a8e460c1e5c0a04ff7f3abd595dfc7 100644 GIT binary patch literal 4144 zcmai1X`9qU5UxgGvnd~Gp?8CnAcDlN{y5H*R=HLJR{s#bd!(T%%O~9O*XVo3G-FC-4 z0kex=ks^2h{+vs1%>h6}I^2XdH+K>=2@zgQ})MxI}QRRR`F zSXHg=hIQZff=F2fSc5^hD$+`=NR{fA)eByB^3We-L)e`-;Pv(TVxBE zv0K|i`>-*IZ>k9{!Kj52HVc@K4)l0eb=*-27sXCf-}HDFBwQSCYPL(Shblnzlq2C1 z0h_1#OvZPO^l{IPaQf}BsA+$eH7-GqgHC@}$D_b7BQKCJETGUcLB$Vo*e(HUays1@A**YJW{CTBqg)PD*@zVC zdazG0iK&U3d6R&3{b$q7iV;K-4hdL4$cj(3gj=(DnGVgwY?E-?IeY~zKk_6L2QSmN z8(tI{B}YlPqt7x^QXcK&tz)8Bl;f)aH|_3h((@wfk&UP7UID9mb^=f9c-T3c_h;ox z3}|5z9?WidsvqUU5-b5r?xy@{$ctXGT_b1(=71{a49?0F!12Ll0CsaHWYYOVg9~0aN6;@ z%MT9;Z)6Wd%4ORQH}b84OZB6&gm(s-)af>TFISF~j34C2(=q6lsE=}TG1TJ%^-1-g-m@vZh%T>X-lknb1~WfMO4 z_}M4nn{4$<-w<5Yhu~WQTYK`kb5`{I?H9=5z-!o+3Wnf&0o!`)Y0d4okbV>sqvUzj z?uZ`+Z0{Z6q(&4S^jxfX&F+w&vo)=K$PdyvJ)&F;hQj$Z>%1HOA;We%OBmy)RBH%+ z7ckrtPkiZg)^MO$9BZ$mGwjdoMzv$YhjGpDr$jahAn<3dXA#uVLKFILf$>ag6Z*!+Y{+T zZBmMuv?3<8h)FMEQjC~1Bi@_vXu|svChe&IK*FRSwMju@(vX-`ByO*S^rSW^N=%v( zld8m|D={fcOxhA3OSqJfS1pJ0=0e}1t2iao) literal 4134 zcmai0XLsC06nzttnDnxf-W!3CNO9s2dP#_r0D+JNLI+tI@5vHyX&}amHY}kS4DLZlX?|}-<7qq<8$WeBM77Ciz9@nsv`tAxX7BsgS zT2ZX_xk*(e6_S%(ctNe^`ZYuIz=#fKmw|vPv`i1=Ff)S+t!RI7R6LplVTD!+S}@{_ z8cjcLhG7sT%Bj#A9fYqEW2lv=p{C=sDzr|}5=1@H^xZ^b=q4)CiE#zZ*kkN9`YW_C zi)ylo4%}+Qk~RyPuN|0aE=`?BN#~_bbKlH#?UK$tVYDttsg+b7Kd3n2amW z8});6U(!V-?qj&WSkSU=_qxM$)R?481+6XXRAb6dvdmmAXk$;CTn4WcWSrg3befGu zD^hk4Ig+j}Sr~%Lt$m-M6=iO-=&lvCvaGv3!(dU@I%Y`wO{-RmRLx41*7Z=2U@}u% zC-XW%>wC{;+I1^RB;6or!&FwhmnGd;tjm08wyriwN6+FbYK2K4>DbiE4BfFHNvt7H zNxG%SGILVi*27!J#H=eXRFO{F?Zu+!MKlvv@2Wcmt?J5z-mSxNXK&tJlrJ;D!X({W zOn9ze%cl=sN%srdTs{rFm_x2_MXkslkTf*4rOoNoN0B5)(55MT#);)S7HW97xQFr~ zp1|g>7qgVw@GjH`ZF%^-4Ttp-<5rxgh9s|8GO3@uk>4xn4a<%Kty$PB8sF8W6cy_u zog<6_t$EUtln7c~nwwZ3byiI)GA3wgmqqNEPGpTsI#G-->oaRA(5rl~)F5{zJX}1} zvLH6P6}Go9h=U|6D8x~{7Lj=F>P_IFNH{7u9BWEo>N(G)3YQ!Q_Si_ zw`nDzr00qUZO%j=2dFtc(+kCd%h{*pN-qk1rmZj6 zamyQ(^hxn_|{WG9J)e)p$;)94)iV;W7T8AQ_;(@g$6m(D#& zG@IsdYaZhQ#zl-3jZ0{$#@V!-aV6twjYMnp|9aZMxQ{mB6K!GK%6I|eg^W8GO~!u4 z-Hdw}_cC6>cp2jrj8`#U!?>UE0OLW%!;IH69$~zR@n*&<_z2@;jE^&(Vtk76G~=_3&ojQr_%h?GjIT4k z$@n(oyNvHMe#rPS3))Zy3~j(r2i*1qozR9-U}yz~ zT43k}hGJl728L>2=my@OF|!E z40XZK7i?z?jnS@U44u)2(qL!}hT3504Tj=iXby(zVCW8p@?dBWhWcRW4?dMKY5?ui z8KVx+MkRnz3t&_O81(=~MSxKgU{nPdbpb|YfKeM@R0kOK0iI50=sWs>e$r>b8U5uK M-4gVhZVUS3e<1;2VgLXD 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/