From de79faec70b5fb1649776a59fe5cc98556b4f081 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Thu, 10 Sep 2015 14:21:18 +0200 Subject: [PATCH] Don't be lenient if JarHell is found Closes #13404 --- .../org/elasticsearch/bootstrap/BootstrapForTesting.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java b/core/src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java index a779db2326b..fd2de8d14d0 100644 --- a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java +++ b/core/src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java @@ -61,13 +61,7 @@ public class BootstrapForTesting { try { JarHell.checkJarHell(); } catch (Exception e) { - if (Boolean.parseBoolean(System.getProperty("tests.maven"))) { - throw new RuntimeException("found jar hell in test classpath", e); - } else { - Loggers.getLogger(BootstrapForTesting.class) - .warn("Your ide or custom test runner has jar hell issues, " + - "you might want to look into that", e); - } + throw new RuntimeException("found jar hell in test classpath", e); } // make sure java.io.tmpdir exists always (in case code uses it in a static initializer)