SOLR-7339: Upgrade Jetty to v9.3.6.v20151106

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1717377 13f79535-47bb-0310-9956-ffa450edef68

lucene/ivy-versions.properties

@@ -231,7 +231,8 @@ org.codehaus.jackson.version = 1.9.13
 /org.codehaus.woodstox/woodstox-core-asl = 4.4.1
 /org.easymock/easymock = 3.0
 
-org.eclipse.jetty.version = 9.2.13.v20150730
+org.eclipse.jetty.version = 9.3.6.v20151106
+/org.eclipse.jetty.http2/http2-parent = ${org.eclipse.jetty.version}
 /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}

lucene/licenses/jetty-continuation-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-f6bd4e6871ecd0a5e7a5e5addcea160cd73f81bb

lucene/licenses/jetty-continuation-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+a120bc737d2efc6ebf4a703325ee679aff181881

lucene/licenses/jetty-http-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-23a745d9177ef67ef53cc46b9b70c5870082efc2

lucene/licenses/jetty-http-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+c2bba60bc1f9fe5779ac20ab30232bf9a89d3e52

lucene/licenses/jetty-io-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-7a351e6a1b63dfd56b6632623f7ca2793ffb67ad

lucene/licenses/jetty-io-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+09e59bde867e55d8c93cdd682d12317733ef5339

lucene/licenses/jetty-server-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-5be7d1da0a7abffd142de3091d160717c120b6ab

lucene/licenses/jetty-server-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+d9c43a1b20ede7e3c456237d71b4cce1dff5457a

lucene/licenses/jetty-servlet-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-5ad6e38015a97ae9a60b6c2ad744ccfa9cf93a50

lucene/licenses/jetty-servlet-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+62c03d6c7203735d4e28e4e78e22df38152f01ef

lucene/licenses/jetty-util-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-c101476360a7cdd0670462de04053507d5e70c97

lucene/licenses/jetty-util-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+8721c8e670c11ea19005c567733453956b6243fc

solr/CHANGES.txt

@@ -27,6 +27,7 @@ Carrot2 3.10.4
 Velocity 1.7 and Velocity Tools 2.0
 Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.6
+Jetty 9.3.6.v20151106
 
 System Requirements
 ----------------------
@@ -159,6 +160,8 @@ Other Changes
 * SOLR-8179: SQL JDBC - DriverImpl loadParams doesn't support keys with no values in the connection string
   (Kevin Risden, Joel Bernstein)
 
+* SOLR-7339: Upgrade Jetty to v9.3.6.v20151106. (Gregg Donovan, shalin)
+
 ======================= 5.5.0 =======================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java

@@ -500,7 +500,7 @@ public class JettySolrRunner {
         throw new IllegalStateException("Jetty Connector is not open: " + 
                                         c.getLocalPort());
       }
