From c135f04fa45d38c455440290fc8294756f127a3d Mon Sep 17 00:00:00 2001 From: David Powers <37314042+dapowers87@users.noreply.github.com> Date: Fri, 10 Dec 2021 12:52:13 -0600 Subject: [PATCH] Upgrade log4j to 2.15.0 (#718) Signed-off-by: David Powers --- THIRD-PARTY | 4 ++-- build.gradle | 4 ++-- data-prepper-plugins/opensearch/build.gradle | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/THIRD-PARTY b/THIRD-PARTY index ec429770db..20d4cbd9bb 100644 --- a/THIRD-PARTY +++ b/THIRD-PARTY @@ -34,8 +34,8 @@ ** gRPC; version 1.38.1 -- https://github.com/grpc/grpc ** aws-java-sdk-core; version 1.12.43 -- https://aws.amazon.com/sdk-for-java/ ** guava; version 31.0.1-jre -- https://github.com/google/guava -** log4j-slf4j-impl; version 2.14.1 -- https://logging.apache.org/log4j/2.x/ -** Log4j-core; version 2.14.1 -- https://logging.apache.org/log4j/2.x/ +** log4j-slf4j-impl; version 2.15.0 -- https://logging.apache.org/log4j/2.x/ +** Log4j-core; version 2.15.0 -- https://logging.apache.org/log4j/2.x/ ** armeria-grpc; version 1.9.2 -- https://github.com/line/armeria ** Kotlin; version 1.5.30 -- https://github.com/JetBrains/kotlin ** micrometer; version 1.7.2 -- https://github.com/micrometer-metrics/micrometer diff --git a/build.gradle b/build.gradle index 1d62b33882..9fd6a962e3 100644 --- a/build.gradle +++ b/build.gradle @@ -50,9 +50,9 @@ subprojects { } dependencies { implementation 'com.google.guava:guava:31.0.1-jre' - implementation 'org.apache.logging.log4j:log4j-core:2.14.1' + implementation 'org.apache.logging.log4j:log4j-core:2.15.0' implementation 'org.slf4j:slf4j-api:1.7.30' - implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.1' + implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.15.0' testImplementation platform("org.junit:junit-bom:${versionMap.junitJupiter}") testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.junit.vintage:junit-vintage-engine' diff --git a/data-prepper-plugins/opensearch/build.gradle b/data-prepper-plugins/opensearch/build.gradle index d714db55b6..e99dfcc779 100644 --- a/data-prepper-plugins/opensearch/build.gradle +++ b/data-prepper-plugins/opensearch/build.gradle @@ -91,8 +91,8 @@ configurations.all { force 'com.google.guava:guava:31.0.1-jre' force 'junit:junit:4.13.2' force "org.slf4j:slf4j-api:1.7.32" - force "org.apache.logging.log4j:log4j-api:2.14.1" - force "org.apache.logging.log4j:log4j-core:2.14.1" + force "org.apache.logging.log4j:log4j-api:2.15.0" + force "org.apache.logging.log4j:log4j-core:2.15.0" force 'commons-beanutils:commons-beanutils:1.9.4' } // The OpenSearch plugins appear to provide their own version of Mockito