Skip to content

Commit

Permalink
Remove jarhell check disablement
Browse files Browse the repository at this point in the history
JarHell was disabled due to an issue with Kafka where there were
multiple copies of the same class packaged inside of a release and test
distribution jar.  This was resolved with apache/kafka#12407

The Kafka change has been merged, released, and pulled into this
repository so we are removing the workaround to supress jar hell issue
detection.

- Resolves opensearch-project#1938

Signed-off-by: Peter Nied <[email protected]>
  • Loading branch information
peternied committed Aug 21, 2023
1 parent 07406d6 commit 16d4602
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 41 deletions.
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ forbiddenApisTest.enabled = false
filepermissions.enabled = false
forbiddenPatterns.enabled = false
testingConventions.enabled = false
// Conflicts between runtime kafka-clients:x.y.z & testRuntime kafka-clients:x.y.z:test
jarHell.enabled = false
jarHell.enabled = true
tasks.whenTaskAdded {task ->
if(task.name.contains("forbiddenApisIntegrationTest")) {
task.enabled = false
Expand Down
39 changes: 0 additions & 39 deletions src/test/java/org/opensearch/bootstrap/JarHell.java

This file was deleted.

0 comments on commit 16d4602

Please sign in to comment.