aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2021-12-28 19:15:32 +0000
committerPJ Fanning <fanningpj@apache.org>2021-12-28 19:15:32 +0000
commit79a1e6b1e90c613958f91739f15c5f8512f7ee0b (patch)
tree3dcc19c78d705903308d3938ef68d71d01b6b33c
parentd442ea645c543fd86a41ca9a88f96b8e0c0aae4d (diff)
downloadpoi-79a1e6b1e90c613958f91739f15c5f8512f7ee0b.tar.gz
poi-79a1e6b1e90c613958f91739f15c5f8512f7ee0b.zip
log4j 2.17.1
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1896481 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.gradle2
-rw-r--r--build.xml10
-rw-r--r--osgi/pom.xml2
-rw-r--r--poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java2
4 files changed, 8 insertions, 8 deletions
diff --git a/build.gradle b/build.gradle
index b0dffcf419..22944f879d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,7 +119,7 @@ subprojects {
commonsIoVersion = '2.11.0'
commonsMathVersion = '3.6.1'
junitVersion = '5.8.2'
- log4jVersion = '2.17.0'
+ log4jVersion = '2.17.1'
mockitoVersion = '4.2.0'
hamcrestVersion = '2.2'
xmlbeansVersion = '5.0.3'
diff --git a/build.xml b/build.xml
index 32bf95914a..00e1f85a36 100644
--- a/build.xml
+++ b/build.xml
@@ -268,7 +268,7 @@ under the License.
<dependency prefix="main.commons-math3" artifact="org.apache.commons:commons-math3:3.6.1" usage="main"/>
<dependency prefix="main.commons-io" artifact="commons-io:commons-io:2.11.0" usage="main"/>
<dependency prefix="main.com.zaxxer" artifact="com.zaxxer:SparseBitSet:1.2" usage="main"/>
- <dependency prefix="main.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.17.0" usage="main"/>
+ <dependency prefix="main.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.17.1" usage="main"/>
<dependency prefix="main.junit-api" artifact="org.junit.jupiter:junit-jupiter-api:5.8.2" usage="main-tests"/>
<dependency prefix="main.junit-jengine" artifact="org.junit.jupiter:junit-jupiter-engine:5.8.2" usage="main-tests"/>
@@ -288,7 +288,7 @@ under the License.
<dependency prefix="main.byte-buddy" artifact="net.bytebuddy:byte-buddy:1.12.3" usage="main-tests"/>
<dependency prefix="main.byte-buddy-agent" artifact="net.bytebuddy:byte-buddy-agent:1.12.3" usage="main-tests"/>
<dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:3.1" usage="main-tests"/>
- <dependency prefix="main.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.17.0" usage="main-tests"/>
+ <dependency prefix="main.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.17.1" usage="main-tests"/>
<dependency prefix="main.commons-logging" artifact="commons-logging:commons-logging:1.2" usage="main-tests"/>
<dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.9" usage="excelant"/>
@@ -2580,9 +2580,9 @@ under the License.
<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:68.2" usage="${spotbugs.lib}" target="icu4j-63.1.jar"/>
- <dependency prefix="spotbugs.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.17.0" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.17.0" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.log4j-slf4j18-impl" artifact="org.apache.logging.log4j:log4j-slf4j18-impl:2.17.0" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.17.1" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.17.1" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.log4j-slf4j18-impl" artifact="org.apache.logging.log4j:log4j-slf4j18-impl:2.17.1" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.saxon" artifact="net.sf.saxon:Saxon-HE:9.9.1-8" usage="${spotbugs.lib}"/>
<mkdir dir="${basedir}${spotbugs.lib}/config"/>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 5e6f41181b..ee206a9d7e 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -231,7 +231,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.17.0</version>
+ <version>2.17.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
index 24881ec670..bd2d9aeb78 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
@@ -155,7 +155,7 @@ import org.w3c.dom.events.MutationEvent;
* <ul>
* <li>BouncyCastle bcpkix and bcprov (tested against 1.70)</li>
* <li>Apache Santuario "xmlsec" (tested against 2.3.0)</li>
- * <li>and log4j-api (tested against 2.17.0)</li>
+ * <li>and log4j-api (tested against 2.17.1)</li>
* </ul>
*/
public class SignatureInfo {