Skip to content

Commit

Permalink
Exclude packaged guava from jimfs (#10055)
Browse files Browse the repository at this point in the history
Signed-off-by: Kunal Kotwani <[email protected]>
  • Loading branch information
kotwanikunal authored Sep 14, 2023
1 parent 14d6175 commit d150229
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions qa/evil-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ def props = new Properties()
project(":build-tools").file("version.properties").withInputStream { props.load(it) }

dependencies {
testImplementation 'com.google.jimfs:jimfs:1.2'
testRuntimeOnly "com.google.guava:guava:${props.getProperty('guava')}"
testImplementation('com.google.jimfs:jimfs:1.2') {
exclude group: 'com.google.guava', module: 'guava'
}
testImplementation "com.google.guava:guava:${props.getProperty('guava')}"
}

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

Please sign in to comment.