Skip to content

Commit

Permalink
[Backport 1.x] Fix dependencies (#4963) (#4981)
Browse files Browse the repository at this point in the history
* Fix dependencies (#4963)

* Upgrading kotlin-stdlib and excluding jetty-http

Signed-off-by: Vacha Shah <[email protected]>

* Upgrading indirect snakeyaml dependency

Signed-off-by: Vacha Shah <[email protected]>

* Update CHANGELOG

Signed-off-by: Vacha Shah <[email protected]>

* Using snakeyaml version from version file

Signed-off-by: Vacha Shah <[email protected]>

* Upgrading jetty-http instead of excluding since it is used

Signed-off-by: Vacha Shah <[email protected]>

* Extracting kotlin version

Signed-off-by: Vacha Shah <[email protected]>

Signed-off-by: Vacha Shah <[email protected]>

* Update CHANGELOG

Signed-off-by: Vacha Shah <[email protected]>

Signed-off-by: Vacha Shah <[email protected]>
  • Loading branch information
VachaShah authored Oct 31, 2022
1 parent d05ff9a commit e1c682a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bump reactor-netty-http to 1.0.24 in repository-azure ([#4920](https://github.com/opensearch-project/OpenSearch/pull/4920))
- Bump `tika` from 2.4.0 to 2.5.0 ([#4929](https://github.com/opensearch-project/OpenSearch/pull/4929))
- Bump `woodstox-core` to 6.4.0 ([#4950](https://github.com/opensearch-project/OpenSearch/pull/4950))
- Upgrade jetty-http, kotlin-stdlib and snakeyaml ([#4981](https://github.com/opensearch-project/OpenSearch/pull/4981))
### Changed
- Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308))
- Use RemoteSegmentStoreDirectory instead of RemoteDirectory ([#4240](https://github.com/opensearch-project/OpenSearch/pull/4240))
Expand Down
1 change: 1 addition & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ dependencies {
api 'com.github.jengelman.gradle.plugins:shadow:6.0.0'
api 'de.thetaphi:forbiddenapis:3.2'
api 'com.avast.gradle:gradle-docker-compose-plugin:0.12.1'
api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}"
api 'org.apache.maven:maven-model:3.6.2'
api 'com.networknt:json-schema-validator:1.0.36'
api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"
Expand Down
1 change: 1 addition & 0 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ log4j = 2.17.1
slf4j = 1.6.2
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
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/hdfs-fixture/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@ dependencies {
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
api 'net.minidev:json-smart:2.4.8'
api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
api 'org.eclipse.jetty:jetty-server:9.4.49.v20220914'
}

0 comments on commit e1c682a

Please sign in to comment.