Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump OpenTelemetry from 1.30.1 to 1.31.0 ([#10617](https://github.com/opensearch-project/OpenSearch/pull/10617))
- Bump `org.codehaus.woodstox:stax2-api` from 4.2.1 to 4.2.2 ([#10639](https://github.com/opensearch-project/OpenSearch/pull/10639))
- Bump `org.bouncycastle:bc-fips` from 1.0.2.3 to 1.0.2.4 ([#10297](https://github.com/opensearch-project/OpenSearch/pull/10297))
- Bump `org.apache.logging.log4j:log4j-core` from 2.20.0 to 2.21.0 ([#10858](https://github.com/opensearch-project/OpenSearch/pull/10858))

### Changed
- Add the means to extract the contextual properties from HttpChannel, TcpCChannel and TrasportChannel without excessive typecasting ([#10562](https://github.com/opensearch-project/OpenSearch/pull/10562))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ plugins {
repositories {
mavenCentral()
}

dependencies {
implementation "org.apache.logging.log4j:log4j-core:2.20.0"
implementation "org.apache.logging.log4j:log4j-core:2.21.0"
}

["0.0.1", "0.0.2"].forEach { v ->
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jackson_databind = 2.15.2
snakeyaml = 2.1
icu4j = 70.1
supercsv = 2.4.0
log4j = 2.20.0
log4j = 2.21.0
slf4j = 1.7.36
asm = 9.6
jettison = 1.5.4
Expand Down
1 change: 0 additions & 1 deletion libs/core/licenses/log4j-api-2.20.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/core/licenses/log4j-api-2.21.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
760192f2b69eacf4a4afc78e5a1d7a8de054fcbd

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12bad3819a9570807f3c97315930699584c12152

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12bad3819a9570807f3c97315930699584c12152

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12bad3819a9570807f3c97315930699584c12152

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12bad3819a9570807f3c97315930699584c12152

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12bad3819a9570807f3c97315930699584c12152

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
911fdb5b1a1df36719c579ecc6f2957b88bce1ab

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12bad3819a9570807f3c97315930699584c12152
5 changes: 5 additions & 0 deletions qa/os/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ tasks.dependenciesInfo.enabled = false

tasks.thirdPartyAudit.ignoreMissingClasses()

tasks.thirdPartyAudit.ignoreViolations(
'org.apache.logging.log4j.core.util.internal.UnsafeUtil',
'org.apache.logging.log4j.core.util.internal.UnsafeUtil$1'
)

tasks.register('destructivePackagingTest') {
dependsOn 'destructiveDistroTest'
}
Expand Down
9 changes: 8 additions & 1 deletion server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,11 @@ tasks.named("thirdPartyAudit").configure {
'org.osgi.framework.SynchronousBundleListener',
'org.osgi.framework.wiring.BundleWire',
'org.osgi.framework.wiring.BundleWiring',
'org.zeromq.SocketType',
'org.zeromq.ZContext',
'org.zeromq.ZMonitor',
'org.zeromq.ZMonitor$Event',
'org.zeromq.ZMonitor$ZEvent',
'org.zeromq.ZMQ$Context',
'org.zeromq.ZMQ$Socket',
'org.zeromq.ZMQ',
Expand All @@ -358,7 +363,9 @@ tasks.named("thirdPartyAudit").configure {
'com.google.protobuf.UnsafeUtil$Android32MemoryAccessor',
'com.google.protobuf.UnsafeUtil$Android64MemoryAccessor',
'com.google.protobuf.UnsafeUtil$JvmMemoryAccessor',
'com.google.protobuf.UnsafeUtil$MemoryAccessor'
'com.google.protobuf.UnsafeUtil$MemoryAccessor',
'org.apache.logging.log4j.core.util.internal.UnsafeUtil',
'org.apache.logging.log4j.core.util.internal.UnsafeUtil$1'
)
}

Expand Down
1 change: 0 additions & 1 deletion server/licenses/log4j-api-2.20.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/log4j-api-2.21.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
760192f2b69eacf4a4afc78e5a1d7a8de054fcbd
1 change: 0 additions & 1 deletion server/licenses/log4j-core-2.20.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/log4j-core-2.21.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
122e1a9e0603cc9eae07b0846a6ff01f2454bc49
1 change: 0 additions & 1 deletion server/licenses/log4j-jul-2.20.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/log4j-jul-2.21.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f0da61113f4a47654677e6a98b1e13ca7de2483d