Skip to content

Commit

Permalink
Manually update com.google.jimfs:jimfs from 1.2 to 1.3.0 (opensearch-…
Browse files Browse the repository at this point in the history
…project#8585)

* update Jimfs

Signed-off-by: Stephen Crawford <[email protected]>

* Add PR number

Signed-off-by: Stephen Crawford <[email protected]>

* bump in keystore too

Signed-off-by: Stephen Crawford <[email protected]>

* bump in upgrade-cli

Signed-off-by: Stephen Crawford <[email protected]>

* Bump in evil tests

Signed-off-by: Stephen Crawford <[email protected]>

* Specify extended path

Signed-off-by: Stephen Crawford <[email protected]>

* Fix third party audit

Signed-off-by: Stephen Crawford <[email protected]>

* trivial change to trigger retry

Signed-off-by: Stephen Crawford <[email protected]>

---------

Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Stephen Crawford <[email protected]>
(cherry picked from commit 89533c8)
  • Loading branch information
stephen-crawford authored and kotwanikunal committed Sep 13, 2023
1 parent e100897 commit 6462641
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bump `org.xerial.snappy:snappy-java` from 1.1.8.2 to 1.1.10.3 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252))
- Bump `com.squareup.okhttp3:okhttp` from 4.9.3 to 4.11.0 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252))
- Bump `com.squareup.okio:okio` from 2.8.0 to 3.5.0 ([#9252](https://github.com/opensearch-project/OpenSearch/pull/9252))
- Bump `com.google.jimfs:jimfs` from 1.2 to 1.3.0 ([#8585](https://github.com/opensearch-project/OpenSearch/pull/8585))

### Changed
### Deprecated
Expand Down
8 changes: 6 additions & 2 deletions distribution/tools/plugin-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ dependencies {
api "org.bouncycastle:bcpg-fips:1.0.5.1"
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:32.0.1-jre'
testImplementation 'com.google.jimfs:jimfs:1.3.0'
testRuntimeOnly("com.google.guava:guava:${versions.guava}") {
transitive = false
}

implementation 'org.apache.commons:commons-compress:1.23.0'
}

tasks.named("dependencyLicenses").configure {
Expand Down
3 changes: 1 addition & 2 deletions qa/evil-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ apply plugin: 'opensearch.testclusters'
apply plugin: 'opensearch.standalone-test'

dependencies {
testImplementation 'com.google.jimfs:jimfs:1.2'
testImplementation 'com.google.jimfs:jimfs:1.3.0'
}

// TODO: give each evil test its own fresh JVM for more isolation.
Expand All @@ -62,7 +62,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

0 comments on commit 6462641

Please sign in to comment.