Skip to content

Update log4j to 2.17.1 to fix DDOS attacks #780

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

Merged
adahn6 merged 2 commits into from
Jan 13, 2022
Merged

Update log4j to 2.17.1 to fix DDOS attacks #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36908c
Update log4j to 2.17.1 to fix DDOS attacks
tsmock Dec 16, 2021
e25cae9
Gradle: Exclude log4j 1.2.17 from osgeo repo
tsmock Jan 13, 2022
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
12 changes: 9 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ targetCompatibility=11
repositories
{
// For geotools
maven { url "http://repo.osgeo.org/repository/release/" }
maven {
url "https://repo.osgeo.org/repository/release/"
content {
// osgeo removed the jar and added a -norce version
excludeVersion("log4j", "log4j", "1.2.17")
}
}
mavenCentral()
}

Expand Down Expand Up @@ -81,8 +87,8 @@ dependencies
checkstyle packages.atlas_checkstyle

shaded project.configurations.getByName('compile')
shaded packages.slf4j.log4j12
shaded packages.log4j
shaded packages.log4j.api
shaded packages.log4j.slf4j

}

Expand Down
11 changes: 6 additions & 5 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ project.ext.versions = [
junit4: '4.13.1',
junit5: '5.8.1',
jacoco: '0.8.3',
slf4j: '1.7.12',
log4j: '1.2.17',
slf4j: '1.7.32',
log4j: '2.17.1',
opencsv: '2.3',
gson: '2.2.4',
http: '4.5.1',
Expand Down Expand Up @@ -44,10 +44,11 @@ project.ext.packages = [
],
slf4j: [
api: "org.slf4j:slf4j-api:${versions.slf4j}",
simple: "org.slf4j:slf4j-simple:${versions.slf4j}",
log4j12: "org.slf4j:slf4j-log4j12:${versions.slf4j}",
],
log4j: "log4j:log4j:${versions.log4j}",
log4j: [
api: "org.apache.logging.log4j:log4j:${versions.log4j}",
slf4j: "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}",
],
opencsv: "net.sf.opencsv:opencsv:${versions.opencsv}",
gson: "com.google.code.gson:gson:${versions.gson}",
http: "org.apache.httpcomponents:httpclient:${versions.http}",
Expand Down
4 changes: 2 additions & 2 deletions gradle/quality.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ configurations

dependencies
{
testCompile packages.slf4j.log4j12
testCompile packages.log4j
testCompile packages.log4j.slf4j
testCompile packages.log4j.api
// Support Junit 5 tests
testImplementation packages.junit.api
testRuntimeOnly packages.junit.engine
Expand Down