Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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 @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Dependencies

### Deprecated
- Bump `log4j` from 2.21.0 to 2.25.3 ([#20308](https://github.com/opensearch-project/OpenSearch/pull/20308))

### Removed

Expand Down
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jackson_databind = "2.18.2"
snakeyaml = "2.1"
icu4j = "75.1"
supercsv = "2.4.0"
log4j = "2.21.0"
log4j = "2.25.3"
error_prone_annotations = "2.45.0"
slf4j = "1.7.36"
asm = "9.7"
jettison = "1.5.4"
Expand Down
1 change: 1 addition & 0 deletions libs/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ tasks.named("thirdPartyAudit").configure {
'org.osgi.framework.SynchronousBundleListener',
'org.osgi.framework.wiring.BundleWire',
'org.osgi.framework.wiring.BundleWiring',
'org.osgi.framework.wiring.BundleRevision',
] + (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_20) ? [] : [
'jdk.incubator.vector.ByteVector',
'jdk.incubator.vector.FloatVector',
Expand Down
1 change: 0 additions & 1 deletion libs/core/licenses/log4j-api-2.21.0.jar.sha1

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a7e550e638a5e534fd944616c5ae665a67e9501e
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ static PermissionCollection getRestrictedPermissions() {
Permissions perms = new Permissions();
// property/env access needed for parsing
perms.add(new PropertyPermission("*", "read"));
perms.add(new RuntimePermission("getenv.TIKA_CONFIG"));
perms.add(new RuntimePermission("getenv.*"));
Comment thread
cwperks marked this conversation as resolved.
Resolved

try {
// add permissions for resource access:
Expand Down

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4a173925524d8f6c3f39ae8954ee348e8244afd7
1 change: 0 additions & 1 deletion plugins/repository-s3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,6 @@ thirdPartyAudit {
'org.jboss.marshalling.MarshallingConfiguration',
'org.jboss.marshalling.Unmarshaller',

'org.slf4j.ext.EventData',
'reactor.blockhound.BlockHound$Builder',
'reactor.blockhound.integration.BlockHoundIntegration',

Expand Down

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4a173925524d8f6c3f39ae8954ee348e8244afd7
2 changes: 1 addition & 1 deletion plugins/transport-grpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ opensearchplugin {
dependencies {
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
runtimeOnly "com.google.guava:guava:${versions.guava}"
implementation "com.google.errorprone:error_prone_annotations:2.24.1"
compileOnly "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}"
implementation "com.google.guava:failureaccess:1.0.1"
implementation "io.grpc:grpc-api:${versions.grpc}"
implementation "io.grpc:grpc-core:${versions.grpc}"
Expand Down

This file was deleted.

202 changes: 0 additions & 202 deletions plugins/transport-grpc/licenses/error_prone_annotations-LICENSE.txt

This file was deleted.

Empty file.
7 changes: 7 additions & 0 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ dependencies {
api libs.log4japi
api libs.log4jjul
api libs.log4jcore, optional

compileOnlyApi "org.jspecify:jspecify:1.0.0"
compileOnlyApi "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}"

annotationProcessor libs.log4jcore
annotationProcessor project(':libs:opensearch-common')

Expand Down Expand Up @@ -229,6 +233,7 @@ tasks.named("thirdPartyAudit").configure {
*[
// from com.fasterxml.jackson.dataformat.yaml.YAMLMapper (jackson-dataformat-yaml)
'com.fasterxml.jackson.databind.ObjectMapper',
'com.fasterxml.jackson.databind.util.ClassUtil',

// from log4j
'com.conversantmedia.util.concurrent.SpinPolicy',
Expand All @@ -255,6 +260,7 @@ tasks.named("thirdPartyAudit").configure {
'org.fusesource.jansi.Ansi',
'org.fusesource.jansi.AnsiRenderer$Code',
'com.lmax.disruptor.EventFactory',
'com.lmax.disruptor.EventHandler',
'com.lmax.disruptor.EventTranslator',
'com.lmax.disruptor.EventTranslatorTwoArg',
'com.lmax.disruptor.EventTranslatorVararg',
Expand Down Expand Up @@ -305,6 +311,7 @@ tasks.named("thirdPartyAudit").configure {
'org.osgi.framework.ServiceReference',
'org.osgi.framework.ServiceRegistration',
'org.osgi.framework.SynchronousBundleListener',
'org.osgi.framework.wiring.BundleRevision',
'org.osgi.framework.wiring.BundleWire',
'org.osgi.framework.wiring.BundleWiring',
'org.zeromq.SocketType',
Expand Down
1 change: 0 additions & 1 deletion server/licenses/log4j-api-2.21.0.jar.sha1

This file was deleted.

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

This file was deleted.

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

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/log4j-jul-2.25.3.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
08bba6d5a56f11931c218c016c96b740e238abbc
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ public void testSkipDuplicates() throws Exception {
int weight = randomIntBetween(0, 100);
weights[id] = Math.max(weight, weights[id]);
String suggestion = "suggestion-" + String.format(Locale.ENGLISH, "%03d", id);
logger.info("Creating {}, id {}, weight {}", suggestion, i, id, weight);
logger.info("Creating {}, i {}, id {}, weight {}", suggestion, i, id, weight);
indexRequestBuilders.add(
client().prepareIndex(INDEX)
.setRefreshPolicy(WAIT_UNTIL)
Expand All @@ -1193,12 +1193,12 @@ public void testSkipDuplicates() throws Exception {
indexRandom(true, indexRequestBuilders);

Arrays.sort(termIds, Comparator.comparingInt(o -> weights[(int) o]).reversed().thenComparingInt(a -> (int) a));
logger.info("Expected terms id ordered {}", (Object[]) termIds);
logger.info("Expected terms id ordered {}", Arrays.toString(termIds));
String[] expected = new String[numUnique];
for (int i = 0; i < termIds.length; i++) {
expected[i] = "suggestion-" + String.format(Locale.ENGLISH, "%03d", termIds[i]);
}
logger.info("Expected suggestions field values {}", (Object[]) expected);
logger.info("Expected suggestions field values {}", Arrays.toString(expected));
CompletionSuggestionBuilder completionSuggestionBuilder = SuggestBuilders.completionSuggestion(FIELD)
.prefix("sugg")
.skipDuplicates(true)
Expand Down
Loading
Loading