diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index d5ef256337d..c2285771be9 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -228,7 +228,7 @@ 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.3.6.v20151106 +org.eclipse.jetty.version = 9.3.8.v20160314 /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.6.v20151106.jar.sha1 b/lucene/licenses/jetty-continuation-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index 6e16eda6766..00000000000 --- a/lucene/licenses/jetty-continuation-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a120bc737d2efc6ebf4a703325ee679aff181881 diff --git a/lucene/licenses/jetty-continuation-9.3.8.v20160314.jar.sha1 b/lucene/licenses/jetty-continuation-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..9197ba8b3e6 --- /dev/null +++ b/lucene/licenses/jetty-continuation-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +dec4dfc43617637694762822ef99c8373c944c98 diff --git a/lucene/licenses/jetty-http-9.3.6.v20151106.jar.sha1 b/lucene/licenses/jetty-http-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index cd8fdfceebd..00000000000 --- a/lucene/licenses/jetty-http-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c2bba60bc1f9fe5779ac20ab30232bf9a89d3e52 diff --git a/lucene/licenses/jetty-http-9.3.8.v20160314.jar.sha1 b/lucene/licenses/jetty-http-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..c36a2981c91 --- /dev/null +++ b/lucene/licenses/jetty-http-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +0127feb7407f4137ff4295b5fa2895845db56710 diff --git a/lucene/licenses/jetty-io-9.3.6.v20151106.jar.sha1 b/lucene/licenses/jetty-io-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index b06088c48b4..00000000000 --- a/lucene/licenses/jetty-io-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -09e59bde867e55d8c93cdd682d12317733ef5339 diff --git a/lucene/licenses/jetty-io-9.3.8.v20160314.jar.sha1 b/lucene/licenses/jetty-io-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..b49fa7adf8c --- /dev/null +++ b/lucene/licenses/jetty-io-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +371e3c2b72d9a9737579ec0fdfd6a2a3ab8b8141 diff --git a/lucene/licenses/jetty-server-9.3.6.v20151106.jar.sha1 b/lucene/licenses/jetty-server-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index e154577f8ce..00000000000 --- a/lucene/licenses/jetty-server-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d9c43a1b20ede7e3c456237d71b4cce1dff5457a diff --git a/lucene/licenses/jetty-server-9.3.8.v20160314.jar.sha1 b/lucene/licenses/jetty-server-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..0def5cbfdc9 --- /dev/null +++ b/lucene/licenses/jetty-server-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +da8366f602f35d4c3177cb081472e2fc4abe04ea diff --git a/lucene/licenses/jetty-servlet-9.3.6.v20151106.jar.sha1 b/lucene/licenses/jetty-servlet-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index f28a4c20424..00000000000 --- a/lucene/licenses/jetty-servlet-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -62c03d6c7203735d4e28e4e78e22df38152f01ef diff --git a/lucene/licenses/jetty-servlet-9.3.8.v20160314.jar.sha1 b/lucene/licenses/jetty-servlet-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..7180159eefa --- /dev/null +++ b/lucene/licenses/jetty-servlet-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +ea5f25d3326d7745d9c21d405dcf6f878efbd5fb diff --git a/lucene/licenses/jetty-util-9.3.6.v20151106.jar.sha1 b/lucene/licenses/jetty-util-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index 48b6b126d1e..00000000000 --- a/lucene/licenses/jetty-util-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8721c8e670c11ea19005c567733453956b6243fc diff --git a/lucene/licenses/jetty-util-9.3.8.v20160314.jar.sha1 b/lucene/licenses/jetty-util-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..026b5d05ffa --- /dev/null +++ b/lucene/licenses/jetty-util-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +01d53c7a7e7715e67d6f4edec6c5b328ee162e65 diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 7c4e2ba951b..0bb324b274f 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -71,7 +71,7 @@ Carrot2 3.12.0 Velocity 1.7 and Velocity Tools 2.0 Apache UIMA 2.3.1 Apache ZooKeeper 3.4.6 -Jetty 9.3.6.v20151106 +Jetty 9.3.8.v20160314 System Requirements ---------------------- @@ -408,7 +408,7 @@ Other Changes * SOLR-8529: Improve JdbcTest to not use plain assert statements (Kevin Risden, Joel Bernstein) -* SOLR-7339: Upgrade Jetty to v9.3.6.v20151106. (Gregg Donovan, shalin, Mark Miller) +* SOLR-7339: Upgrade Jetty to v9.3.8.v20160314. (Gregg Donovan, shalin, Mark Miller, Steve Rowe) * SOLR-5730: Make Lucene's SortingMergePolicy and EarlyTerminatingSortingCollector configurable in Solr. (Christine Poerschke, hossmann, Tomás Fernández Löbbe, Shai Erera) diff --git a/solr/licenses/jetty-continuation-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-continuation-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index 6e16eda6766..00000000000 --- a/solr/licenses/jetty-continuation-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a120bc737d2efc6ebf4a703325ee679aff181881 diff --git a/solr/licenses/jetty-continuation-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-continuation-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..9197ba8b3e6 --- /dev/null +++ b/solr/licenses/jetty-continuation-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +dec4dfc43617637694762822ef99c8373c944c98 diff --git a/solr/licenses/jetty-deploy-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-deploy-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index e65d127daf8..00000000000 --- a/solr/licenses/jetty-deploy-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8a4813aacd2dda3aa36b109d7fe338abdd413239 diff --git a/solr/licenses/jetty-deploy-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-deploy-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..dea43a04e35 --- /dev/null +++ b/solr/licenses/jetty-deploy-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +fe4025121641f5c4b06986e9b14983964bfcd7d5 diff --git a/solr/licenses/jetty-http-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-http-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index cd8fdfceebd..00000000000 --- a/solr/licenses/jetty-http-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c2bba60bc1f9fe5779ac20ab30232bf9a89d3e52 diff --git a/solr/licenses/jetty-http-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-http-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..c36a2981c91 --- /dev/null +++ b/solr/licenses/jetty-http-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +0127feb7407f4137ff4295b5fa2895845db56710 diff --git a/solr/licenses/jetty-io-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-io-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index b06088c48b4..00000000000 --- a/solr/licenses/jetty-io-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -09e59bde867e55d8c93cdd682d12317733ef5339 diff --git a/solr/licenses/jetty-io-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-io-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..b49fa7adf8c --- /dev/null +++ b/solr/licenses/jetty-io-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +371e3c2b72d9a9737579ec0fdfd6a2a3ab8b8141 diff --git a/solr/licenses/jetty-jmx-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-jmx-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index f36781b2543..00000000000 --- a/solr/licenses/jetty-jmx-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c96ec3bbee1e3ff277929e3aff2126de5b9748c1 diff --git a/solr/licenses/jetty-jmx-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-jmx-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..0da16ded98e --- /dev/null +++ b/solr/licenses/jetty-jmx-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +4aca2eb607d49969bac6a5f36be24ebe1d6d39ad diff --git a/solr/licenses/jetty-rewrite-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-rewrite-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index 7a5b5a7c00f..00000000000 --- a/solr/licenses/jetty-rewrite-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -75f233e85377fa476f210423014bc8c20824e4c5 diff --git a/solr/licenses/jetty-rewrite-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-rewrite-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..670f11ea2ff --- /dev/null +++ b/solr/licenses/jetty-rewrite-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +264a34089a62d22cea8e38f6ab6c55d8cef992dc diff --git a/solr/licenses/jetty-security-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-security-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index e7ad9b2b3a0..00000000000 --- a/solr/licenses/jetty-security-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e44ffc80834a7f78a5b0ed15c54b875956772242 diff --git a/solr/licenses/jetty-security-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-security-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..a209f1f37e7 --- /dev/null +++ b/solr/licenses/jetty-security-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +5291fa5e3098f08017bfcc7f950a7ce36c9544d7 diff --git a/solr/licenses/jetty-server-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-server-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index e154577f8ce..00000000000 --- a/solr/licenses/jetty-server-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d9c43a1b20ede7e3c456237d71b4cce1dff5457a diff --git a/solr/licenses/jetty-server-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-server-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..0def5cbfdc9 --- /dev/null +++ b/solr/licenses/jetty-server-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +da8366f602f35d4c3177cb081472e2fc4abe04ea diff --git a/solr/licenses/jetty-servlet-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-servlet-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index f28a4c20424..00000000000 --- a/solr/licenses/jetty-servlet-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -62c03d6c7203735d4e28e4e78e22df38152f01ef diff --git a/solr/licenses/jetty-servlet-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-servlet-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..7180159eefa --- /dev/null +++ b/solr/licenses/jetty-servlet-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +ea5f25d3326d7745d9c21d405dcf6f878efbd5fb diff --git a/solr/licenses/jetty-servlets-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-servlets-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index 2dd2d0978d0..00000000000 --- a/solr/licenses/jetty-servlets-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -468c799c20b73de386b9de499ae1bb9cbbe7f559 diff --git a/solr/licenses/jetty-servlets-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-servlets-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..490ba2e7cf4 --- /dev/null +++ b/solr/licenses/jetty-servlets-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +7c6cca49412e873cc2cee9903e3209525175f60d diff --git a/solr/licenses/jetty-util-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-util-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index 48b6b126d1e..00000000000 --- a/solr/licenses/jetty-util-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8721c8e670c11ea19005c567733453956b6243fc diff --git a/solr/licenses/jetty-util-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-util-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..026b5d05ffa --- /dev/null +++ b/solr/licenses/jetty-util-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +01d53c7a7e7715e67d6f4edec6c5b328ee162e65 diff --git a/solr/licenses/jetty-webapp-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-webapp-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index 0c9b5ea9a96..00000000000 --- a/solr/licenses/jetty-webapp-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9cf00a3b7b2c1b6e024bb687e3719e1b0ff9e899 diff --git a/solr/licenses/jetty-webapp-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-webapp-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..e11683f6c6b --- /dev/null +++ b/solr/licenses/jetty-webapp-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +2f0dfef84af7c97f2a1f14db65aa3f37349420e4 diff --git a/solr/licenses/jetty-xml-9.3.6.v20151106.jar.sha1 b/solr/licenses/jetty-xml-9.3.6.v20151106.jar.sha1 deleted file mode 100644 index 8bc22f3b134..00000000000 --- a/solr/licenses/jetty-xml-9.3.6.v20151106.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b22e22977ea6c08751f8c945bb0785c35f9db28a diff --git a/solr/licenses/jetty-xml-9.3.8.v20160314.jar.sha1 b/solr/licenses/jetty-xml-9.3.8.v20160314.jar.sha1 new file mode 100644 index 00000000000..8e4d3333483 --- /dev/null +++ b/solr/licenses/jetty-xml-9.3.8.v20160314.jar.sha1 @@ -0,0 +1 @@ +f02bbbf71d7ea706a95fedf7e76c3ff243049bfc diff --git a/solr/licenses/start.jar.sha1 b/solr/licenses/start.jar.sha1 index f67c9f54583..e4c0d55bacf 100644 --- a/solr/licenses/start.jar.sha1 +++ b/solr/licenses/start.jar.sha1 @@ -1 +1 @@ -1ea60b0f4e5f31b19c58471a6a616bac6699d75d +365649a3404c9baa5b0345b3375cd9698f3cc43d