diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java b/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java index 984790e074b..4a0aaec68c2 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java @@ -271,9 +271,6 @@ public class JarHell { "class: " + clazz + System.lineSeparator() + "exists multiple times in jar: " + jarpath + " !!!!!!!!!"); } else { - if (clazz.startsWith("org.apache.log4j")) { - return; // go figure, jar hell for what should be System.out.println... - } if (clazz.startsWith("org.apache.logging.log4j.core.impl.ThrowableProxy")) { /* * deliberate to hack around a bug in Log4j diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java b/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java index 5aaadc4a389..467608922d1 100644 --- a/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java +++ b/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java @@ -111,12 +111,6 @@ public class JarHellTests extends ESTestCase { } } - public void testLog4jLeniency() throws Exception { - Path dir = createTempDir(); - URL[] jars = {makeJar(dir, "foo.jar", null, "org/apache/log4j/DuplicateClass.class"), makeJar(dir, "bar.jar", null, "org/apache/log4j/DuplicateClass.class")}; - JarHell.checkJarHell(jars); - } - public void testLog4jThrowableProxyLeniency() throws Exception { Path dir = createTempDir(); URL[] jars = {makeJar(dir, "foo.jar", null, "org.apache.logging.log4j.core.impl.ThrowableProxy.class"), makeJar(dir, "bar.jar", null, "org.apache.logging.log4j.core.impl.ThrowableProxy.class")};