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

Manually update com.google.jimfs:jimfs from 1.2 to 1.3.0 #8585

Merged
merged 12 commits into from
Jul 11, 2023
Merged

Manually update com.google.jimfs:jimfs from 1.2 to 1.3.0 #8585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c92b543
update Jimfs
stephen-crawford Jul 10, 2023
7b9c6b5
Add PR number
stephen-crawford Jul 10, 2023
fa5c14e
bump in keystore too
stephen-crawford Jul 10, 2023
32080f2
bump in upgrade-cli
stephen-crawford Jul 10, 2023
f8acaf5
Bump in evil tests
stephen-crawford Jul 10, 2023
5a42e35
Specify extended path
stephen-crawford Jul 10, 2023
9a59a0b
Merge branch 'main' into updateGoogleJimfs
stephen-crawford Jul 10, 2023
53fbe7a
Merge branch 'main' into updateGoogleJimfs
stephen-crawford Jul 10, 2023
463d6a8
Fix third party audit
stephen-crawford Jul 10, 2023
610074b
Merge branch 'main' into updateGoogleJimfs
stephen-crawford Jul 11, 2023
6bde493
trivial change to trigger retry
stephen-crawford Jul 11, 2023
d997dfb
Merge branch 'main' into updateGoogleJimfs
stephen-crawford Jul 11, 2023
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 @@ -143,6 +143,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `com.google.jimfs:jimfs` from 1.2 to 1.3.0 (#8577, #8571)
- Bump `com.networknt:json-schema-validator` from 1.0.85 to 1.0.86 ([#8573](https://github.com/opensearch-project/OpenSearch/pull/8573))
- Bump `com.google.cloud:google-cloud-core-http` from 2.17.0 to 2.21.0 ([#8586](https://github.com/opensearch-project/OpenSearch/pull/8586))
- Bump `com.google.jimfs:jimfs` from 1.2 to 1.3.0 ([#8585](https://github.com/opensearch-project/OpenSearch/pull/8585))
- Bump `org.apache.logging.log4j:log4j-core` from 2.17.1 to 2.20.0 ([#8307](https://github.com/opensearch-project/OpenSearch/pull/8307))

### Changed
Expand Down
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 @@ -40,7 +40,7 @@ dependencies {
api "org.bouncycastle:bcpg-fips:1.0.7.1"
api "org.bouncycastle:bc-fips:1.0.2.3"
testImplementation project(":test:framework")
testImplementation 'com.google.jimfs:jimfs:1.2'
testImplementation 'com.google.jimfs:jimfs:1.3.0'
testRuntimeOnly("com.google.guava:guava:${versions.guava}") {
transitive = false
}
Expand Down
3 changes: 1 addition & 2 deletions qa/evil-tests/build.gradle
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/identity/IdentityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.opensearch.plugins.IdentityPlugin;

/**
* Identity and access control for OpenSearch.
* Identity and access control for OpenSearch
*
* @opensearch.experimental
* */
Expand Down