From fee2c2a11eb0e92f1f9ddf2278fbc01a8eabef7f Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 13 Sep 2022 10:48:55 +0000 Subject: [PATCH] test with log4j 2.19.0 rc1 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1904044 13f79535-47bb-0310-9956-ffa450edef68 --- build.gradle | 6 +++--- osgi/pom.xml | 2 +- poi-excelant/build.gradle | 4 ++-- poi-integration/build.gradle | 4 ++-- poi-ooxml/build.gradle | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 7cfda74fb5..6ac61b1b79 100644 --- a/build.gradle +++ b/build.gradle @@ -150,7 +150,7 @@ subprojects { commonsIoVersion = '2.11.0' commonsMathVersion = '3.6.1' junitVersion = '5.9.0' - log4jVersion = '2.18.0' + log4jVersion = '2.19.0' mockitoVersion = '4.8.0' hamcrestVersion = '2.2' xmlbeansVersion = '5.1.1' @@ -178,7 +178,7 @@ subprojects { all { resolutionStrategy { force "commons-io:commons-io:${commonsIoVersion}" - force 'org.slf4j:slf4j-api:1.7.36' + force 'org.slf4j:slf4j-api:2.0.0' force 'com.fasterxml.woodstox:woodstox-core:6.3.1' } } @@ -193,7 +193,7 @@ subprojects { repositories { mavenCentral() - //maven { url 'https://repository.apache.org/content/repositories/staging' } + maven { url 'https://repository.apache.org/content/repositories/staging' } } dependencies { diff --git a/osgi/pom.xml b/osgi/pom.xml index bf46c5d18a..08d99bc9a4 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -231,7 +231,7 @@ org.apache.logging.log4j log4j-core - 2.18.0 + 2.19.0 test diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle index 3d357acc83..ef96c88077 100644 --- a/poi-excelant/build.gradle +++ b/poi-excelant/build.gradle @@ -46,8 +46,8 @@ dependencies { exclude group: 'org.apache.poi', module: 'poi-scratchpad' } testImplementation 'com.google.guava:guava:31.1-jre' - testImplementation "org.apache.logging.log4j:log4j-slf4j18-impl:${log4jVersion}" - testImplementation 'org.slf4j:slf4j-simple:1.7.36' + testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}" + testImplementation 'org.slf4j:slf4j-simple:2.0.0' testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}" if (SAXON_TEST) { diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle index 6b667ce647..0318c2f7af 100644 --- a/poi-integration/build.gradle +++ b/poi-integration/build.gradle @@ -77,8 +77,8 @@ dependencies { } } testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives') - testImplementation "org.apache.logging.log4j:log4j-slf4j18-impl:${log4jVersion}" - testImplementation 'org.slf4j:slf4j-simple:1.7.36' + testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}" + testImplementation 'org.slf4j:slf4j-simple:2.0.0' testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}" if (SAXON_TEST) { diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index 80a5e4470b..f8dad94e98 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -144,8 +144,8 @@ 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-slf4j18-impl:${log4jVersion}" - testImplementation 'org.slf4j:slf4j-simple:1.7.36' + testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}" + testImplementation 'org.slf4j:slf4j-simple:2.0.0' if (SAXON_TEST) { testRuntimeOnly "net.sf.saxon:Saxon-HE:${saxonVersion}"