Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to log4j 1.17, fixes CVE-2021-45105 #764

Merged
merged 1 commit into from
Dec 20, 2021
Merged

Upgrade to log4j 1.17, fixes CVE-2021-45105 #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ subprojects {
}
implementation('org.apache.logging.log4j:log4j-core') {
version {
require '2.16.0'
require '2.17.0'
}
because 'Log4j 2.16.0 fixes CVE-2021-44228 and CVE-2021-45046'
because 'Log4j 2.17.0 fixes CVE-2021-45105, CVE-2021-44228 and CVE-2021-45046'
}
implementation('org.apache.logging.log4j:log4j-api') {
version {
require '2.16.0'
require '2.17.0'
}
because 'the build fails if the Log4j API is not update along with log4j-core'
}
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
implementation 'io.micrometer:micrometer-registry-prometheus'
implementation 'io.micrometer:micrometer-registry-cloudwatch2'
implementation 'software.amazon.awssdk:cloudwatch'
implementation platform('org.apache.logging.log4j:log4j-bom:2.16.0')
implementation platform('org.apache.logging.log4j:log4j-bom:2.17.0')
implementation 'org.apache.logging.log4j:log4j-core'
implementation 'org.apache.logging.log4j:log4j-slf4j-impl'
testImplementation "org.hamcrest:hamcrest:2.2"
Expand Down
4 changes: 2 additions & 2 deletions data-prepper-plugins/opensearch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,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.16.0'
force 'org.apache.logging.log4j:log4j-core:2.16.0'
force 'org.apache.logging.log4j:log4j-api:2.17.0'
force 'org.apache.logging.log4j:log4j-core:2.17.0'
force 'commons-beanutils:commons-beanutils:1.9.4'
}
// The OpenSearch plugins appear to provide their own version of Mockito
Expand Down