Skip to content

Commit 815e7dc

Browse files
committed
Bulk update of HDFS test fixture dependencies
This commit brings the HDFS test fixture dependencies up to parity with what exists on the main branch. Signed-off-by: Andrew Ross <andrross@amazon.com>
1 parent b8900b5 commit 815e7dc

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1010
- Bump `log4j` from 2.21.0 to 2.25.3 ([#20308](https://github.com/opensearch-project/OpenSearch/pull/20308))
1111
- Bump netty from 4.1.25.Final to 4.1.31.Final ([#20744](https://github.com/opensearch-project/OpenSearch/pull/20744))
1212
- Bump shadow-gradle-plugin from 8.1.1 to 8.3.10 ([#20569](https://github.com/opensearch-project/OpenSearch/pull/20569))
13+
- Update HDFS test fixture dependencies ([#20768](https://github.com/opensearch-project/OpenSearch/pull/20768))
1314

1415
### Deprecated
1516

test/fixtures/hdfs-fixture/build.gradle

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ dependencies {
4242
exclude module: 'jettison'
4343
exclude module: 'netty'
4444
exclude module: 'guava'
45+
exclude module: 'protobuf-java'
4546
exclude group: 'org.codehaus.jackson'
4647
exclude group: "org.bouncycastle"
4748
exclude group: "com.squareup.okhttp3"
@@ -57,40 +58,41 @@ dependencies {
5758
exclude module: "org.eclipse.jetty"
5859
exclude group: "commons-lang"
5960
exclude group: "org.jsonschema2pojo"
61+
exclude group: "com.microsoft.sqlserver"
6062
}
61-
api "dnsjava:dnsjava:3.6.2"
63+
api "dnsjava:dnsjava:3.6.4"
6264
api "org.codehaus.jettison:jettison:${versions.jettison}"
6365
api "org.apache.commons:commons-compress:${versions.commonscompress}"
6466
api "commons-codec:commons-codec:${versions.commonscodec}"
6567
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
6668
api "io.netty:netty-all:${versions.netty}"
67-
api 'com.google.code.gson:gson:2.11.0'
69+
api "com.google.code.gson:gson:2.13.2"
6870
api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
6971
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
7072
api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
7173
api "net.minidev:json-smart:${versions.json_smart}"
7274
api "org.mockito:mockito-core:${versions.mockito}"
73-
api "com.google.protobuf:protobuf-java:3.22.2"
75+
api "com.google.protobuf:protobuf-java:${versions.protobuf}"
7476
api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
7577
api "org.eclipse.jetty:jetty-server:${versions.jetty}"
7678
api "org.eclipse.jetty.websocket:javax-websocket-server-impl:${versions.jetty}"
77-
api 'org.apache.zookeeper:zookeeper:3.9.3'
78-
api "org.apache.commons:commons-text:1.13.0"
79-
api "commons-net:commons-net:3.11.1"
80-
api "ch.qos.logback:logback-core:1.5.16"
81-
api "ch.qos.logback:logback-classic:1.5.15"
82-
api "org.jboss.xnio:xnio-nio:3.8.16.Final"
83-
api 'org.jline:jline:3.28.0'
84-
api 'org.apache.commons:commons-configuration2:2.11.0'
85-
api 'com.nimbusds:nimbus-jose-jwt:10.3'
86-
api ('org.apache.kerby:kerb-admin:2.1.0') {
79+
api 'org.apache.zookeeper:zookeeper:3.9.4'
80+
api "org.apache.commons:commons-text:1.15.0"
81+
api "commons-net:commons-net:3.12.0"
82+
api "ch.qos.logback:logback-core:1.5.27"
83+
api "ch.qos.logback:logback-classic:1.5.27"
84+
api "org.jboss.xnio:xnio-nio:3.8.17.Final"
85+
api 'org.jline:jline:3.30.6'
86+
api 'org.apache.commons:commons-configuration2:2.13.0'
87+
api 'com.nimbusds:nimbus-jose-jwt:10.8'
88+
api ('org.apache.kerby:kerb-admin:2.1.1') {
8789
exclude group: "org.jboss.xnio"
8890
exclude group: "org.jline"
8991
}
9092
runtimeOnly "com.google.guava:guava:${versions.guava}"
91-
runtimeOnly("com.squareup.okhttp3:okhttp:4.12.0") {
93+
runtimeOnly("com.squareup.okhttp3:okhttp:5.3.2") {
9294
exclude group: "com.squareup.okio"
9395
}
94-
runtimeOnly "com.squareup.okio:okio:3.10.2"
95-
runtimeOnly "org.xerial.snappy:snappy-java:1.1.10.7"
96+
runtimeOnly "com.squareup.okio:okio:3.16.4"
97+
runtimeOnly "org.xerial.snappy:snappy-java:1.1.10.8"
9698
}

0 commit comments

Comments
 (0)