diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index c1f84201db3d..678bfe0d802f 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -7,8 +7,8 @@ bundled_jdk = 20.0.1+9@b4887098932d415489976708ad6d1a4b # optional dependencies spatial4j = 0.7 jts = 1.15.0 -jackson = 2.14.2 -snakeyaml = 1.33 +jackson = 2.15.0 +snakeyaml = 2.0 icu4j = 68.2 supercsv = 2.4.0 log4j = 2.19.0 diff --git a/docs/changelog/95641.yaml b/docs/changelog/95641.yaml new file mode 100644 index 000000000000..5a843a406ea2 --- /dev/null +++ b/docs/changelog/95641.yaml @@ -0,0 +1,5 @@ +pr: 95641 +summary: Upgrade Jackson xml to 2.15.0 +area: Infra/Core +type: upgrade +issues: [] diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 51a857071d1c..643a4915a617 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -1,6 +1,6 @@ [versions] -asm = "9.3" -jackson = "2.14.2" +asm = "9.4" +jackson = "2.15.0" junit5 = "5.8.1" spock = "2.1-groovy-3.0" @@ -35,7 +35,7 @@ junit5-vintage = { group = "org.junit.vintage", name="junit-vintage-engine", ver maven-model = "org.apache.maven:maven-model:3.6.2" mockito-core = "org.mockito:mockito-core:1.9.5" nebula-info = "com.netflix.nebula:gradle-info-plugin:11.3.3" -shadow-plugin = "gradle.plugin.com.github.johnrengelman:shadow:7.1.2" +shadow-plugin = "gradle.plugin.com.github.johnrengelman:shadow:8.0.0" spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" } spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" } spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 1e31a951e970..6de3ca465b06 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -64,6 +64,11 @@ + + + + + @@ -244,6 +249,11 @@ + + + + + @@ -259,6 +269,11 @@ + + + + + @@ -274,16 +289,31 @@ + + + + + + + + + + + + + + + @@ -294,6 +324,11 @@ + + + + + @@ -1099,6 +1134,11 @@ + + + + + @@ -2431,6 +2471,11 @@ + + + + + @@ -2441,6 +2486,11 @@ + + + + + @@ -2874,6 +2924,11 @@ + + + + + @@ -3199,6 +3254,11 @@ + + + + + @@ -3619,6 +3679,11 @@ + + + + + @@ -3784,6 +3849,11 @@ + + + + + @@ -3812,6 +3882,11 @@ + + + + + diff --git a/libs/x-content/impl/build.gradle b/libs/x-content/impl/build.gradle index 670d6c8896a4..d16c485baf1d 100644 --- a/libs/x-content/impl/build.gradle +++ b/libs/x-content/impl/build.gradle @@ -10,7 +10,7 @@ apply plugin: 'elasticsearch.java' archivesBaseName = "x-content-impl" -String jacksonVersion = "2.14.2" +String jacksonVersion = "2.15.0" dependencies { compileOnly project(':libs:elasticsearch-core')