Merge pull request #13465 from s1monw/issues/13404

Don't be lenient if JarHell is found
This commit is contained in:
Simon Willnauer 2015-09-21 09:53:30 +02:00
commit 3f94b5a395
1 changed files with 1 additions and 7 deletions

View File

@ -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)