diff --git a/CHANGELOG.md b/CHANGELOG.md index a62e130c6cb7e..7e158073421de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bumps `tika` from 2.4.0 to 2.5.0 ([#4791](https://github.com/opensearch-project/OpenSearch/pull/4791)) - Update Apache Lucene to 9.4.1 ([#4922](https://github.com/opensearch-project/OpenSearch/pull/4922)) - Bump `woodstox-core` to 6.4.0 ([#4951](https://github.com/opensearch-project/OpenSearch/pull/4951)) +- Upgrade jetty-http, kotlin-stdlib and snakeyaml ([#4982](https://github.com/opensearch-project/OpenSearch/pull/4982)) ### Changed - Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308)) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 0b6b51443fe5a..8b9e8c1e95a54 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -113,9 +113,10 @@ dependencies { api "net.java.dev.jna:jna:5.11.0" api 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2' api 'org.jdom:jdom2:2.0.6.1' - api 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10' + api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${props.getProperty('kotlin')}" api 'de.thetaphi:forbiddenapis:3.3' - api 'com.avast.gradle:gradle-docker-compose-plugin:0.14.12' + api 'com.avast.gradle:gradle-docker-compose-plugin:0.15.2' + api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}" api 'org.apache.maven:maven-model:3.6.2' api 'com.networknt:json-schema-validator:1.0.69' api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}" diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 5ff81b279a563..2396da4ae4583 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -20,6 +20,7 @@ slf4j = 1.7.36 asm = 9.4 jettison = 1.5.1 woodstox = 6.4.0 +kotlin = 1.7.10 # when updating the JNA version, also update the version in buildSrc/build.gradle jna = 5.5.0 diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index 3a9756dc2a48a..4585db94139d1 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -50,4 +50,6 @@ dependencies { api 'net.minidev:json-smart:2.4.8' api "org.mockito:mockito-core:${versions.mockito}" api "com.google.protobuf:protobuf-java:3.21.2" + api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}" + api 'org.eclipse.jetty:jetty-server:9.4.49.v20220914' }