Skip to content

Commit

Permalink
Bump guava from 18.0 to 23.0 in /plugins/ingest-attachment (opensearc…
Browse files Browse the repository at this point in the history
…h-project#3357)

* Bump guava from 18.0 to 23.0 in /plugins/ingest-attachment

Bumps [guava](https://github.com/google/guava) from 18.0 to 23.0.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](google/guava@v18.0...v23.0)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Updating SHAs

Signed-off-by: dependabot[bot] <[email protected]>

* Add more ingorance of using internal java API sun.misc.Unsafe

Signed-off-by: Tianli Feng <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tianli Feng <[email protected]>
  • Loading branch information
3 people authored and Bukhtawar committed Jun 21, 2022
1 parent 9501269 commit 8b35f02
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
14 changes: 12 additions & 2 deletions plugins/ingest-attachment/build.gradle
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:23.0'
// Other dependencies
api 'org.tukaani:xz:1.9'
api 'commons-io:commons-io:2.11.0'
Expand Down Expand Up @@ -119,11 +119,21 @@ forbiddenPatterns {
thirdPartyAudit {
ignoreMissingClasses()
ignoreViolations(
// uses internal java api: sun.misc.Unsafe
'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.LittleEndianByteArray$UnsafeByteArray$3',
'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

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/guava-23.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c947004bb13d18182be60077ade044099e4f26f1

0 comments on commit 8b35f02

Please sign in to comment.