diff --git a/distribution/tools/ansi-console/build.gradle b/distribution/tools/ansi-console/build.gradle index d01d60fb50f07..e44bbebcdbcd9 100644 --- a/distribution/tools/ansi-console/build.gradle +++ b/distribution/tools/ansi-console/build.gradle @@ -18,7 +18,7 @@ dependencies { testImplementation project(":test:framework") // multi-platform (Windows too) terminal detection and output formatting - api "org.fusesource.jansi:jansi:2.4.0" + api "org.fusesource.jansi:jansi:2.4.1" } // the code and tests in this project cover console initialization diff --git a/distribution/tools/geoip-cli/build.gradle b/distribution/tools/geoip-cli/build.gradle index ee20d5e1bd88e..7568dfdd16ab7 100644 --- a/distribution/tools/geoip-cli/build.gradle +++ b/distribution/tools/geoip-cli/build.gradle @@ -18,6 +18,6 @@ dependencies { compileOnly project(":libs:elasticsearch-cli") compileOnly project(":libs:elasticsearch-x-content") testImplementation project(":test:framework") - testImplementation "org.apache.commons:commons-compress:1.26.1" - testImplementation "commons-io:commons-io:2.15.1" + testImplementation "org.apache.commons:commons-compress:1.27.1" + testImplementation "commons-io:commons-io:2.18.0" } diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle index 16932df96e223..4f3ad45af35e1 100644 --- a/distribution/tools/plugin-cli/build.gradle +++ b/distribution/tools/plugin-cli/build.gradle @@ -25,8 +25,8 @@ dependencies { implementation project(":libs:elasticsearch-plugin-api") implementation project(":libs:elasticsearch-plugin-scanner") // TODO: asm is picked up from the plugin scanner, we should consolidate so it is not defined twice - implementation 'org.ow2.asm:asm:9.7' - implementation 'org.ow2.asm:asm-tree:9.7' + implementation 'org.ow2.asm:asm:9.7.1' + implementation 'org.ow2.asm:asm-tree:9.7.1' api "org.bouncycastle:bcpg-fips:1.0.7.1" api "org.bouncycastle:bc-fips:1.0.2.4" diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 35c26ef10f9ec..85d9722384e49 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -1,49 +1,49 @@ [versions] -asm = "9.6" -jackson = "2.15.0" -junit5 = "5.8.1" +asm = "9.7.1" +jackson = "2.18.2" +junit5 = "5.11.4" spock = "2.1-groovy-3.0" [libraries] -ant = "org.apache.ant:ant:1.10.12" +ant = "org.apache.ant:ant:1.10.15" antlrst4 = "org.antlr:ST4:4.3.4" -apache-compress = "org.apache.commons:commons-compress:1.26.1" +apache-compress = "org.apache.commons:commons-compress:1.27.1" apache-rat = "org.apache.rat:apache-rat:0.11" asm = { group = "org.ow2.asm", name="asm", version.ref="asm" } asm-tree = { group = "org.ow2.asm", name="asm-tree", version.ref="asm" } bytebuddy = "net.bytebuddy:byte-buddy:1.14.12" checkstyle = "com.puppycrawl.tools:checkstyle:10.3" -commons-codec = "commons-codec:commons-codec:1.11" -commmons-io = "commons-io:commons-io:2.2" -docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.5" +commons-codec = "commons-codec:commons-codec:1.17.2" +commmons-io = "commons-io:commons-io:2.18.0" +docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.12" forbiddenApis = "de.thetaphi:forbiddenapis:3.6" -gradle-enterprise = "com.gradle:develocity-gradle-plugin:3.17.4" +gradle-enterprise = "com.gradle:develocity-gradle-plugin:3.19" hamcrest = "org.hamcrest:hamcrest:2.1" -httpcore = "org.apache.httpcomponents:httpcore:4.4.12" +httpcore = "org.apache.httpcomponents:httpcore:4.4.16" httpclient = "org.apache.httpcomponents:httpclient:4.5.14" idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4" -javaparser = "com.github.javaparser:javaparser-core:3.18.0" +javaparser = "com.github.javaparser:javaparser-core:3.26.3" json-schema-validator = "com.networknt:json-schema-validator:1.0.72" -json-assert = "org.skyscreamer:jsonassert:1.5.0" +json-assert = "org.skyscreamer:jsonassert:1.5.3" jackson-core = { group = "com.fasterxml.jackson.core", name="jackson-core", version.ref="jackson" } jackson-databind = { group = "com.fasterxml.jackson.core", name="jackson-databind", version.ref="jackson" } jackson-dataformat-yaml = { group = "com.fasterxml.jackson.dataformat", name="jackson-dataformat-yaml", version.ref="jackson" } jackson-platform = { group = "com.fasterxml.jackson", name="jackson-bom", version.ref="jackson" } -jna = "net.java.dev.jna:jna:5.10.0" +jna = "net.java.dev.jna:jna:5.16.0" junit = "junit:junit:4.13.2" junit5-platform = { group = "org.junit", name="junit-bom", version.ref="junit5" } junit5-jupiter = { group = "org.junit.jupiter", name="junit-jupiter", version.ref="junit5" } -junit5-platform-launcher = "org.junit.platform:junit-platform-launcher:1.8.1" +junit5-platform-launcher = "org.junit.platform:junit-platform-launcher:1.11.4" junit5-vintage = { group = "org.junit.vintage", name="junit-vintage-engine", version.ref="junit5" } -maven-model = "org.apache.maven:maven-model:3.6.2" +maven-model = "org.apache.maven:maven-model:3.9.9" mockito-core = "org.mockito:mockito-core:1.9.5" nebula-info = "com.netflix.nebula:gradle-info-plugin:11.3.3" -reflections = "org.reflections:reflections:0.9.12" +reflections = "org.reflections:reflections:0.10.2" shadow-plugin = "com.github.breskeby:shadow:3b035f2" -snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2.0" } } +snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2.3" } } 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" } spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" -wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2" -xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2" +wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.35.2" +xmlunit-core = "org.xmlunit:xmlunit-core:2.10.0" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 472a65f9c6f24..e8e815086e78d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -114,6 +114,11 @@ + + + + + @@ -134,6 +139,11 @@ + + + + + @@ -264,6 +274,11 @@ + + + + + @@ -294,6 +309,11 @@ + + + + + @@ -314,6 +334,11 @@ + + + + + @@ -334,6 +359,11 @@ + + + + + @@ -354,6 +384,11 @@ + + + + + @@ -379,6 +414,11 @@ + + + + + @@ -449,6 +489,11 @@ + + + + + @@ -464,6 +509,11 @@ + + + + + @@ -474,6 +524,11 @@ + + + + + @@ -499,6 +554,11 @@ + + + + + @@ -529,6 +589,11 @@ + + + + + @@ -579,6 +644,11 @@ + + + + + @@ -699,6 +769,11 @@ + + + + + @@ -759,6 +834,11 @@ + + + + + @@ -799,6 +879,11 @@ + + + + + @@ -884,6 +969,11 @@ + + + + + @@ -899,6 +989,11 @@ + + + + + @@ -1116,6 +1211,11 @@ + + + + + @@ -1131,6 +1231,11 @@ + + + + + @@ -1176,6 +1281,11 @@ + + + + + @@ -1196,6 +1306,16 @@ + + + + + + + + + + @@ -1236,6 +1356,11 @@ + + + + + @@ -1336,6 +1461,11 @@ + + + + + @@ -1496,11 +1626,21 @@ + + + + + + + + + + @@ -1516,6 +1656,11 @@ + + + + + @@ -1576,6 +1721,11 @@ + + + + + @@ -1616,6 +1766,11 @@ + + + + + @@ -1636,6 +1791,11 @@ + + + + + @@ -1669,6 +1829,11 @@ + + + + + @@ -1684,6 +1849,11 @@ + + + + + @@ -1759,6 +1929,11 @@ + + + + + @@ -1896,6 +2071,11 @@ + + + + + @@ -1911,6 +2091,11 @@ + + + + + @@ -1966,6 +2151,11 @@ + + + + + @@ -2006,6 +2196,16 @@ + + + + + + + + + + @@ -2959,6 +3159,11 @@ + + + + + @@ -3172,6 +3377,11 @@ + + + + + @@ -3272,6 +3482,11 @@ + + + + + @@ -3612,6 +3827,11 @@ + + + + + @@ -3737,46 +3957,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4022,6 +4292,11 @@ + + + + + @@ -4122,6 +4397,11 @@ + + + + + @@ -4207,6 +4487,11 @@ + + + + + @@ -4242,6 +4527,11 @@ + + + + + @@ -4352,6 +4642,11 @@ + + + + + @@ -4415,6 +4710,11 @@ + + + + + @@ -4430,6 +4730,11 @@ + + + + + diff --git a/libs/plugin-scanner/build.gradle b/libs/plugin-scanner/build.gradle index b8cd224eba46a..cc2e44e0fc246 100644 --- a/libs/plugin-scanner/build.gradle +++ b/libs/plugin-scanner/build.gradle @@ -20,8 +20,8 @@ dependencies { api project(':libs:elasticsearch-plugin-api') api project(":libs:elasticsearch-x-content") - api 'org.ow2.asm:asm:9.7' - api 'org.ow2.asm:asm-tree:9.7' + api 'org.ow2.asm:asm:9.7.1' + api 'org.ow2.asm:asm-tree:9.7.1' testImplementation "junit:junit:${versions.junit}" testImplementation(project(":test:framework")) { diff --git a/libs/tdigest/build.gradle b/libs/tdigest/build.gradle index df60862b27386..ba72c78e30504 100644 --- a/libs/tdigest/build.gradle +++ b/libs/tdigest/build.gradle @@ -27,7 +27,7 @@ dependencies { testImplementation(project(":test:framework")) { exclude group: 'org.elasticsearch', module: 'elasticsearch-tdigest' } - testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' + testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4' } tasks.named('forbiddenApisMain').configure { diff --git a/libs/x-content/impl/build.gradle b/libs/x-content/impl/build.gradle index 753d2c3d5fe1e..1e7af5bf58598 100644 --- a/libs/x-content/impl/build.gradle +++ b/libs/x-content/impl/build.gradle @@ -13,7 +13,7 @@ base { archivesName = "x-content-impl" } -String jacksonVersion = "2.17.2" +String jacksonVersion = "2.18.2" dependencies { compileOnly project(':libs:elasticsearch-core') diff --git a/modules/apm/build.gradle b/modules/apm/build.gradle index 4c822e44da6f6..2d7c5663ec467 100644 --- a/modules/apm/build.gradle +++ b/modules/apm/build.gradle @@ -12,7 +12,7 @@ esplugin { classname 'org.elasticsearch.telemetry.apm.APM' } -def otelVersion = '1.31.0' +def otelVersion = '1.46.0' def otelSemconvVersion = '1.21.0-alpha' dependencies { diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index b50fc86282d1f..4ca83b853e253 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -28,7 +28,7 @@ tasks.named('internalClusterTestTestingConventions').configure { } dependencies { - implementation('com.maxmind.geoip2:geoip2:4.2.0') + implementation('com.maxmind.geoip2:geoip2:4.2.1') // geoip2 dependencies: runtimeOnly("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") runtimeOnly("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}") diff --git a/modules/lang-mustache/build.gradle b/modules/lang-mustache/build.gradle index 45037857db093..5d0e302267a00 100644 --- a/modules/lang-mustache/build.gradle +++ b/modules/lang-mustache/build.gradle @@ -17,7 +17,7 @@ esplugin { } dependencies { - api "com.github.spullara.mustache.java:compiler:0.9.10" + api "com.github.spullara.mustache.java:compiler:0.9.14" } restResources { diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle index 0e8195d4d48ce..be3d25215197a 100644 --- a/modules/lang-painless/build.gradle +++ b/modules/lang-painless/build.gradle @@ -77,16 +77,16 @@ sourceSets { dependencies { docImplementation project(':server') docImplementation project(':modules:lang-painless') - docImplementation 'com.github.javaparser:javaparser-core:3.18.0' - docImplementation 'org.jsoup:jsoup:1.13.1' + docImplementation 'com.github.javaparser:javaparser-core:3.26.3' + docImplementation 'org.jsoup:jsoup:1.18.3' if (isEclipse) { /* * Eclipse isn't quite "with it" enough to understand the different * source sets. This adds the dependency to all source sets so it * can compile the doc java files. */ - implementation 'com.github.javaparser:javaparser-core:3.18.0' - implementation 'org.jsoup:jsoup:1.13.1' + implementation 'com.github.javaparser:javaparser-core:3.26.3' + implementation 'org.jsoup:jsoup:1.18.3' } } diff --git a/modules/repository-azure/build.gradle b/modules/repository-azure/build.gradle index eb938f663c810..ee6a79ddfe0a1 100644 --- a/modules/repository-azure/build.gradle +++ b/modules/repository-azure/build.gradle @@ -27,14 +27,14 @@ dependencies { // Microsoft api "com.azure:azure-core-http-netty:1.15.3" api "com.azure:azure-core:1.51.0" - api "com.azure:azure-identity:1.13.2" + api "com.azure:azure-identity:1.15.0" api "com.azure:azure-json:1.2.0" api "com.azure:azure-storage-blob:12.27.1" api "com.azure:azure-storage-common:12.26.1" api "com.azure:azure-storage-internal-avro:12.12.1" api "com.azure:azure-xml:1.1.0" api "com.microsoft.azure:msal4j-persistence-extension:1.3.0" - api "com.microsoft.azure:msal4j:1.16.2" + api "com.microsoft.azure:msal4j:1.18.0" // Jackson api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" @@ -54,7 +54,7 @@ dependencies { // Reactor api "io.projectreactor.netty:reactor-netty-core:${versions.azureReactorNetty}" api "io.projectreactor.netty:reactor-netty-http:${versions.azureReactorNetty}" - api "io.projectreactor:reactor-core:3.4.38" + api "io.projectreactor:reactor-core:3.7.2" api "org.reactivestreams:reactive-streams:1.0.4" // Others @@ -69,12 +69,12 @@ dependencies { api "net.java.dev.jna:jna-platform:${versions.jna}" // Maven says 5.14.0 but this aligns with the Elasticsearch-wide version api "net.java.dev.jna:jna:${versions.jna}" // Maven says 5.14.0 but this aligns with the Elasticsearch-wide version api "net.minidev:accessors-smart:2.5.0" - api "net.minidev:json-smart:2.5.0" + api "net.minidev:json-smart:2.5.1" api "org.codehaus.woodstox:stax2-api:4.2.2" - api "org.ow2.asm:asm:9.3" + api "org.ow2.asm:asm:9.7.1" - runtimeOnly "com.google.crypto.tink:tink:1.14.0" - runtimeOnly "com.google.protobuf:protobuf-java:4.27.0" + runtimeOnly "com.google.crypto.tink:tink:1.16.0" + runtimeOnly "com.google.protobuf:protobuf-java:4.29.3" runtimeOnly "com.google.code.gson:gson:2.11.0" runtimeOnly "org.cryptomator:siv-mode:1.5.2" diff --git a/modules/repository-gcs/build.gradle b/modules/repository-gcs/build.gradle index 246611e4803a2..0dc94f3051aba 100644 --- a/modules/repository-gcs/build.gradle +++ b/modules/repository-gcs/build.gradle @@ -26,27 +26,27 @@ dependencies { api 'com.google.cloud:google-cloud-storage:2.13.1' api 'com.google.cloud:google-cloud-core:2.8.28' api 'com.google.cloud:google-cloud-core-http:2.8.28' - runtimeOnly 'com.google.guava:guava:32.0.1-jre' + runtimeOnly 'com.google.guava:guava:32.1.3-jre' runtimeOnly 'com.google.guava:failureaccess:1.0.1' api "commons-logging:commons-logging:${versions.commonslogging}" api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" api "commons-codec:commons-codec:${versions.commonscodec}" api 'com.google.api:api-common:2.3.1' api 'com.google.api:gax:2.20.1' - api 'org.threeten:threetenbp:1.6.5' + api 'org.threeten:threetenbp:1.7.0' api "com.google.protobuf:protobuf-java-util:${versions.protobuf}" api "com.google.protobuf:protobuf-java:${versions.protobuf}" - api 'com.google.code.gson:gson:2.10' - api 'com.google.api.grpc:proto-google-common-protos:2.9.6' + api 'com.google.code.gson:gson:2.11.0' + api 'com.google.api.grpc:proto-google-common-protos:2.50.1' api 'com.google.api.grpc:proto-google-iam-v1:1.6.2' api 'com.google.auth:google-auth-library-credentials:1.11.0' - api 'com.google.auth:google-auth-library-oauth2-http:1.11.0' + api 'com.google.auth:google-auth-library-oauth2-http:1.30.1' api "com.google.oauth-client:google-oauth-client:${versions.google_oauth_client}" api 'com.google.api-client:google-api-client:2.1.1' api 'com.google.http-client:google-http-client:1.42.3' api 'com.google.http-client:google-http-client-gson:1.42.3' api 'com.google.http-client:google-http-client-appengine:1.42.3' - api 'com.google.http-client:google-http-client-jackson2:1.42.3' + api 'com.google.http-client:google-http-client-jackson2:1.45.3' api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" api 'com.google.api:gax-httpjson:0.105.1' api 'io.grpc:grpc-context:1.49.2' diff --git a/modules/repository-s3/build.gradle b/modules/repository-s3/build.gradle index 346a458a65f85..a1380d0e3e969 100644 --- a/modules/repository-s3/build.gradle +++ b/modules/repository-s3/build.gradle @@ -36,11 +36,11 @@ dependencies { api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}" api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}" - api "joda-time:joda-time:2.10.14" + api "joda-time:joda-time:2.13.0" // HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here, // and whitelist this hack in JarHell - api 'javax.xml.bind:jaxb-api:2.2.2' + api 'javax.xml.bind:jaxb-api:2.3.1' testImplementation project(':test:fixtures:s3-fixture') yamlRestTestImplementation project(":test:framework") diff --git a/plugins/discovery-azure-classic/build.gradle b/plugins/discovery-azure-classic/build.gradle index 6eb5b574b88f9..51add2ebb1103 100644 --- a/plugins/discovery-azure-classic/build.gradle +++ b/plugins/discovery-azure-classic/build.gradle @@ -31,17 +31,17 @@ dependencies { api "org.apache.logging.log4j:log4j-1.2-api:${localVersions.log4j}" api "commons-codec:commons-codec:${localVersions.commonscodec}" api "commons-lang:commons-lang:2.6" - api 'javax.mail:mail:1.4.5' + api 'javax.mail:mail:1.4.7' api 'javax.inject:javax.inject:1' api "com.sun.jersey:jersey-client:${localVersions.jersey}" api "com.sun.jersey:jersey-core:${localVersions.jersey}" - api 'com.sun.xml.bind:jaxb-impl:2.2.3-1' + api 'com.sun.xml.bind:jaxb-impl:2.3.9' // HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here, // and whitelist this hack in JarHell - api 'javax.xml.bind:jaxb-api:2.2.2' + api 'javax.xml.bind:jaxb-api:2.3.1' - runtimeOnly "joda-time:joda-time:2.10.10" + runtimeOnly "joda-time:joda-time:2.13.0" } restResources { diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index d9e86315d9468..174b155608646 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/plugins/discovery-ec2/build.gradle @@ -32,7 +32,7 @@ dependencies { api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}" api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}" - api "joda-time:joda-time:2.10.10" + api "joda-time:joda-time:2.13.0" } restResources { diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle index 530070f9e0073..9cfb65cce11cd 100644 --- a/plugins/discovery-gce/build.gradle +++ b/plugins/discovery-gce/build.gradle @@ -25,7 +25,7 @@ dependencies { api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" api "commons-codec:commons-codec:${versions.commonscodec}" - runtimeOnly 'com.google.guava:guava:32.0.1-jre' + runtimeOnly 'com.google.guava:guava:32.1.3-jre' runtimeOnly 'com.google.guava:failureaccess:1.0.1' api 'io.opencensus:opencensus-api:0.30.0' api 'io.opencensus:opencensus-contrib-http-util:0.30.0' diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 741542477e446..e016ac8c97ee7 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -42,10 +42,10 @@ dependencies { api "com.google.protobuf:protobuf-java:${versions.protobuf}" api "commons-logging:commons-logging:${versions.commonslogging}" api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" - api 'commons-cli:commons-cli:1.2' + api 'commons-cli:commons-cli:1.9.0' api "commons-codec:commons-codec:${versions.commonscodec}" - api 'commons-io:commons-io:2.8.0' - api 'org.apache.commons:commons-lang3:3.11' + api 'commons-io:commons-io:2.18.0' + api 'org.apache.commons:commons-lang3:3.17.0' api 'javax.servlet:javax.servlet-api:3.1.0' api "org.slf4j:slf4j-api:${versions.slf4j}" runtimeOnly "org.slf4j:slf4j-nop:${versions.slf4j}" @@ -58,14 +58,14 @@ dependencies { javaRestTestImplementation project(':test:fixtures:krb5kdc-fixture') javaRestTestImplementation "org.slf4j:slf4j-api:${versions.slf4j}" javaRestTestRuntimeOnly "com.google.guava:guava:16.0.1" - javaRestTestRuntimeOnly "commons-cli:commons-cli:1.2" + javaRestTestRuntimeOnly "commons-cli:commons-cli:1.9.0" javaRestTestRuntimeOnly "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" yamlRestTestCompileOnly(project(':test:fixtures:hdfs-fixture')) yamlRestTestImplementation project(':test:fixtures:krb5kdc-fixture') yamlRestTestImplementation "org.slf4j:slf4j-api:${versions.slf4j}" yamlRestTestRuntimeOnly "com.google.guava:guava:16.0.1" - yamlRestTestRuntimeOnly "commons-cli:commons-cli:1.2" + yamlRestTestRuntimeOnly "commons-cli:commons-cli:1.9.0" yamlRestTestRuntimeOnly "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" hdfsFixture2 project(path: ':test:fixtures:hdfs-fixture', configuration: 'shadowedHdfs2') diff --git a/settings.gradle b/settings.gradle index 2926a9a303375..b174bcf6565f9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id "com.gradle.develocity" version "3.17.4" + id "com.gradle.develocity" version "3.19" id 'elasticsearch.java-toolchain' } diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle index 1ed59d6fe3581..486466a6d6b2b 100644 --- a/x-pack/plugin/core/build.gradle +++ b/x-pack/plugin/core/build.gradle @@ -50,7 +50,7 @@ dependencies { testImplementation project(':modules:mapper-extras') // security deps - api 'com.unboundid:unboundid-ldapsdk:6.0.3' + api 'com.unboundid:unboundid-ldapsdk:6.0.11' implementation project(":x-pack:plugin:core:template-resources") diff --git a/x-pack/plugin/esql/arrow/build.gradle b/x-pack/plugin/esql/arrow/build.gradle index 20c877a12bf0d..720f43adb8888 100644 --- a/x-pack/plugin/esql/arrow/build.gradle +++ b/x-pack/plugin/esql/arrow/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation('org.apache.arrow:arrow-vector:16.1.0') implementation('org.apache.arrow:arrow-format:16.1.0') implementation('org.apache.arrow:arrow-memory-core:16.1.0') - implementation('org.checkerframework:checker-qual:3.42.0') + implementation('org.checkerframework:checker-qual:3.48.4') implementation('com.google.flatbuffers:flatbuffers-java:23.5.26') // Needed for the json arrow serialization, and loaded even if we don't use it. implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") diff --git a/x-pack/plugin/esql/qa/server/single-node/build.gradle b/x-pack/plugin/esql/qa/server/single-node/build.gradle index ab8e3d4b32d9a..ebcad2a7f808b 100644 --- a/x-pack/plugin/esql/qa/server/single-node/build.gradle +++ b/x-pack/plugin/esql/qa/server/single-node/build.gradle @@ -11,7 +11,7 @@ dependencies { javaRestTestImplementation('org.apache.arrow:arrow-vector:16.1.0') javaRestTestImplementation('org.apache.arrow:arrow-format:16.1.0') javaRestTestImplementation('org.apache.arrow:arrow-memory-core:16.1.0') - javaRestTestImplementation('org.checkerframework:checker-qual:3.42.0') + javaRestTestImplementation('org.checkerframework:checker-qual:3.48.4') javaRestTestImplementation('com.google.flatbuffers:flatbuffers-java:23.5.26') javaRestTestImplementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") javaRestTestImplementation("com.fasterxml.jackson.core:jackson-core:${versions.jackson}") diff --git a/x-pack/plugin/identity-provider/build.gradle b/x-pack/plugin/identity-provider/build.gradle index dd085e62efa48..3f7f230f527d5 100644 --- a/x-pack/plugin/identity-provider/build.gradle +++ b/x-pack/plugin/identity-provider/build.gradle @@ -35,7 +35,7 @@ dependencies { api "net.shibboleth.utilities:java-support:8.4.0" api "com.google.code.findbugs:jsr305:3.0.2" api "org.apache.santuario:xmlsec:2.3.4" - api "io.dropwizard.metrics:metrics-core:4.1.4" + api "io.dropwizard.metrics:metrics-core:4.2.30" api ( "org.cryptacular:cryptacular:1.2.5") { exclude group: 'org.bouncycastle' } @@ -48,7 +48,7 @@ dependencies { api "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}" api "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}" api "org.apache.httpcomponents:httpclient-cache:${versions.httpclient}" - runtimeOnly 'com.google.guava:guava:32.0.1-jre' + runtimeOnly 'com.google.guava:guava:32.1.3-jre' runtimeOnly 'com.google.guava:failureaccess:1.0.1' runtimeOnly "commons-codec:commons-codec:${versions.commonscodec}" diff --git a/x-pack/plugin/inference/build.gradle b/x-pack/plugin/inference/build.gradle index 211b99343340d..7d949c259a13c 100644 --- a/x-pack/plugin/inference/build.gradle +++ b/x-pack/plugin/inference/build.gradle @@ -43,19 +43,19 @@ dependencies { api "com.ibm.icu:icu4j:${versions.icu4j}" - runtimeOnly 'com.google.guava:guava:32.0.1-jre' - implementation 'com.google.code.gson:gson:2.10' + runtimeOnly 'com.google.guava:guava:32.1.3-jre' + implementation 'com.google.code.gson:gson:2.11.0' implementation "com.google.protobuf:protobuf-java-util:${versions.protobuf}" implementation "com.google.protobuf:protobuf-java:${versions.protobuf}" implementation 'com.google.api.grpc:proto-google-iam-v1:1.6.2' implementation 'com.google.auth:google-auth-library-credentials:1.11.0' - implementation 'com.google.auth:google-auth-library-oauth2-http:1.11.0' + implementation 'com.google.auth:google-auth-library-oauth2-http:1.30.1' implementation "com.google.oauth-client:google-oauth-client:${versions.google_oauth_client}" implementation 'com.google.api-client:google-api-client:2.1.1' implementation 'com.google.http-client:google-http-client:1.42.3' implementation 'com.google.http-client:google-http-client-gson:1.42.3' implementation 'com.google.http-client:google-http-client-appengine:1.42.3' - implementation 'com.google.http-client:google-http-client-jackson2:1.42.3' + implementation 'com.google.http-client:google-http-client-jackson2:1.45.3' implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}" implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" @@ -68,8 +68,8 @@ dependencies { implementation "com.amazonaws:aws-java-sdk-bedrockruntime:${versions.awsbedrockruntime}" implementation "com.amazonaws:aws-java-sdk-core:${versions.aws}" implementation "com.amazonaws:jmespath-java:${versions.aws}" - implementation "joda-time:joda-time:2.10.10" - implementation 'javax.xml.bind:jaxb-api:2.2.2' + implementation "joda-time:joda-time:2.13.0" + implementation 'javax.xml.bind:jaxb-api:2.3.1' } tasks.named("dependencyLicenses").configure { diff --git a/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle b/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle index 52ea873ae53bf..b6fcc79e6035f 100644 --- a/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle +++ b/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle @@ -17,7 +17,7 @@ dependencies { javaRestTestImplementation project(path: ':test:fixtures:hdfs-fixture', configuration:"shadowedHdfs2") javaRestTestImplementation project(':test:fixtures:krb5kdc-fixture') javaRestTestRuntimeOnly "com.google.guava:guava:16.0.1" - javaRestTestRuntimeOnly "commons-cli:commons-cli:1.2" + javaRestTestRuntimeOnly "commons-cli:commons-cli:1.9.0" } restResources { diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle index ebd435bf653a2..ba7243a38af95 100644 --- a/x-pack/plugin/security/build.gradle +++ b/x-pack/plugin/security/build.gradle @@ -38,7 +38,7 @@ dependencies { testImplementation(testArtifact(project(xpackModule('core')))) internalClusterTestImplementation(testArtifact(project(xpackModule('core')))) - api 'com.unboundid:unboundid-ldapsdk:6.0.3' + api 'com.unboundid:unboundid-ldapsdk:6.0.11' // the following are all SAML dependencies - might as well download the whole internet api "org.opensaml:opensaml-core:${versions.opensaml}" @@ -60,7 +60,7 @@ dependencies { api "net.shibboleth.utilities:java-support:8.4.0" api "com.google.code.findbugs:jsr305:3.0.2" api "org.apache.santuario:xmlsec:2.3.4" - api "io.dropwizard.metrics:metrics-core:4.1.4" + api "io.dropwizard.metrics:metrics-core:4.2.30" api ( "org.cryptacular:cryptacular:1.2.5") { exclude group: 'org.bouncycastle' } @@ -73,10 +73,10 @@ dependencies { api "org.apache.httpcomponents:httpasyncclient:${versions.httpasyncclient}" api "org.apache.httpcomponents:httpcore-nio:${versions.httpcore}" api "org.apache.httpcomponents:httpclient-cache:${versions.httpclient}" - runtimeOnly 'com.google.guava:guava:32.0.1-jre' + runtimeOnly 'com.google.guava:guava:32.1.3-jre' runtimeOnly 'com.google.guava:failureaccess:1.0.1' runtimeOnly "commons-codec:commons-codec:${versions.commonscodec}" - runtimeOnly "joda-time:joda-time:2.10.10" + runtimeOnly "joda-time:joda-time:2.13.0" // Dependencies for oidc api "com.nimbusds:oauth2-oidc-sdk:11.10.1" @@ -98,7 +98,7 @@ dependencies { testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}" // Test dependencies for Kerberos (MiniKdc) - testImplementation('commons-io:commons-io:2.5') + testImplementation('commons-io:commons-io:2.18.0') testImplementation('org.apache.kerby:kerb-simplekdc:1.1.1') testImplementation('org.apache.kerby:kerb-client:1.1.1') testImplementation('org.apache.kerby:kerby-config:1.1.1') @@ -138,7 +138,7 @@ dependencies { testImplementation('org.apache.directory.server:apacheds-core-api:2.0.0-M24') testImplementation('org.apache.directory.server:apacheds-i18n:2.0.0-M24') testImplementation('org.apache.directory.api:api-ldap-extras-util:1.0.0') - testImplementation('net.sf.ehcache:ehcache:2.10.4') + testImplementation('net.sf.ehcache:ehcache:2.10.9.2') testImplementation('org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M24') testImplementation('org.apache.directory.server:apacheds-protocol-ldap:2.0.0-M24') testImplementation('org.apache.directory.server:apacheds-protocol-shared:2.0.0-M24') diff --git a/x-pack/plugin/snapshot-repo-test-kit/qa/hdfs/build.gradle b/x-pack/plugin/snapshot-repo-test-kit/qa/hdfs/build.gradle index 3fbb55ca4eb3a..cf7ab47448848 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/qa/hdfs/build.gradle +++ b/x-pack/plugin/snapshot-repo-test-kit/qa/hdfs/build.gradle @@ -17,7 +17,7 @@ dependencies { javaRestTestImplementation "org.slf4j:slf4j-api:${versions.slf4j}" javaRestTestImplementation "org.slf4j:slf4j-simple:${versions.slf4j}" javaRestTestRuntimeOnly "com.google.guava:guava:16.0.1" - javaRestTestRuntimeOnly "commons-cli:commons-cli:1.2" + javaRestTestRuntimeOnly "commons-cli:commons-cli:1.9.0" } restResources { diff --git a/x-pack/plugin/sql/qa/server/build.gradle b/x-pack/plugin/sql/qa/server/build.gradle index cee10d81c9573..1d7c90c8a6316 100644 --- a/x-pack/plugin/sql/qa/server/build.gradle +++ b/x-pack/plugin/sql/qa/server/build.gradle @@ -59,11 +59,11 @@ subprojects { dependencies { configurations.javaRestTestRuntimeClasspath { - resolutionStrategy.force "org.slf4j:slf4j-api:1.7.25" + resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36" } configurations.javaRestTestRuntimeOnly { // This is also required to make resolveAllDependencies work - resolutionStrategy.force "org.slf4j:slf4j-api:1.7.25" + resolutionStrategy.force "org.slf4j:slf4j-api:1.7.36" } /* Since we're a standalone rest test we actually get transitive @@ -111,7 +111,7 @@ subprojects { javaRestTestRuntimeOnly project(path: ':modules:rest-root') - javaRestTestRuntimeOnly "org.slf4j:slf4j-api:1.7.25" + javaRestTestRuntimeOnly "org.slf4j:slf4j-api:1.7.36" } } } diff --git a/x-pack/plugin/watcher/build.gradle b/x-pack/plugin/watcher/build.gradle index edf767fad675c..15c30cbd66f8a 100644 --- a/x-pack/plugin/watcher/build.gradle +++ b/x-pack/plugin/watcher/build.gradle @@ -32,7 +32,7 @@ dependencies { // watcher deps api 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20211018.2' - runtimeOnly 'com.google.guava:guava:32.0.1-jre' // needed by watcher for the html sanitizer + runtimeOnly 'com.google.guava:guava:32.1.3-jre' // needed by watcher for the html sanitizer runtimeOnly 'com.google.guava:failureaccess:1.0.1' api 'com.sun.mail:jakarta.mail:1.6.4' api 'com.sun.activation:jakarta.activation:1.2.1'