honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't be lenient if JarHell is found 

Closes #13404
This commit is contained in:
Simon Willnauer 2015-09-10 14:21:18 +02:00
parent 314e1c8a3e
commit de79faec70
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
View File

@ -61,13 +61,7 @@ public class BootstrapForTesting {
try { try {
JarHell.checkJarHell(); JarHell.checkJarHell();
} catch (Exception e) { } catch (Exception e) {
if (Boolean.parseBoolean(System.getProperty("tests.maven"))) { throw new RuntimeException("found jar hell in test classpath", e);
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);
}
} }
// make sure java.io.tmpdir exists always (in case code uses it in a static initializer) // make sure java.io.tmpdir exists always (in case code uses it in a static initializer)