-      protocol = c.getDefaultProtocol().equals("SSL-http/1.1")  ? "https" : "http";
+      protocol = c.getDefaultProtocol().startsWith("SSL")  ? "https" : "http";
       return new URL(protocol, c.getHost(), c.getLocalPort(), config.context);
 
     } catch (MalformedURLException e) {

solr/core/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java

@@ -87,7 +87,7 @@ public class SSLConfig {
     if (sslConfig.getKeyStorePassword() != null)
       factory.setKeyStorePassword(sslConfig.getKeyStorePassword());
     if (sslConfig.getTrustStore() != null)
-      factory.setTrustStorePath(System.getProperty(sslConfig.getTrustStore()));
+      factory.setTrustStorePath(sslConfig.getTrustStore());
     if (sslConfig.getTrustStorePassword() != null)
       factory.setTrustStorePassword(sslConfig.getTrustStorePassword());
 

solr/licenses/jetty-continuation-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-f6bd4e6871ecd0a5e7a5e5addcea160cd73f81bb

solr/licenses/jetty-continuation-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+a120bc737d2efc6ebf4a703325ee679aff181881

solr/licenses/jetty-deploy-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-54182b020f7b8d9083a59f34e0a2a3b649035d63

solr/licenses/jetty-deploy-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+8a4813aacd2dda3aa36b109d7fe338abdd413239

solr/licenses/jetty-http-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-23a745d9177ef67ef53cc46b9b70c5870082efc2

solr/licenses/jetty-http-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+c2bba60bc1f9fe5779ac20ab30232bf9a89d3e52

solr/licenses/jetty-io-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-7a351e6a1b63dfd56b6632623f7ca2793ffb67ad

solr/licenses/jetty-io-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+09e59bde867e55d8c93cdd682d12317733ef5339

solr/licenses/jetty-jmx-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-a2ebbbcb47ed98ecd23be550f77e8dadc9f9a800

solr/licenses/jetty-jmx-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+c96ec3bbee1e3ff277929e3aff2126de5b9748c1

solr/licenses/jetty-rewrite-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-5e5be7a2d37dcd8dfbb62861dbfb05b48bb7ba54

solr/licenses/jetty-rewrite-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+75f233e85377fa476f210423014bc8c20824e4c5

solr/licenses/jetty-security-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-cc7c7f27ec4cc279253be1675d9e47e58b995943

solr/licenses/jetty-security-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+e44ffc80834a7f78a5b0ed15c54b875956772242

solr/licenses/jetty-server-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-5be7d1da0a7abffd142de3091d160717c120b6ab

solr/licenses/jetty-server-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+d9c43a1b20ede7e3c456237d71b4cce1dff5457a

solr/licenses/jetty-servlet-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-5ad6e38015a97ae9a60b6c2ad744ccfa9cf93a50

solr/licenses/jetty-servlet-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+62c03d6c7203735d4e28e4e78e22df38152f01ef

solr/licenses/jetty-servlets-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-23eb48f1d889d45902e400750460d4cd94d74663

solr/licenses/jetty-servlets-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+468c799c20b73de386b9de499ae1bb9cbbe7f559

solr/licenses/jetty-util-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-c101476360a7cdd0670462de04053507d5e70c97

solr/licenses/jetty-util-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+8721c8e670c11ea19005c567733453956b6243fc

solr/licenses/jetty-webapp-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-716b5cdea1e818cd0e36dfea791f620d49bd2d2a

solr/licenses/jetty-webapp-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+9cf00a3b7b2c1b6e024bb687e3719e1b0ff9e899

solr/licenses/jetty-xml-9.2.13.v20150730.jar.sha1

@@ -1 +0,0 @@
-9e17bdfb8c25d0cd377960326b79379df3181776

solr/licenses/jetty-xml-9.3.6.v20151106.jar.sha1

@@ -0,0 +1 @@
+b22e22977ea6c08751f8c945bb0785c35f9db28a

solr/licenses/start.jar.sha1

@@ -1 +1 @@
-e400e65c5217a25a1fa024e414700287e6c07a61
+1ea60b0f4e5f31b19c58471a6a616bac6699d75d

solr/server/ivy.xml

@@ -45,6 +45,7 @@
     <dependency org="org.eclipse.jetty" name="jetty-util" rev="${/org.eclipse.jetty/jetty-util}" conf="jetty"/>
     <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="${/org.eclipse.jetty/jetty-webapp}" conf="jetty"/>
     <dependency org="org.eclipse.jetty" name="jetty-xml" rev="${/org.eclipse.jetty/jetty-xml}" conf="jetty"/>
+    <dependency org="org.eclipse.jetty.http2" name="http2-parent" rev="${/org.eclipse.jetty.http2/http2-parent}" conf="jetty"/>
 
     <dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="jetty"/>
 

solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java

@@ -35,6 +35,7 @@ import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.solr.client.solrj.embedded.SSLConfig;
 import org.apache.solr.client.solrj.impl.HttpClientConfigurer;
 import org.apache.solr.common.params.SolrParams;
+import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.security.CertificateUtils;
 
 public class SSLTestConfig extends SSLConfig {
@@ -82,7 +83,7 @@ public class SSLTestConfig extends SSLConfig {
   
   protected static KeyStore buildKeyStore(String keyStoreLocation, String password) {
     try {
-      return CertificateUtils.getKeyStore(null, keyStoreLocation, "JKS", null, password);
+      return CertificateUtils.getKeyStore(Resource.newResource(keyStoreLocation), "JKS", null, password);
     } catch (Exception ex) {
       throw new IllegalStateException("Unable to build KeyStore from file: " + keyStoreLocation, ex);
     }