Skip to content

Commit 383ab3f

Browse files
[AUTO] Increment version to 3.9.0-SNAPSHOT (#1457)
Co-authored-by: Amit Galitzky <amgalitz@amazon.com> Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
1 parent e11deda commit 383ab3f

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

build.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import java.nio.file.Paths
99

1010
buildscript {
1111
ext {
12-
opensearch_version = System.getProperty("opensearch.version", "3.8.0-SNAPSHOT")
12+
opensearch_version = System.getProperty("opensearch.version", "3.9.0-SNAPSHOT")
1313
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
1414
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
1515
version_tokens = opensearch_version.tokenize('-')
@@ -257,8 +257,12 @@ dependencies {
257257
// Jackson dependencies
258258
implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson_annotations}")
259259
implementation("tools.jackson.core:jackson-databind:${versions.jackson3_databind}")
260-
// Required by swagger-parser at runtime (no longer provided transitively by upstream)
260+
// Jackson 2.x stack required by swagger-parser at runtime. OpenSearch core has migrated to
261+
// Jackson 3 (tools.jackson), so these are no longer provided transitively by upstream.
262+
implementation("com.fasterxml.jackson.core:jackson-core:${versions.jackson}")
261263
implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
264+
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson_databind}")
265+
implementation("org.yaml:snakeyaml:${versions.snakeyaml}")
262266

263267
testImplementation("org.junit.jupiter:junit-jupiter:${junitJupiterVersion}")
264268
testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson_databind}")
@@ -284,6 +288,11 @@ dependencies {
284288
// to an older version than the one declared via the version catalog, causing a version conflict.
285289
// Pin to the catalog version to resolve it.
286290
force("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson_annotations}")
291+
// opensearch-remote-metadata-sdk pins log4j at the version of the core snapshot it was
292+
// last built against, which lags the log4j that OpenSearch core currently ships.
293+
// Pin to the core version so we always match core (and keep its CVE fixes).
294+
force("org.apache.logging.log4j:log4j-api:${versions.log4j}")
295+
force("org.apache.logging.log4j:log4j-core:${versions.log4j}")
287296

288297
if (System.getenv('REMOTE_METADATA_SDK_IMPL') == 'ddb-client') {
289298
// OpenSearch Java client brings in different versions of the below dependencies.

0 commit comments

Comments
 (0)