diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index 4021d3ee012..bd2e05257de 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -230,7 +230,7 @@ org.codehaus.janino.version = 2.7.6 /org.codehaus.woodstox/stax2-api = 3.1.4 /org.codehaus.woodstox/woodstox-core-asl = 4.4.1 -org.eclipse.jetty.version = 9.3.20.v20170531 +org.eclipse.jetty.version = 9.4.8.v20171121 /org.eclipse.jetty/jetty-continuation = ${org.eclipse.jetty.version} /org.eclipse.jetty/jetty-deploy = ${org.eclipse.jetty.version} /org.eclipse.jetty/jetty-http = ${org.eclipse.jetty.version} diff --git a/lucene/licenses/jetty-continuation-9.3.20.v20170531.jar.sha1 b/lucene/licenses/jetty-continuation-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 4e086fcf849..00000000000 --- a/lucene/licenses/jetty-continuation-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0176f1ef8366257e7b6214c3bbd710cf47593135 diff --git a/lucene/licenses/jetty-continuation-9.4.8.v20171121.jar.sha1 b/lucene/licenses/jetty-continuation-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..f519f05ae20 --- /dev/null +++ b/lucene/licenses/jetty-continuation-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +34b64138f6589d3d32d02058fe73ec788cb981bf diff --git a/lucene/licenses/jetty-http-9.3.20.v20170531.jar.sha1 b/lucene/licenses/jetty-http-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 1936a2e298f..00000000000 --- a/lucene/licenses/jetty-http-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -32f5fe22ed468a49df1ffcbb27c39c1b53f261aa diff --git a/lucene/licenses/jetty-http-9.4.8.v20171121.jar.sha1 b/lucene/licenses/jetty-http-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..1e97da0d5de --- /dev/null +++ b/lucene/licenses/jetty-http-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +9879d6c4e37400bf43f0cd4b3c6e34a3ba409864 diff --git a/lucene/licenses/jetty-io-9.3.20.v20170531.jar.sha1 b/lucene/licenses/jetty-io-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 5d47c215049..00000000000 --- a/lucene/licenses/jetty-io-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b68e7761fcacefcf26ad9ab50943db65fda2c3d diff --git a/lucene/licenses/jetty-io-9.4.8.v20171121.jar.sha1 b/lucene/licenses/jetty-io-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..2396010ffb2 --- /dev/null +++ b/lucene/licenses/jetty-io-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +d3fe2dfa62f52ee91ff07cb359f63387e0e30b40 diff --git a/lucene/licenses/jetty-server-9.3.20.v20170531.jar.sha1 b/lucene/licenses/jetty-server-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 0c9d4357680..00000000000 --- a/lucene/licenses/jetty-server-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6a1523d44ebb527eed068a5c8bfd22edd6a20530 diff --git a/lucene/licenses/jetty-server-9.4.8.v20171121.jar.sha1 b/lucene/licenses/jetty-server-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..1369bae0d7b --- /dev/null +++ b/lucene/licenses/jetty-server-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +34614bd9a29de57ef28ca31f1f2b49a412af196d diff --git a/lucene/licenses/jetty-servlet-9.3.20.v20170531.jar.sha1 b/lucene/licenses/jetty-servlet-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 452932d2baf..00000000000 --- a/lucene/licenses/jetty-servlet-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21a698f9d58d03cdf58bf2a40f93de58c2eab138 diff --git a/lucene/licenses/jetty-servlet-9.4.8.v20171121.jar.sha1 b/lucene/licenses/jetty-servlet-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..5632347596a --- /dev/null +++ b/lucene/licenses/jetty-servlet-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +bbbb9b5de08f468c7b9b3de6aea0b098d2c679b6 diff --git a/lucene/licenses/jetty-util-9.3.20.v20170531.jar.sha1 b/lucene/licenses/jetty-util-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 7d020a4a546..00000000000 --- a/lucene/licenses/jetty-util-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19ce4203809da37f8ea7a5632704fa71b6f0ccc2 diff --git a/lucene/licenses/jetty-util-9.4.8.v20171121.jar.sha1 b/lucene/licenses/jetty-util-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..7a3c6ad69b4 --- /dev/null +++ b/lucene/licenses/jetty-util-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +d6ec1a1613c7fa72aa6bf5d8c204750afbc3df3b diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java b/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java index 6d27071d220..98349c35ebe 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java @@ -28,7 +28,7 @@ import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.server.session.HashSessionIdManager; +import org.eclipse.jetty.server.session.DefaultSessionIdManager; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.AfterClass; @@ -109,7 +109,7 @@ public abstract class ReplicatorTestCase extends LuceneTestCase { connector.setHost("127.0.0.1"); server.setConnectors(new Connector[] {connector}); - server.setSessionIdManager(new HashSessionIdManager(new Random(random().nextLong()))); + server.setSessionIdManager(new DefaultSessionIdManager(server, new Random(random().nextLong()))); server.setHandler(handler); server.start(); diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 187976df237..83767941a4c 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -47,7 +47,7 @@ Carrot2 3.15.0 Velocity 1.7 and Velocity Tools 2.0 Apache UIMA 2.3.1 Apache ZooKeeper 3.4.10 -Jetty 9.3.20.v20170531 +Jetty 9.4.8.v20171121 Upgrade Notes ---------------------- @@ -89,9 +89,11 @@ New Features * SOLR-11064: Collection APIs should use the disk space hint when using policy framework (noble) -* SOLR-11854: multivalued primative fields can now be sorted by implicitly choosing the min/max +* SOLR-11854: multivalued primitive fields can now be sorted by implicitly choosing the min/max value for asc/desc sort orders. (hossman) +* SOLR-11810: Upgrade Jetty to 9.4.8.v20171121 (Varun Thacker, Erick Erickson) + Bug Fixes ---------------------- diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java index 608b2340506..e5b81f8bc21 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java @@ -53,11 +53,11 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.server.handler.gzip.GzipHandler; -import org.eclipse.jetty.server.session.HashSessionIdManager; -import org.eclipse.jetty.servlet.BaseHolder; +import org.eclipse.jetty.server.session.DefaultSessionIdManager; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.servlet.Source; import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; @@ -248,7 +248,7 @@ public class JettySolrRunner { connector.setIdleTimeout(THREAD_POOL_MAX_IDLE_TIME_MS); server.setConnectors(new Connector[] {connector}); - server.setSessionIdManager(new HashSessionIdManager(new Random())); + server.setSessionIdManager(new DefaultSessionIdManager(server, new Random())); } else { ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory()); connector.setPort(port); @@ -300,7 +300,7 @@ public class JettySolrRunner { String pathSpec = config.extraServlets.get(servletHolder); root.addServlet(servletHolder, pathSpec); } - dispatchFilter = root.getServletHandler().newFilterHolder(BaseHolder.Source.EMBEDDED); + dispatchFilter = root.getServletHandler().newFilterHolder(Source.EMBEDDED); dispatchFilter.setHeldClass(SolrDispatchFilter.class); dispatchFilter.setInitParameter("excludePatterns", excludePatterns); root.addFilter(dispatchFilter, "*", EnumSet.of(DispatcherType.REQUEST)); diff --git a/solr/licenses/jetty-continuation-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-continuation-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 4e086fcf849..00000000000 --- a/solr/licenses/jetty-continuation-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0176f1ef8366257e7b6214c3bbd710cf47593135 diff --git a/solr/licenses/jetty-continuation-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-continuation-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..f519f05ae20 --- /dev/null +++ b/solr/licenses/jetty-continuation-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +34b64138f6589d3d32d02058fe73ec788cb981bf diff --git a/solr/licenses/jetty-deploy-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-deploy-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index f7f04781371..00000000000 --- a/solr/licenses/jetty-deploy-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -160c0cefd2fddacd040c41801f40a5a372a9302c diff --git a/solr/licenses/jetty-deploy-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-deploy-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..293df7b20a6 --- /dev/null +++ b/solr/licenses/jetty-deploy-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +5737f32c5f017905f92baea5479d6ee9c5405dc8 diff --git a/solr/licenses/jetty-http-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-http-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 1936a2e298f..00000000000 --- a/solr/licenses/jetty-http-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -32f5fe22ed468a49df1ffcbb27c39c1b53f261aa diff --git a/solr/licenses/jetty-http-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-http-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..1e97da0d5de --- /dev/null +++ b/solr/licenses/jetty-http-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +9879d6c4e37400bf43f0cd4b3c6e34a3ba409864 diff --git a/solr/licenses/jetty-io-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-io-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 5d47c215049..00000000000 --- a/solr/licenses/jetty-io-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b68e7761fcacefcf26ad9ab50943db65fda2c3d diff --git a/solr/licenses/jetty-io-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-io-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..2396010ffb2 --- /dev/null +++ b/solr/licenses/jetty-io-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +d3fe2dfa62f52ee91ff07cb359f63387e0e30b40 diff --git a/solr/licenses/jetty-jmx-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-jmx-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 90b06d7cb8b..00000000000 --- a/solr/licenses/jetty-jmx-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4a28dd045b8992752ff7727f25cf9e888e9c8c4c diff --git a/solr/licenses/jetty-jmx-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-jmx-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..7b4bb768594 --- /dev/null +++ b/solr/licenses/jetty-jmx-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +7ee4d6a96cced3c1758125e3a5ad26281c5c7123 diff --git a/solr/licenses/jetty-rewrite-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-rewrite-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index ddb45f102db..00000000000 --- a/solr/licenses/jetty-rewrite-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8fb029863ceb6531ee0e24c59a004f622226217b diff --git a/solr/licenses/jetty-rewrite-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-rewrite-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..3bdc42d3578 --- /dev/null +++ b/solr/licenses/jetty-rewrite-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +755ec66c0d7bb4fc7c4293dfca329c2cf4f044f3 diff --git a/solr/licenses/jetty-security-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-security-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index d4f40c474ca..00000000000 --- a/solr/licenses/jetty-security-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9e2ded957c05f447a0611fa64ca4ab5f7cc5aa65 diff --git a/solr/licenses/jetty-security-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-security-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..c3f377d8333 --- /dev/null +++ b/solr/licenses/jetty-security-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +e8350eec683b55494287f06740543e4be6f75425 diff --git a/solr/licenses/jetty-server-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-server-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 0c9d4357680..00000000000 --- a/solr/licenses/jetty-server-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6a1523d44ebb527eed068a5c8bfd22edd6a20530 diff --git a/solr/licenses/jetty-server-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-server-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..1369bae0d7b --- /dev/null +++ b/solr/licenses/jetty-server-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +34614bd9a29de57ef28ca31f1f2b49a412af196d diff --git a/solr/licenses/jetty-servlet-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-servlet-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 452932d2baf..00000000000 --- a/solr/licenses/jetty-servlet-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21a698f9d58d03cdf58bf2a40f93de58c2eab138 diff --git a/solr/licenses/jetty-servlet-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-servlet-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..5632347596a --- /dev/null +++ b/solr/licenses/jetty-servlet-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +bbbb9b5de08f468c7b9b3de6aea0b098d2c679b6 diff --git a/solr/licenses/jetty-servlets-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-servlets-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 57908558427..00000000000 --- a/solr/licenses/jetty-servlets-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0bb3b1ddc06525eba71c37f51402996502d323a9 diff --git a/solr/licenses/jetty-servlets-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-servlets-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..93e3e422640 --- /dev/null +++ b/solr/licenses/jetty-servlets-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +f7b7f3d6be91f5e1a47b4d3ecaf286652b4d1332 diff --git a/solr/licenses/jetty-util-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-util-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 7d020a4a546..00000000000 --- a/solr/licenses/jetty-util-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19ce4203809da37f8ea7a5632704fa71b6f0ccc2 diff --git a/solr/licenses/jetty-util-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-util-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..7a3c6ad69b4 --- /dev/null +++ b/solr/licenses/jetty-util-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +d6ec1a1613c7fa72aa6bf5d8c204750afbc3df3b diff --git a/solr/licenses/jetty-webapp-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-webapp-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index 1fa7b15988c..00000000000 --- a/solr/licenses/jetty-webapp-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b41166ce279c481216501d45c0d0f4f6da23c0b diff --git a/solr/licenses/jetty-webapp-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-webapp-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..cb995a63528 --- /dev/null +++ b/solr/licenses/jetty-webapp-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +695278449233cee9bae9eed930a5264b574774f0 diff --git a/solr/licenses/jetty-xml-9.3.20.v20170531.jar.sha1 b/solr/licenses/jetty-xml-9.3.20.v20170531.jar.sha1 deleted file mode 100644 index a8a3f2bb345..00000000000 --- a/solr/licenses/jetty-xml-9.3.20.v20170531.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9f3f158a6a4587c4283561a3a3fc5a187173becf diff --git a/solr/licenses/jetty-xml-9.4.8.v20171121.jar.sha1 b/solr/licenses/jetty-xml-9.4.8.v20171121.jar.sha1 new file mode 100644 index 00000000000..c427daa0600 --- /dev/null +++ b/solr/licenses/jetty-xml-9.4.8.v20171121.jar.sha1 @@ -0,0 +1 @@ +b0d6f87f580a9bd7fa9aaf9b7448bf63cf0ac34f diff --git a/solr/licenses/start.jar.sha1 b/solr/licenses/start.jar.sha1 index a964f9add96..20b1e616384 100644 --- a/solr/licenses/start.jar.sha1 +++ b/solr/licenses/start.jar.sha1 @@ -1 +1 @@ -68b040771da53967c7e48f2ffd7c53732687f425 +54904991ec70b400057a7a82c3603035740a6d53 diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java index 6c13e40b77b..4d76f02d8db 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java @@ -37,7 +37,7 @@ import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.session.HashSessionIdManager; +import org.eclipse.jetty.server.session.DefaultSessionIdManager; import org.eclipse.jetty.webapp.WebAppContext; import org.junit.Rule; import org.junit.rules.RuleChain; @@ -74,7 +74,7 @@ public class JettyWebappTest extends SolrTestCaseJ4 server = new Server(port); // insecure: only use for tests!!!! - server.setSessionIdManager(new HashSessionIdManager(new Random(random().nextLong()))); + server.setSessionIdManager(new DefaultSessionIdManager(server, new Random(random().nextLong()))); new WebAppContext(server, path, context ); ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory()); diff --git a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java index b60efdbfade..8268fcdcc11 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java +++ b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java @@ -16,7 +16,8 @@ */ package org.apache.solr.util; -import java.util.Random; +import javax.net.ssl.SSLContext; +import java.io.IOException; import java.security.KeyManagementException; import java.security.KeyStore; import java.security.KeyStoreException; @@ -24,17 +25,15 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.security.SecureRandomSpi; import java.security.UnrecoverableKeyException; - -import javax.net.ssl.SSLContext; -import java.net.MalformedURLException; +import java.util.Random; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLContexts; import org.apache.http.conn.ssl.SSLContextBuilder; +import org.apache.http.conn.ssl.SSLContexts; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.conn.ssl.TrustSelfSignedStrategy; import org.apache.solr.client.solrj.embedded.SSLConfig; @@ -89,7 +88,7 @@ public class SSLTestConfig extends SSLConfig { Resource result; try { result = Resource.newResource(userInput); - } catch (MalformedURLException e) { + } catch (IOException e) { throw new IllegalArgumentException("Can't build " + type + " Resource: " + e.getMessage(), e); } if (! result.exists()) {