diff --git a/.classpath b/.classpath
index 7d9628dbdf..210a5651ef 100644
--- a/.classpath
+++ b/.classpath
@@ -20,16 +20,16 @@
-
+
-
-
+
+
-
-
+
+
@@ -38,12 +38,12 @@
-
+
-
-
-
+
+
+
diff --git a/build.gradle b/build.gradle
index 87ed66d6ff..e9b71861df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,9 +44,9 @@ configurations {
}
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 @@ subprojects {
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 @@ project('ooxml') {
}
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 @@ project('ooxml') {
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 @@ project('ooxml') {
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 @@ project('excelant') {
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 @@ project('integrationtest') {
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 ed892e98f8..5293432ec3 100644
--- a/build.xml
+++ b/build.xml
@@ -273,33 +273,33 @@ under the License.
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
@@ -309,18 +309,18 @@ under the License.
-
+
-
-
-
+
+
+
-
+
@@ -617,6 +617,7 @@ under the License.
+
@@ -2394,12 +2395,12 @@ under the License.
-
-
-
+
+
+
-
-
+
+
diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index 6f2e240de9..98a57b28fc 100644
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -1,5 +1,4 @@
-
-
-
+
- 4.0.0
- org.apache.poi
- poi-ooxml
- @VERSION@
- jar
- Apache POI
- https://poi.apache.org/
- Apache POI - Java API To Access Microsoft Format Files
+ 4.0.0
+ org.apache.poi
+ poi-ooxml
+ @VERSION@
+ jar
+ Apache POI
+ https://poi.apache.org/
+ Apache POI - Java API To Access Microsoft Format Files
-
-
- POI Users List
- user-subscribe@poi.apache.org
- user-unsubscribe@poi.apache.org
- http://mail-archives.apache.org/mod_mbox/poi-user/
-
-
- POI Developer List
- dev-subscribe@poi.apache.org
- dev-unsubscribe@poi.apache.org
- http://mail-archives.apache.org/mod_mbox/poi-dev/
-
-
+
+
+ POI Users List
+ user-subscribe@poi.apache.org
+ user-unsubscribe@poi.apache.org
+ http://mail-archives.apache.org/mod_mbox/poi-user/
+
+
+ POI Developer List
+ dev-subscribe@poi.apache.org
+ dev-unsubscribe@poi.apache.org
+ http://mail-archives.apache.org/mod_mbox/poi-dev/
+
+
-
-
- Apache License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
+
+
+ Apache License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
-
- Apache Software Foundation
- http://www.apache.org/
-
+
+ Apache Software Foundation
+ http://www.apache.org/
+
-
-
- org.apache.poi
- poi
- @VERSION@
-
-
- org.apache.poi
- poi-ooxml-schemas
- @VERSION@
-
-
- org.apache.commons
- commons-compress
- 1.20
-
-
- com.github.virtuald
- curvesapi
- 1.06
-
-
+
+
+ org.apache.poi
+ poi
+ @VERSION@
+
+
+ org.apache.poi
+ poi-ooxml-schemas
+ @VERSION@
+
+
+ org.apache.commons
+ commons-compress
+ 1.20
+
+
+ com.github.virtuald
+ curvesapi
+ 1.06
+
+
+ org.bouncycastle
+ bcpkix-jdk15on
+ 1.67
+
+
+ org.bouncycastle
+ bcprov-jdk15on
+ 1.67
+
+
+ org.apache.santuario
+ xmlsec
+ 2.2.0
+
+
+ org.apache.xmlgraphics
+ batik-all
+ 1.13
+
+
+ de.rototor.pdfbox
+ graphics2d
+ 0.28
+
+
diff --git a/maven/poi.pom b/maven/poi.pom
index 8699cef120..4b99095f18 100644
--- a/maven/poi.pom
+++ b/maven/poi.pom
@@ -104,7 +104,7 @@
junit
junit
test
- 4.13
+ 4.13.1
diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index 0bea755b41..73e92fe264 100644
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -108,7 +108,7 @@
org.apache.ant
ant
- 1.10.8
+ 1.10.9
diff --git a/sonar/integration-test/pom.xml b/sonar/integration-test/pom.xml
index d28861c891..bfa37a2028 100644
--- a/sonar/integration-test/pom.xml
+++ b/sonar/integration-test/pom.xml
@@ -112,13 +112,13 @@
org.openjdk.jmh
jmh-core
- 1.25
+ 1.26
test
org.apache.ant
ant
- 1.10.8
+ 1.10.9
test
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 36bddf0d32..6ba47032dc 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -127,12 +127,12 @@
org.bouncycastle
bcpkix-jdk15on
- 1.66
+ 1.67
org.bouncycastle
bcprov-jdk15on
- 1.66
+ 1.67
org.apache.santuario
@@ -166,35 +166,31 @@
org.openjdk.jmh
jmh-core
- 1.25
+ 1.26
test
org.openjdk.jmh
jmh-generator-annprocess
- 1.25
+ 1.26
test
com.google.guava
guava
- 29.0-jre
+ 30.0-jre
test
-
-
org.apache.xmlgraphics
batik-all
1.13
-
-
de.rototor.pdfbox
graphics2d
- 0.27
+ 0.28
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 62301c2a46..7a5f429f8f 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -80,9 +80,9 @@
4.0.0
- 4.13
- 2.7.0
- 3.5.15
+ 4.13.1
+ 2.8.0
+ 3.6.0
3.2.0
3.2.0
3.1.0
diff --git a/src/multimodule/ooxml/java9/module-info.class b/src/multimodule/ooxml/java9/module-info.class
index 51342739ec..dbea856eea 100644
Binary files a/src/multimodule/ooxml/java9/module-info.class and b/src/multimodule/ooxml/java9/module-info.class differ
diff --git a/src/multimodule/ooxml/java9/module-info.java b/src/multimodule/ooxml/java9/module-info.java
index 2ae4916646..a3eb0a90bd 100644
--- a/src/multimodule/ooxml/java9/module-info.java
+++ b/src/multimodule/ooxml/java9/module-info.java
@@ -84,14 +84,14 @@ module org.apache.poi.ooxml {
/* 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