diff options
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | build.xml | 9 | ||||
| -rw-r--r-- | maven/poi-ooxml.pom | 2 | ||||
| -rw-r--r-- | osgi/README.md | 6 | ||||
| -rw-r--r-- | sonar/ooxml/pom.xml | 2 | ||||
| -rw-r--r-- | src/multimodule/poi/java9/module-info.class | bin | 3314 -> 3314 bytes |
7 files changed, 12 insertions, 13 deletions
diff --git a/.classpath b/.classpath index d11178bfe0..cd1b17113b 100644 --- a/.classpath +++ b/.classpath @@ -43,7 +43,7 @@ <classpathentry kind="lib" path="lib/mockito-core-3.6.0.jar"/> <classpathentry kind="lib" path="lib/main-tests/byte-buddy-1.10.18.jar"/> <classpathentry kind="lib" path="lib/main-tests/byte-buddy-agent-1.10.18.jar"/> - <classpathentry kind="lib" path="compile-lib/batik-all-1.12.jar"/> + <classpathentry kind="lib" path="compile-lib/batik-all-1.14.jar"/> <classpathentry kind="lib" path="lib/SparseBitSet-1.2.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/build.gradle b/build.gradle index 6a09be92d8..7e07fa11eb 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,7 @@ subprojects { version = '5.0.1-SNAPSHOT' ext { - bouncyCastleVersion = '1.67' + bouncyCastleVersion = '1.68' commonsCodecVersion = '1.15' commonsCompressVersion = '1.20' commonsMathVersion = '3.6.1' @@ -311,7 +311,7 @@ project('ooxml') { compile 'com.zaxxer:SparseBitSet:1.2' // compile only, don't add it to our dist as it blows up the size - compile 'org.apache.xmlgraphics:batik-all:1.13' + compile 'org.apache.xmlgraphics:batik-all:1.14' compile 'xml-apis:xml-apis-ext:1.3.04' compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.4' @@ -304,7 +304,7 @@ under the License. <!-- svg/batik/pdf libs - not part of the distribution --> <dependency prefix="svg.xml-apis-ext" artifact="xml-apis:xml-apis-ext:1.3.04" usage="ooxml-provided"/> <dependency prefix="svg.xmlgraphics-commons" artifact="org.apache.xmlgraphics:xmlgraphics-commons:2.4" usage="ooxml-provided"/> - <dependency prefix="svg.batik-all" artifact="org.apache.xmlgraphics:batik-all:1.13" usage="ooxml-provided"/> + <dependency prefix="svg.batik-all" artifact="org.apache.xmlgraphics:batik-all:1.14" usage="ooxml-provided"/> <dependency prefix="pdf.pdfbox" artifact="org.apache.pdfbox:pdfbox:2.0.22" usage="ooxml-provided"/> <dependency prefix="pdf.fontbox" artifact="org.apache.pdfbox:fontbox:2.0.22" usage="ooxml-provided"/> <dependency prefix="pdf.graphics2d" artifact="de.rototor.pdfbox:graphics2d:0.30" usage="ooxml-provided"/> @@ -635,10 +635,9 @@ under the License. <include name="xmlbeans-3.1.0.jar"/> </fileset> <fileset dir="${basedir}/lib/ooxml-provided"> - <include name="bcpkix-jdk15on-1.65.jar"/> - <include name="bcpkix-jdk15on-1.66.jar"/> - <include name="bcprov-ext-jdk15on-1.65.jar"/> - <include name="bcprov-ext-jdk15on-1.66.jar"/> + <include name="bc*-1.65.jar"/> + <include name="bc*-1.66.jar"/> + <include name="batik*-1.13.jar"/> </fileset> <fileset dir="${basedir}/lib/ooxml-tests"> <include name="guava-20.0.jar"/> diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom index 0645ae7990..4f8f7ff40b 100644 --- a/maven/poi-ooxml.pom +++ b/maven/poi-ooxml.pom @@ -94,7 +94,7 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-all</artifactId> - <version>1.13</version> + <version>1.14</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/osgi/README.md b/osgi/README.md index 0ccbebf5d9..7ba8bd7f7f 100644 --- a/osgi/README.md +++ b/osgi/README.md @@ -16,18 +16,18 @@ The bundle embeds all the jars from lib/main: ## Optional Dependencies 1. Apache Batik -Required to render WMF/EMF images. The OSGi bundle is provided by ServiceMix and available in Maven Central: https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.batik/1.13_1 +Required to render WMF/EMF images. The OSGi bundle is provided by ServiceMix and available in Maven Central: https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.batik/1.14_1 2. Saxon Required if using as the XSLT and XQuery Processor engine in XML Beans. Available in Maven Central: https://mvnrepository.com/artifact/net.sf.saxon/saxon/8.9.0.4-osgi 3. Apache XML Security for Java, Bouncy Castle and XML Commons Resolver These are required to sign or validate signed Office documents. The OSGi bundles are available in Maven Central: - - Apache XML Security for Java: https://mvnrepository.com/artifact/org.apache.santuario/xmlsec/2.2.0 + - Apache XML Security for Java: https://mvnrepository.com/artifact/org.apache.santuario/xmlsec/2.2.1 - XML Commons Resolver: https://mvnrepository.com/artifact/xml-resolver/xml-resolver/1.2-osgi - - Bouncy Castle: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on/1.66, https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.66 + - Bouncy Castle: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on/1.68, https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.68 4. PDFBox and PDFBox Graphics2D Required to render to PDF documents. The required jars can be downloaded from: diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index c406c8816f..6da633343d 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -151,7 +151,7 @@ <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>batik-all</artifactId> - <version>1.13</version> + <version>1.14</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/src/multimodule/poi/java9/module-info.class b/src/multimodule/poi/java9/module-info.class Binary files differindex 5a2694941f..3a40124eb2 100644 --- a/src/multimodule/poi/java9/module-info.class +++ b/src/multimodule/poi/java9/module-info.class |