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 log4j to 2.16.0 #81759

Closed
wants to merge 2 commits into from
Closed

Upgrade log4j to 2.16.0 #81759

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
98656eb
Upgrade log4j to 2.16.0
arteam Dec 15, 2021
a18d19d
Revert "Patch log4j JAR to remove JndiLookup class (#81629)"
arteam Dec 15, 2021
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
2 changes: 1 addition & 1 deletion build-tools-internal/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ snakeyaml = 1.26
icu4j = 68.2
supercsv = 2.4.0
# when updating log4j, please update also docs/java-api/index.asciidoc
log4j = 2.15.0
log4j = 2.16.0
slf4j = 1.6.2
ecsLogging = 1.2.0

Expand Down
4 changes: 0 additions & 4 deletions distribution/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,6 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
}
}
}
all {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should remove this in a separate PR.
Possibly a simple revert of this whole commit 9a3422e

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me extract the revert into a separate PR and then we can rebase this PR when the revert gets merged

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Submitted as #81783

resolutionStrategy.dependencySubstitution {
substitute module("org.apache.logging.log4j:log4j-core") using project(":libs:elasticsearch-log4j") because "patched to remove JndiLookup clas"}
}
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion libs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

configure(subprojects - project('elasticsearch-log4j')) {
subprojects {
/*
* All subprojects are java projects using Elasticsearch's standard build
* tools.
Expand Down
28 changes: 0 additions & 28 deletions libs/log4j/build.gradle
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modules/repository-url/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/repository-url/licenses/log4j-1.2-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecbcfa4162e35b831705e97bbee546f81280ee6f
1 change: 0 additions & 1 deletion plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecbcfa4162e35b831705e97bbee546f81280ee6f
1 change: 0 additions & 1 deletion plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecbcfa4162e35b831705e97bbee546f81280ee6f
1 change: 0 additions & 1 deletion plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecbcfa4162e35b831705e97bbee546f81280ee6f
1 change: 0 additions & 1 deletion plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecbcfa4162e35b831705e97bbee546f81280ee6f
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/log4j-1.2-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecbcfa4162e35b831705e97bbee546f81280ee6f
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4cc7712ebb4744681db815679248e4312f61b32
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecbcfa4162e35b831705e97bbee546f81280ee6f
1 change: 0 additions & 1 deletion server/licenses/log4j-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/log4j-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4727d93a76616ffc4149dffac5801827c0f4ac71
1 change: 0 additions & 1 deletion server/licenses/log4j-core-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/log4j-core-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ca12fb3902ecfcba1e1357ebfc55407acec30ede
1 change: 0 additions & 1 deletion x-pack/plugin/core/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x-pack/plugin/core/licenses/log4j-1.2-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecbcfa4162e35b831705e97bbee546f81280ee6f
1 change: 0 additions & 1 deletion x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4cc7712ebb4744681db815679248e4312f61b32
1 change: 0 additions & 1 deletion x-pack/plugin/security/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x-pack/plugin/security/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4cc7712ebb4744681db815679248e4312f61b32
1 change: 0 additions & 1 deletion x-pack/plugin/sql/sql-action/licenses/log4j-api-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x-pack/plugin/sql/sql-action/licenses/log4j-api-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4727d93a76616ffc4149dffac5801827c0f4ac71
1 change: 0 additions & 1 deletion x-pack/plugin/sql/sql-action/licenses/log4j-core-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x-pack/plugin/sql/sql-action/licenses/log4j-core-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ca12fb3902ecfcba1e1357ebfc55407acec30ede
1 change: 0 additions & 1 deletion x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4cc7712ebb4744681db815679248e4312f61b32