From 28ba311ae34480cd158cbf7fc986ce4954e01204 Mon Sep 17 00:00:00 2001 From: Vacha Shah Date: Sun, 30 Oct 2022 15:12:00 -0700 Subject: [PATCH] Fix dependencies (#4963) * Upgrading kotlin-stdlib and excluding jetty-http Signed-off-by: Vacha Shah * Upgrading indirect snakeyaml dependency Signed-off-by: Vacha Shah * Update CHANGELOG Signed-off-by: Vacha Shah * Using snakeyaml version from version file Signed-off-by: Vacha Shah * Upgrading jetty-http instead of excluding since it is used Signed-off-by: Vacha Shah * Extracting kotlin version Signed-off-by: Vacha Shah Signed-off-by: Vacha Shah --- CHANGELOG.md | 1 + buildSrc/build.gradle | 3 ++- buildSrc/version.properties | 1 + test/fixtures/hdfs-fixture/build.gradle | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de006288527d3..27626ca61c3d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Update Apache Lucene to 9.4.1 ([#4922](https://github.com/opensearch-project/OpenSearch/pull/4922)) - Bump `woodstox-core` to 6.4.0 ([#4947](https://github.com/opensearch-project/OpenSearch/pull/4947)) - Update Apache Lucene to 9.5.0-snapshot-a4ef70f ([#4979](https://github.com/opensearch-project/OpenSearch/pull/4979)) +- Upgrade jetty-http, kotlin-stdlib and snakeyaml ([#4963](https://github.com/opensearch-project/OpenSearch/pull/4963)) ### 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 3ef3c6f9faf49..498edaf057a34 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.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 daea380c4b30d..8dd54da07f3d2 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 6c00465b6c842..cd60f1e7d8a8f 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.8" + api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}" + api 'org.eclipse.jetty:jetty-server:9.4.49.v20220914' }