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 1.3] Bump guava bump to 32.0.1-jre (#8124) #8128

Merged
merged 1 commit into from
Jun 17, 2023
+25 −19
Merged

[Backport 1.3] Bump guava bump to 32.0.1-jre (#8124) #8128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### Dependencies
- Bump `netty` from 4.1.91.Final to 4.1.93.Final ([#7901](https://github.com/opensearch-project/OpenSearch/pull/7901))
- Bump `spock-core` from 1.3-groovy-2.5 to 2.3-groovy-2.5 ([#8119](https://github.com/opensearch-project/OpenSearch/pull/8119))
- Bump `com.google.guava:guava` from 31.0.1-jre to 32.0.1-jre ([#8107](https://github.com/opensearch-project/OpenSearch/pull/8107))

### Changed
### Deprecated
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 @@ -19,7 +19,7 @@ jettison = 1.5.4
asm = 9.5
woodstox = 6.4.0
kotlin = 1.7.10
guava = 31.1-jre
guava = 32.0.1-jre
protobuf = 3.22.3

# when updating the JNA version, also update the version in buildSrc/build.gradle
Expand Down
2 changes: 1 addition & 1 deletion distribution/tools/keystore-cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ dependencies {
compileOnly project(":libs:opensearch-cli")
testImplementation project(":test:framework")
testImplementation 'com.google.jimfs:jimfs:1.1'
testRuntimeOnly 'com.google.guava:guava:31.0.1-jre'
testRuntimeOnly 'com.google.guava:guava:32.0.1-jre'
}
2 changes: 1 addition & 1 deletion distribution/tools/plugin-cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies {
api "org.bouncycastle:bc-fips:1.0.2.3"
testImplementation project(":test:framework")
testImplementation 'com.google.jimfs:jimfs:1.2'
testRuntimeOnly 'com.google.guava:guava:31.0.1-jre'
testRuntimeOnly 'com.google.guava:guava:32.0.1-jre'
}

tasks.named("dependencyLicenses").configure {
Expand Down
2 changes: 1 addition & 1 deletion distribution/tools/upgrade-cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
testImplementation project(":test:framework")
testImplementation 'com.google.jimfs:jimfs:1.2'
testRuntimeOnly 'com.google.guava:guava:31.1-jre'
testRuntimeOnly 'com.google.guava:guava:32.0.1-jre'
}

tasks.named("dependencyLicenses").configure {
Expand Down
12 changes: 10 additions & 2 deletions plugins/ingest-attachment/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dependencies {
api "org.apache.tika:tika-langdetect-optimaize:${versions.tika}"
// Optimaize libraries/dependencies
runtimeOnly "com.optimaize.languagedetector:language-detector:0.6"
runtimeOnly 'com.google.guava:guava:18.0'
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
// Other dependencies
api 'org.tukaani:xz:1.9'
api 'commons-io:commons-io:2.11.0'
Expand Down Expand Up @@ -122,8 +122,16 @@ thirdPartyAudit {
'com.google.common.cache.Striped64',
'com.google.common.cache.Striped64$1',
'com.google.common.cache.Striped64$Cell',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
'com.google.common.hash.Striped64',
'com.google.common.hash.Striped64$1',
'com.google.common.hash.Striped64$Cell',
'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator',
'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1'
'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1',
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper',
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1'
)
}

Expand Down
1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/guava-18.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/guava-32.0.1-jre.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6e5d51a72d142f2d40a57dfb897188b36a95b489
7 changes: 3 additions & 4 deletions plugins/repository-azure/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ dependencies {
api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}"
api 'org.codehaus.woodstox:stax2-api:4.2.1'
implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
runtimeOnly 'com.google.guava:guava:31.1-jre'
api 'org.apache.commons:commons-lang3:3.4'
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
api 'org.apache.commons:commons-lang3:3.12.0'
testImplementation project(':test:fixtures:azure-fixture')
}

Expand Down Expand Up @@ -137,7 +137,7 @@ thirdPartyAudit {
'javax.xml.bind.annotation.XmlAccessOrder',
'javax.xml.bind.annotation.XmlAccessType',
'javax.xml.bind.annotation.XmlAccessorOrder',
'javax.xml.bind.annotation.XmlAccessorType',
'javax.xml.bind.annotation.XmlAccessorType',
'javax.xml.bind.annotation.XmlAttribute',
'javax.xml.bind.annotation.XmlElement',
'javax.xml.bind.annotation.XmlElement$DEFAULT',
Expand Down Expand Up @@ -188,7 +188,6 @@ thirdPartyAudit {
'com.google.common.hash.Striped64$Cell',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3',
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper',
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
Expand Down
1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/commons-lang3-3.12.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c6842c86792ff03b9f1d1fe2aab8dc23aa6c6f0e
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/commons-lang3-3.4.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/guava-31.1-jre.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/guava-32.0.1-jre.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6e5d51a72d142f2d40a57dfb897188b36a95b489
3 changes: 1 addition & 2 deletions plugins/repository-gcs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ opensearchplugin {
dependencies {
api 'com.google.cloud:google-cloud-storage:1.113.1'
api 'com.google.cloud:google-cloud-core:1.93.3'
runtimeOnly 'com.google.guava:guava:30.1.1-jre'
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
api 'com.google.guava:failureaccess:1.0.1'
api 'com.google.http-client:google-http-client:1.35.0'
api "commons-logging:commons-logging:${versions.commonslogging}"
Expand Down Expand Up @@ -116,7 +116,6 @@ thirdPartyAudit {
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3',
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper',
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
Expand Down
1 change: 0 additions & 1 deletion plugins/repository-gcs/licenses/guava-30.1.1-jre.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-gcs/licenses/guava-32.0.1-jre.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6e5d51a72d142f2d40a57dfb897188b36a95b489
3 changes: 1 addition & 2 deletions plugins/repository-hdfs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies {
api 'org.apache.avro:avro:1.10.2'
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
api 'com.google.code.gson:gson:2.9.0'
runtimeOnly 'com.google.guava:guava:30.1.1-jre'
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
api 'com.google.protobuf:protobuf-java:3.21.9'
api 'commons-logging:commons-logging:1.1.3'
api 'commons-cli:commons-cli:1.2'
Expand Down Expand Up @@ -363,7 +363,6 @@ thirdPartyAudit {
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
'com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3',
'com.google.common.hash.Striped64',
'com.google.common.hash.Striped64$1',
'com.google.common.hash.Striped64$Cell',
Expand Down
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/guava-30.1.1-jre.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/guava-32.0.1-jre.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6e5d51a72d142f2d40a57dfb897188b36a95b489