From 1e50886b5424de56d6fae60f3b64ccba4003eeaf Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 14 Sep 2022 09:31:40 +0000 Subject: [PATCH] log4j 2.19.0 rc2 may not need hamcrest build hack git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1904064 13f79535-47bb-0310-9956-ffa450edef68 --- poi-excelant/build.gradle | 4 +--- poi-integration/build.gradle | 4 +--- poi-ooxml/build.gradle | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle index 72bb1bf74d..ef96c88077 100644 --- a/poi-excelant/build.gradle +++ b/poi-excelant/build.gradle @@ -46,9 +46,7 @@ dependencies { exclude group: 'org.apache.poi', module: 'poi-scratchpad' } testImplementation 'com.google.guava:guava:31.1-jre' - testImplementation ("org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}") { - exclude group: 'org.hamcrest', module: 'hamcrest-core' - } + testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}" testImplementation 'org.slf4j:slf4j-simple:2.0.0' testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}" diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle index 3dd62c2e44..0318c2f7af 100644 --- a/poi-integration/build.gradle +++ b/poi-integration/build.gradle @@ -77,9 +77,7 @@ dependencies { } } testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives') - testImplementation ("org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}") { - exclude group: 'org.hamcrest', module: 'hamcrest-core' - } + testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}" testImplementation 'org.slf4j:slf4j-simple:2.0.0' testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}" diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index 8b0ca8515a..f8dad94e98 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -144,9 +144,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}") { - exclude group: 'org.hamcrest', module: 'hamcrest-core' - } + testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}" testImplementation 'org.slf4j:slf4j-simple:2.0.0' if (SAXON_TEST) {