update dependencies - make optional dependencies mandatory
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1883325 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.classpath b/.classpath
index 7d9628d..210a565 100644
--- a/.classpath
+++ b/.classpath
@@ -20,16 +20,16 @@
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ooxml/xmlbeans-4.0.0.jar" sourcepath="lib/ooxml/xmlbeans-3.1.0.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
- <classpathentry kind="lib" path="lib/junit-4.13.jar"/>
+ <classpathentry kind="lib" path="lib/junit-4.13.1.jar"/>
<classpathentry kind="lib" path="lib/ooxml/curvesapi-1.06.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ooxml/ooxml-schemas-1.4.jar" sourcepath="lib/ooxml/ooxml-schemas-1.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ooxml/ooxml-security-1.1.jar" sourcepath="lib/ooxml/ooxml-security-1.1-sources.jar"/>
- <classpathentry kind="lib" path="lib/jmh-core-1.19.jar"/>
- <classpathentry kind="lib" path="lib/jmh-generator-annprocess-1.19.jar"/>
+ <classpathentry kind="lib" path="lib/main-tests/jmh-core-1.26.jar"/>
+ <classpathentry kind="lib" path="lib/main-tests/jmh-generator-annprocess-1.26.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry exported="true" kind="lib" path="compile-lib/slf4j-api-1.7.30.jar"/>
- <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.66.jar"/>
- <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.66.jar"/>
+ <classpathentry kind="lib" path="lib/ooxml-provided/bcpkix-jdk15on-1.67.jar"/>
+ <classpathentry kind="lib" path="lib/ooxml-provided/bcprov-jdk15on-1.67.jar"/>
<classpathentry kind="lib" path="ooxml-tests/reflections.jar"/>
<classpathentry kind="lib" path="ooxml-tests/guava.jar"/>
<classpathentry kind="lib" path="ooxml-tests/javassist.jar"/>
@@ -38,12 +38,12 @@
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.4.jar"/>
<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
- <classpathentry kind="lib" path="lib/xmlunit-core-2.5.1.jar"/>
+ <classpathentry kind="lib" path="lib/main-tests/xmlunit-core-2.8.0.jar"/>
<classpathentry kind="lib" path="lib/objenesis-2.6.jar"/>
<classpathentry kind="lib" path="lib/commons-compress-1.20.jar"/>
- <classpathentry kind="lib" path="lib/mockito-core-3.5.15.jar"/>
- <classpathentry kind="lib" path="lib/byte-buddy-1.10.1.jar"/>
- <classpathentry kind="lib" path="lib/byte-buddy-agent-1.10.1.jar"/>
+ <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="lib/SparseBitSet-1.2.jar"/>
<classpathentry kind="output" path="bin"/>
diff --git a/build.gradle b/build.gradle
index 87ed66d..e9b7186 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,9 +44,9 @@
}
dependencies {
- antLibs("junit:junit:4.13")
- antLibs("org.apache.ant:ant-junit:1.10.8")
- antLibs("org.apache.ant:ant-junit4:1.10.8")
+ antLibs("junit:junit:4.13.1")
+ antLibs("org.apache.ant:ant-junit:1.10.9")
+ antLibs("org.apache.ant:ant-junit4:1.10.9")
}
ant.taskdef(name: "junit",
@@ -107,13 +107,13 @@
version = '5.0.0-SNAPSHOT'
ext {
- bouncyCastleVersion = '1.66'
+ bouncyCastleVersion = '1.67'
commonsCodecVersion = '1.15'
commonsCompressVersion = '1.20'
commonsMathVersion = '3.6.1'
japicmpversion = '4.1.2'
- junitVersion = '4.13'
- mockitoVersion = '3.5.15'
+ junitVersion = '4.13.1'
+ mockitoVersion = '3.6.0'
xmlbeansVersion = '4.0.0'
}
@@ -263,7 +263,7 @@
}
dependencies {
- antdep 'org.apache.ant:ant:1.10.8'
+ antdep 'org.apache.ant:ant:1.10.9'
}
// we need to ensure that the custom ant tasks are compiled before we import the build.xml file
@@ -293,8 +293,8 @@
compile 'xml-apis:xml-apis-ext:1.3.04'
compile 'org.apache.xmlgraphics:xmlgraphics-commons:2.4'
- compile 'org.apache.pdfbox:pdfbox:2.0.19'
- compile 'org.apache.pdfbox:fontbox:2.0.19'
+ compile 'org.apache.pdfbox:pdfbox:2.0.21'
+ compile 'org.apache.pdfbox:fontbox:2.0.21'
compile 'de.rototor.pdfbox:graphics2d:0.28'
// for ooxml-lite, should we move this somewhere else?
@@ -306,12 +306,12 @@
testCompile "junit:junit:${junitVersion}"
testCompile "org.mockito:mockito-core:${mockitoVersion}"
- testCompile 'org.xmlunit:xmlunit-core:2.7.0'
+ testCompile 'org.xmlunit:xmlunit-core:2.8.0'
testCompile 'org.reflections:reflections:0.9.12'
testCompile project(path: ':main', configuration: 'tests')
- testCompile 'org.openjdk.jmh:jmh-core:1.25'
- testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.25'
- testCompile 'com.google.guava:guava:29.0-jre'
+ testCompile 'org.openjdk.jmh:jmh-core:1.26'
+ testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.26'
+ testCompile 'com.google.guava:guava:30.0-jre'
}
jar {
@@ -352,7 +352,7 @@
sourceSets.test.java.srcDirs = ['../../src/excelant/testcases']
dependencies {
- compile 'org.apache.ant:ant:1.10.8'
+ compile 'org.apache.ant:ant:1.10.9'
compile project(':main')
compile project(':ooxml')
@@ -374,7 +374,7 @@
sourceSets.test.java.srcDirs = ['../../src/integrationtest']
dependencies {
- compile 'org.apache.ant:ant:1.10.8'
+ compile 'org.apache.ant:ant:1.10.9'
compile project(':main')
compile project(':ooxml')
diff --git a/build.xml b/build.xml
index ed892e9..5293432 100644
--- a/build.xml
+++ b/build.xml
@@ -273,33 +273,33 @@
<dependency prefix="main.commons-math3" artifact="org.apache.commons:commons-math3:3.6.1" usage="main"/>
<dependency prefix="main.com.zaxxer" artifact="com.zaxxer:SparseBitSet:1.2" usage="main"/>
- <dependency prefix="main.junit" artifact="junit:junit:4.13" usage="main-tests"/>
- <dependency prefix="main.jmh" artifact="org.openjdk.jmh:jmh-core:1.25" usage="main-tests"/>
- <dependency prefix="main.jmhAnnotation" artifact="org.openjdk.jmh:jmh-generator-annprocess:1.25" usage="main-tests"/>
+ <dependency prefix="main.junit" artifact="junit:junit:4.13.1" usage="main-tests"/>
+ <dependency prefix="main.jmh" artifact="org.openjdk.jmh:jmh-core:1.26" usage="main-tests"/>
+ <dependency prefix="main.jmhAnnotation" artifact="org.openjdk.jmh:jmh-generator-annprocess:1.26" usage="main-tests"/>
<dependency prefix="main.hamcrest" artifact="org.hamcrest:hamcrest:2.2" usage="main-tests"/>
- <dependency prefix="main.xmlunit" artifact="org.xmlunit:xmlunit-core:2.7.0" usage="main-tests"/>
- <dependency prefix="main.mockito" artifact="org.mockito:mockito-core:3.5.15" usage="main-tests"/>
- <dependency prefix="main.byte-buddy" artifact="net.bytebuddy:byte-buddy:1.10.14" usage="main-tests"/>
- <dependency prefix="main.byte-buddy-agent" artifact="net.bytebuddy:byte-buddy-agent:1.10.14" usage="main-tests"/>
+ <dependency prefix="main.xmlunit" artifact="org.xmlunit:xmlunit-core:2.8.0" usage="main-tests"/>
+ <dependency prefix="main.mockito" artifact="org.mockito:mockito-core:3.6.0" usage="main-tests"/>
+ <dependency prefix="main.byte-buddy" artifact="net.bytebuddy:byte-buddy:1.10.18" usage="main-tests"/>
+ <dependency prefix="main.byte-buddy-agent" artifact="net.bytebuddy:byte-buddy-agent:1.10.18" usage="main-tests"/>
<dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:3.1" usage="main-tests"/>
- <dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.8" usage="excelant"/>
- <dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.8" usage="excelant"/>
+ <dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.9" usage="excelant"/>
+ <dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.9" usage="excelant"/>
<!-- xml signature libs - not part of the distribution -->
<dependency prefix="dsig.xmlsec" artifact="org.apache.santuario:xmlsec:2.2.0" usage="ooxml-provided"/>
- <dependency prefix="dsig.bouncycastle-prov" artifact="org.bouncycastle:bcprov-ext-jdk15on:1.66" usage="ooxml-provided"/>
- <dependency prefix="dsig.bouncycastle-pkix" artifact="org.bouncycastle:bcpkix-jdk15on:1.66" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-prov" artifact="org.bouncycastle:bcprov-jdk15on:1.67" usage="ooxml-provided"/>
+ <dependency prefix="dsig.bouncycastle-pkix" artifact="org.bouncycastle:bcpkix-jdk15on:1.67" usage="ooxml-provided"/>
<dependency prefix="dsig.slf4j-api" artifact="org.slf4j:slf4j-api:1.7.30" usage="ooxml-provided"/>
<!-- only used for signing the release - not used with the ooxml signatures -->
- <dependency prefix="dsig.bouncycastle-bcpg" artifact="org.bouncycastle:bcpg-jdk15on:1.66" usage="util"/>
+ <dependency prefix="dsig.bouncycastle-bcpg" artifact="org.bouncycastle:bcpg-jdk15on:1.67" usage="util"/>
<!-- 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="pdf.pdfbox" artifact="org.apache.pdfbox:pdfbox:2.0.19" usage="ooxml-provided"/>
- <dependency prefix="pdf.fontbox" artifact="org.apache.pdfbox:fontbox:2.0.19" usage="ooxml-provided"/>
+ <dependency prefix="pdf.pdfbox" artifact="org.apache.pdfbox:pdfbox:2.0.21" usage="ooxml-provided"/>
+ <dependency prefix="pdf.fontbox" artifact="org.apache.pdfbox:fontbox:2.0.21" usage="ooxml-provided"/>
<dependency prefix="pdf.graphics2d" artifact="de.rototor.pdfbox:graphics2d:0.28" usage="ooxml-provided"/>
<!-- jars in the ooxml-lib directory, see the fetch-ooxml-jars target-->
@@ -309,18 +309,18 @@
<!-- jars in the ooxml-test-lib directory, see the fetch-ooxml-jars target-->
<dependency prefix="ooxml.test.reflections" artifact="org.reflections:reflections:0.9.12" usage="ooxml-tests"/>
- <dependency prefix="ooxml.test.guava" artifact="com.google.guava:guava:29.0-jre" usage="ooxml-tests"/>
+ <dependency prefix="ooxml.test.guava" artifact="com.google.guava:guava:30.0-jre" usage="ooxml-tests"/>
<dependency prefix="ooxml.test.javassist" artifact="org.javassist:javassist:3.27.0-GA" usage="ooxml-tests"/>
<!-- coverage libs -->
<dependency prefix="jacoco" artifact="org.jacoco:jacoco:0.8.6" usage="util" packaging="zip"/>
- <dependency prefix="asm" artifact="org.ow2.asm:asm:9.0-beta" usage="util"/>
- <dependency prefix="asm-commons" artifact="org.ow2.asm:asm-commons:9.0-beta" usage="util"/>
- <dependency prefix="asm-tree" artifact="org.ow2.asm:asm-tree:9.0-beta" usage="util"/>
+ <dependency prefix="asm" artifact="org.ow2.asm:asm:9.0" usage="util"/>
+ <dependency prefix="asm-commons" artifact="org.ow2.asm:asm-commons:9.0" usage="util"/>
+ <dependency prefix="asm-tree" artifact="org.ow2.asm:asm-tree:9.0" usage="util"/>
<!-- license and api checks -->
<dependency prefix="rat" artifact="org.apache.rat:apache-rat:0.13" usage="util"/>
- <dependency prefix="forbidden" artifact="de.thetaphi:forbiddenapis:3.0.1" usage="util"/>
+ <dependency prefix="forbidden" artifact="de.thetaphi:forbiddenapis:3.1" usage="util"/>
<property name="maven.ooxml.xsds.version.id" value="1.5"/>
@@ -617,6 +617,7 @@
<fileset dir="${basedir}/lib/ooxml-provided">
<include name="bcpkix-jdk15on-1.65.jar"/>
<include name="bcprov-ext-jdk15on-1.65.jar"/>
+ <include name="bcprov-ext-jdk15on-1.66.jar"/>
</fileset>
<fileset dir="${basedir}/lib/ooxml-tests">
<include name="guava-20.0.jar"/>
@@ -2394,12 +2395,12 @@
<dependency prefix="spotbugs.asm-tree" artifact="org.ow2.asm:asm-tree:9.0" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.asm-util" artifact="org.ow2.asm:asm-util:9.0" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.jsr305" artifact="com.google.code.findbugs:jsr305:3.0.2" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.dom4j" artifact="org.dom4j:dom4j:2.1.1" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.jaxen" artifact="jaxen:jaxen:1.1.6" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.bcel" artifact="org.apache.bcel:bcel:6.4.1" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.dom4j" artifact="org.dom4j:dom4j:2.1.3" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.jaxen" artifact="jaxen:jaxen:1.2.0" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.bcel" artifact="org.apache.bcel:bcel:6.5.0" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.slf4j-api" artifact="org.slf4j:slf4j-api:1.8.0-beta4" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.commons-lang3" artifact="org.apache.commons:commons-lang3:3.10" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.commons-text" artifact="org.apache.commons:commons-text:1.8" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.commons-lang3" artifact="org.apache.commons:commons-lang3:3.11" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.commons-text" artifact="org.apache.commons:commons-text:1.9" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.jcip-annotations" artifact="net.jcip:jcip-annotations:1.0" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.icu4j" artifact="com.ibm.icu:icu4j:63.2" usage="${spotbugs.lib}" target="icu4j-63.1.jar"/>
<dependency prefix="spotbugs.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.13.1" usage="${spotbugs.lib}"/>
diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index 6f2e240..98a57b2 100644
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<!--
+<?xml version="1.0"?><!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -18,66 +17,89 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>@VERSION@</version>
- <packaging>jar</packaging>
- <name>Apache POI</name>
- <url>https://poi.apache.org/</url>
- <description>Apache POI - Java API To Access Microsoft Format Files</description>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>@VERSION@</version>
+ <packaging>jar</packaging>
+ <name>Apache POI</name>
+ <url>https://poi.apache.org/</url>
+ <description>Apache POI - Java API To Access Microsoft Format Files</description>
- <mailingLists>
- <mailingList>
- <name>POI Users List</name>
- <subscribe>user-subscribe@poi.apache.org</subscribe>
- <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
- </mailingList>
- <mailingList>
- <name>POI Developer List</name>
- <subscribe>dev-subscribe@poi.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
- </mailingList>
- </mailingLists>
+ <mailingLists>
+ <mailingList>
+ <name>POI Users List</name>
+ <subscribe>user-subscribe@poi.apache.org</subscribe>
+ <unsubscribe>user-unsubscribe@poi.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/poi-user/</archive>
+ </mailingList>
+ <mailingList>
+ <name>POI Developer List</name>
+ <subscribe>dev-subscribe@poi.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@poi.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/poi-dev/</archive>
+ </mailingList>
+ </mailingLists>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
- <dependencies>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>@VERSION@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- <version>@VERSION@</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.20</version>
- </dependency>
- <dependency>
- <groupId>com.github.virtuald</groupId>
- <artifactId>curvesapi</artifactId>
- <version>1.06</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>@VERSION@</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ <version>@VERSION@</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.20</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.virtuald</groupId>
+ <artifactId>curvesapi</artifactId>
+ <version>1.06</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>1.67</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.67</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-all</artifactId>
+ <version>1.13</version>
+ </dependency>
+ <dependency>
+ <groupId>de.rototor.pdfbox</groupId>
+ <artifactId>graphics2d</artifactId>
+ <version>0.28</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/maven/poi.pom b/maven/poi.pom
index 8699cef..4b99095 100644
--- a/maven/poi.pom
+++ b/maven/poi.pom
@@ -104,7 +104,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>4.13</version>
+ <version>4.13.1</version>
</dependency>
</dependencies>
diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index 0bea755..73e92fe 100644
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.8</version>
+ <version>1.10.9</version>
</dependency>
</dependencies>
</project>
diff --git a/sonar/integration-test/pom.xml b/sonar/integration-test/pom.xml
index d28861c..bfa37a2 100644
--- a/sonar/integration-test/pom.xml
+++ b/sonar/integration-test/pom.xml
@@ -112,13 +112,13 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.25</version>
+ <version>1.26</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.8</version>
+ <version>1.10.9</version>
<scope>test</scope>
</dependency>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 36bddf0..6ba4703 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -127,12 +127,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.66</version>
+ <version>1.67</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.66</version>
+ <version>1.67</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
@@ -166,35 +166,31 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.25</version>
+ <version>1.26</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
- <version>1.25</version>
+ <version>1.26</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>29.0-jre</version>
+ <version>30.0-jre</version>
<scope>test</scope>
</dependency>
-
<dependency>
- <!-- don't add it to the distribution -->
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-all</artifactId>
<version>1.13</version>
</dependency>
-
<dependency>
- <!-- don't add it to the distribution -->
<groupId>de.rototor.pdfbox</groupId>
<artifactId>graphics2d</artifactId>
- <version>0.27</version>
+ <version>0.28</version>
</dependency>
</dependencies>
</project>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 62301c2..7a5f429 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -80,9 +80,9 @@
<!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
<xmlbeans.version>4.0.0</xmlbeans.version>
- <junit.version>4.13</junit.version>
- <xmlunit.version>2.7.0</xmlunit.version>
- <mockito.version>3.5.15</mockito.version>
+ <junit.version>4.13.1</junit.version>
+ <xmlunit.version>2.8.0</xmlunit.version>
+ <mockito.version>3.6.0</mockito.version>
<maven.plugin.resources.version>3.2.0</maven.plugin.resources.version>
<maven.plugin.jar.version>3.2.0</maven.plugin.jar.version>
<maven.plugin.clean.version>3.1.0</maven.plugin.clean.version>
diff --git a/src/multimodule/ooxml/java9/module-info.class b/src/multimodule/ooxml/java9/module-info.class
index 5134273..dbea856 100644
--- a/src/multimodule/ooxml/java9/module-info.class
+++ b/src/multimodule/ooxml/java9/module-info.class
Binary files differ
diff --git a/src/multimodule/ooxml/java9/module-info.java b/src/multimodule/ooxml/java9/module-info.java
index 2ae4916..a3eb0a9 100644
--- a/src/multimodule/ooxml/java9/module-info.java
+++ b/src/multimodule/ooxml/java9/module-info.java
@@ -84,14 +84,14 @@
/* optional dependencies for xml signatures - you need to add a require entry to your module-info
* or add them via the --add-modules JVM argument */
requires java.xml.crypto;
- requires static org.apache.santuario.xmlsec;
- requires static org.bouncycastle.provider;
- requires static org.bouncycastle.pkix;
+ requires org.apache.santuario.xmlsec;
+ requires org.bouncycastle.provider;
+ requires org.bouncycastle.pkix;
/* optional dependencies for slideshow rendering via PPTX2PNG */
- requires static batik.all;
- requires static org.apache.pdfbox;
- requires static org.apache.fontbox;
- requires static de.rototor.pdfbox.graphics2d;
- requires static xmlgraphics.commons;
+ requires batik.all;
+ requires org.apache.pdfbox;
+ requires org.apache.fontbox;
+ requires de.rototor.pdfbox.graphics2d;
+ requires xmlgraphics.commons;
}
\ No newline at end of file
