Update maven dependencies
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1885371 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven/poi-ooxml.pom b/maven/poi-ooxml.pom
index 4592bef..0645ae7 100644
--- a/maven/poi-ooxml.pom
+++ b/maven/poi-ooxml.pom
@@ -113,11 +113,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.30</version>
- <optional>true</optional>
- </dependency>
</dependencies>
</project>
diff --git a/maven/poi.pom b/maven/poi.pom
index dcfb602..8af45c0 100644
--- a/maven/poi.pom
+++ b/maven/poi.pom
@@ -62,6 +62,11 @@
<version>1.7.30</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.30</version>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
diff --git a/sonar/integration-test/pom.xml b/sonar/integration-test/pom.xml
index df77176..a7e8ff2 100644
--- a/sonar/integration-test/pom.xml
+++ b/sonar/integration-test/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.26</version>
+ <version>1.27</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 1846931..972c14d 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -101,6 +101,21 @@
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.30</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.30</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.15</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
@@ -111,24 +126,9 @@
<version>3.6.1</version>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.15</version>
- </dependency>
- <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>SparseBitSet</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.30</version>
- </dependency>
</dependencies>
</project>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 8ae9d05..7e68bfa 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -1,6 +1,4 @@
-<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
+<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>
<parent>
@@ -86,14 +84,15 @@
</configuration>
</plugin>
-
<!-- set jvm parameters for surefire plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.plugin.surefire.version}</version>
<configuration>
- <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=${basedir}/target/tmp -XX:-OmitStackTraceInFastThrow</argLine>
+ <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m
+ -Djava.io.tmpdir=${basedir}/target/tmp -XX:-OmitStackTraceInFastThrow
+ </argLine>
</configuration>
</plugin>
</plugins>
@@ -119,25 +118,25 @@
</dependency>
<dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${xmlbeans.version}</version>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>${xmlbeans.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.67</version>
+ <version>1.68</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.67</version>
+ <version>1.68</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <version>2.2.0</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -149,6 +148,28 @@
<artifactId>curvesapi</artifactId>
<version>1.06</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-all</artifactId>
+ <version>1.13</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>de.rototor.pdfbox</groupId>
+ <artifactId>graphics2d</artifactId>
+ <version>0.30</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.reflections</groupId>
@@ -156,35 +177,23 @@
<version>0.9.12</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>1.26</version>
+ <version>1.27</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
- <version>1.26</version>
+ <version>1.27</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>30.0-jre</version>
+ <version>30.1-jre</version>
<scope>test</scope>
</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.30</version>
- </dependency>
</dependencies>
</project>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 3ae96c2..eb11b1d 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -81,8 +81,8 @@
<!-- 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>5.7.0</junit.version>
- <xmlunit.version>2.8.0</xmlunit.version>
- <mockito.version>3.6.0</mockito.version>
+ <xmlunit.version>2.8.2</xmlunit.version>
+ <mockito.version>3.6.28</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>
