Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Upgrade dependencies #4165

Merged
merged 2 commits into from
Aug 8, 2022
Merged

[Backport 2.x] Upgrade dependencies #4165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d92565
Upgrade dependencies (#4047)
VachaShah Aug 1, 2022
d6ead92
Removing seg-rep IT class from the scope of this backport
kartg Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions buildSrc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ dependencies {
api 'commons-io:commons-io:2.7'
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 'de.thetaphi:forbiddenapis:3.3'
api 'com.avast.gradle:gradle-docker-compose-plugin:0.14.12'
api 'org.apache.maven:maven-model:3.6.2'
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ commonslogging = 1.2
commonscodec = 1.13

# plugin dependencies
aws = 1.12.247
aws = 1.12.270

# when updating this version, you need to ensure compatibility with:
# - plugins/ingest-attachment (transitive dependency, check the upstream POM)
Expand Down
1 change: 0 additions & 1 deletion plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.270.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8f0cc2cc1b41c51e2117f5b1ce6530febf99d4ba
1 change: 0 additions & 1 deletion plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.270.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6d0ce44b33006e163c25f394f869e6b3a51aefc5
10 changes: 4 additions & 6 deletions plugins/repository-hdfs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ opensearchplugin {
}

versions << [
'hadoop3': '3.3.1'
'hadoop3': '3.3.3'
]

testFixtures.useFixture ":test:fixtures:krb5kdc-fixture", "hdfs"
Expand All @@ -60,7 +60,9 @@ configurations {
dependencies {
api "org.apache.hadoop:hadoop-client-api:${versions.hadoop3}"
runtimeOnly "org.apache.hadoop:hadoop-client-runtime:${versions.hadoop3}"
api "org.apache.hadoop:hadoop-hdfs:${versions.hadoop3}"
api("org.apache.hadoop:hadoop-hdfs:${versions.hadoop3}") {
exclude module: 'jetty-server'
}
api 'org.apache.htrace:htrace-core4:4.2.0-incubating'
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
api 'org.apache.avro:avro:1.10.2'
Expand Down Expand Up @@ -438,10 +440,6 @@ thirdPartyAudit {
'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper',
'org.apache.hadoop.shaded.org.apache.curator.shaded.com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1',
'org.apache.hadoop.shaded.org.xbill.DNS.spi.DNSJavaNameServiceDescriptor',
'org.apache.hadoop.shaded.org.xerial.snappy.pure.PureJavaSnappy',
'org.apache.hadoop.shaded.org.xerial.snappy.pure.SnappyRawCompressor',
'org.apache.hadoop.shaded.org.xerial.snappy.pure.SnappyRawDecompressor',
'org.apache.hadoop.shaded.org.xerial.snappy.pure.UnsafeUtil',

'org.apache.avro.reflect.FieldAccessUnsafe',
'org.apache.avro.reflect.FieldAccessUnsafe$UnsafeBooleanField',
Expand Down
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/hadoop-client-api-3.3.1.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/hadoop-client-api-3.3.3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d0593aed2d4df9bcee507550913d29d589ebd84a
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.1.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
52619ecfb0225d7ae67b15264521064824ac57ca
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.1.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4d199760c11d47f90e12fe3882e2b24c77e4eb5
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/aws-java-sdk-core-1.12.247.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/aws-java-sdk-core-1.12.270.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8f0cc2cc1b41c51e2117f5b1ce6530febf99d4ba
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.247.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.270.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2901cdd72a7f0d940b2bd4e1bcdb606d5d33736f
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.247.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.270.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aeffa3e8d9471377adf1108e21dab92f4f13edb3
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/jmespath-java-1.12.247.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/jmespath-java-1.12.270.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5bd3e1976e3b3b94c30e4868af9a5bfc4221e24a
5 changes: 4 additions & 1 deletion test/fixtures/hdfs-fixture/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ apply plugin: 'opensearch.java'
group = 'hdfs'

dependencies {
api "org.apache.hadoop:hadoop-minicluster:3.3.2"
api("org.apache.hadoop:hadoop-minicluster:3.3.3") {
exclude module: 'websocket-client'
}
api "org.apache.commons:commons-compress:1.21"
api "commons-codec:commons-codec:${versions.commonscodec}"
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
Expand All @@ -44,4 +46,5 @@ dependencies {
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
api 'net.minidev:json-smart:2.4.8'
api "org.mockito:mockito-core:${versions.mockito}"
api "com.google.protobuf:protobuf-java:3.21.2"
}