Skip to content

Commit 442a13a

Browse files
authored
Upgrade log4j to 2.15.0 (#81709)
Originally we tried to a log4j update in #47298, but we were unable to that due to the `DeprecationLoggerTests.testLogPermissions` test failing. The test relied on mocking and got removed in https://github.com/elastic/elasticsearch/pull/61474/files#diff-70de5a6ba5c637e7f19c51341417760d6e957beb5a1fa5703049095ea2719ee0L47 Now we should be able to the upgrade and then we can address the Security Manager permission questions raised in #47298 separately. * Initialize pattern layout with AccessController.doPrivileged We need the `getClassLoader` permissions * Disable the SecurityManager for command testing because of `CommandLoggingConfigurator` which fails under the `SecurityManager`
1 parent d00f414 commit 442a13a

File tree

46 files changed

+49
-24
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+49
-24
lines changed

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ snakeyaml = 1.26
1414
icu4j = 68.2
1515
supercsv = 2.4.0
1616
# when updating log4j, please update also docs/java-api/index.asciidoc
17-
log4j = 2.11.1
17+
log4j = 2.15.0
1818
slf4j = 1.6.2
1919
ecsLogging = 1.2.0
2020

modules/repository-url/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ tasks.named("thirdPartyAudit").configure {
4040
'javax.servlet.ServletContextListener',
4141
'org.apache.avalon.framework.logger.Logger',
4242
'org.apache.log.Hierarchy',
43-
'org.apache.log.Logger'
43+
'org.apache.log.Logger',
44+
'javax.jms.Message'
4445
)
4546
}
4647

modules/repository-url/licenses/log4j-1.2-api-2.11.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bc960fe2acbe6f3952011f88a771de18301534e7

plugins/discovery-azure-classic/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ tasks.named("thirdPartyAudit").configure {
116116
'org.apache.avalon.framework.logger.Logger',
117117
'org.apache.log.Hierarchy',
118118
'org.apache.log.Logger',
119+
'javax.jms.Message',
119120
'org.eclipse.persistence.descriptors.ClassDescriptor',
120121
'org.eclipse.persistence.internal.oxm.MappingNodeValue',
121122
'org.eclipse.persistence.internal.oxm.TreeObjectBuilder',

plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bc960fe2acbe6f3952011f88a771de18301534e7

plugins/discovery-ec2/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ tasks.named("thirdPartyAudit").configure {
125125
'org.apache.avalon.framework.logger.Logger',
126126
'org.apache.log.Hierarchy',
127127
'org.apache.log.Logger',
128+
'javax.jms.Message',
128129
'javax.xml.bind.DatatypeConverter',
129130
'javax.xml.bind.JAXBContext'
130131
)

plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bc960fe2acbe6f3952011f88a771de18301534e7

0 commit comments

Comments
 (0)