diff -Nru solr-5.3.0/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java solr-5.3.0.jetty9/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
--- solr-5.3.0/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java 2015-01-21 16:15:34.000000000 +0100
+++ solr-5.3.0.jetty9/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java 2015-09-16 13:13:34.697018018 +0200
@@ -36,6 +36,7 @@
import org.apache.solr.client.solrj.impl.HttpClientConfigurer;
import org.apache.solr.common.params.SolrParams;
import org.eclipse.jetty.util.security.CertificateUtils;
+import org.eclipse.jetty.util.resource.Resource;
public class SSLTestConfig extends SSLConfig {
public static File TEST_KEYSTORE = ExternalPaths.SERVER_HOME == null ? null
@@ -82,7 +83,7 @@
protected static KeyStore buildKeyStore(String keyStoreLocation, String password) {
try {
- return CertificateUtils.getKeyStore(null, keyStoreLocation, "JKS", null, password);
+ return CertificateUtils.getKeyStore(Resource.newResource(keyStoreLocation), keyStoreLocation, "JKS", password);
} catch (Exception ex) {
throw new IllegalStateException("Unable to build KeyStore from file: " + keyStoreLocation, ex);
}