From: PJ Fanning Date: Sat, 30 Dec 2023 13:08:39 +0000 (+0000) Subject: slf4j 2.0.10 X-Git-Tag: REL_5_3_0~135 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fb1aaf1e4e7fcf29d88e60d42ddf606061c35ce8;p=poi.git slf4j 2.0.10 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1914998 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build.gradle b/build.gradle index 00a4831c34..362f721cd1 100644 --- a/build.gradle +++ b/build.gradle @@ -152,7 +152,7 @@ subprojects { all { resolutionStrategy { force "commons-io:commons-io:${commonsIoVersion}" - force 'org.slf4j:slf4j-api:2.0.9' + force 'org.slf4j:slf4j-api:2.0.10' force 'com.fasterxml.woodstox:woodstox-core:6.5.1' } } diff --git a/build.xml b/build.xml index 70f81a01ee..e40d7664e4 100644 --- a/build.xml +++ b/build.xml @@ -339,7 +339,7 @@ under the License. - + diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle index c8dd00fed3..cba2d480ab 100644 --- a/poi-excelant/build.gradle +++ b/poi-excelant/build.gradle @@ -43,7 +43,7 @@ dependencies { } testImplementation 'com.google.guava:guava:32.1.1-jre' testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}" - testImplementation 'org.slf4j:slf4j-simple:2.0.9' + testImplementation 'org.slf4j:slf4j-simple:2.0.10' testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}" } diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle index c3d700356f..f607600f1a 100644 --- a/poi-integration/build.gradle +++ b/poi-integration/build.gradle @@ -76,7 +76,7 @@ dependencies { } testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives') testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}" - testImplementation 'org.slf4j:slf4j-simple:2.0.9' + testImplementation 'org.slf4j:slf4j-simple:2.0.10' testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}" } diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index 0211ccdf22..7dec491063 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -125,7 +125,7 @@ dependencies { // prevent slf4j warnings coming from xmlsec -> slf4j-api 1.7.x dependency // see https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/ testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}" - testImplementation 'org.slf4j:slf4j-simple:2.0.9' + testImplementation 'org.slf4j:slf4j-simple:2.0.10' broken("org.apache.xmlgraphics:batik-script:${batikVersion}"){ exclude group: 'xalan', module: 'xalan' 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 07ae49b4c2..feb281c955 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,8 +155,8 @@ import org.w3c.dom.events.MutationEvent; * in the classpath:

*
    *
  • BouncyCastle bcpkix and bcprov (tested against 1.77)
  • - *
  • Apache Santuario "xmlsec" (tested against 4.0.0)
  • - *
  • and log4j-api (tested against 2.21.x)
  • + *
  • Apache Santuario "xmlsec" (tested against 3.0.x)
  • + *
  • and log4j-api (tested against 2.22.x)
  • *
*/ public class SignatureInfo {