From d47b75395cc31ba86886353c4af9e7dc01121b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Fri, 4 Jun 2021 09:41:35 +0200 Subject: [PATCH] LUCENE-9985 Upgrade Jetty to 9.4.41 (#165) --- lucene/CHANGES.txt | 2 ++ .../jetty-continuation-9.4.34.v20201102.jar.sha1 | 1 - .../jetty-continuation-9.4.41.v20210516.jar.sha1 | 1 + .../licenses/jetty-http-9.4.34.v20201102.jar.sha1 | 1 - .../licenses/jetty-http-9.4.41.v20210516.jar.sha1 | 1 + lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 | 1 - lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 | 1 + .../licenses/jetty-server-9.4.34.v20201102.jar.sha1 | 1 - .../licenses/jetty-server-9.4.41.v20210516.jar.sha1 | 1 + .../jetty-servlet-9.4.34.v20201102.jar.sha1 | 1 - .../jetty-servlet-9.4.41.v20210516.jar.sha1 | 1 + .../licenses/jetty-util-9.4.34.v20201102.jar.sha1 | 1 - .../licenses/jetty-util-9.4.41.v20210516.jar.sha1 | 1 + .../jetty-util-ajax-9.4.41.v20210516.jar.sha1 | 1 + versions.lock | 13 +++++++------ versions.props | 2 +- 16 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 lucene/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-http-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-server-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 delete mode 100644 lucene/licenses/jetty-util-9.4.34.v20201102.jar.sha1 create mode 100644 lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 create mode 100644 lucene/licenses/jetty-util-ajax-9.4.41.v20210516.jar.sha1 diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index b2b8dde7ffd..a0848a75d5f 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -449,6 +449,8 @@ Other * LUCENE-9836: Migrate Maven tasks to use "maven-resolver-ant-tasks" instead of the no longer maintained "maven-ant-tasks". (Uwe Schindler) +* LUCENE-9985: Upgrade jetty to 9.4.41 (janhoy) + ======================= Lucene 8.8.2 ======================= Bug Fixes diff --git a/lucene/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 9cfe0569eeb..00000000000 --- a/lucene/licenses/jetty-continuation-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -070923c6b55dcabd4bde53971554261048844b3f diff --git a/lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 new file mode 100644 index 00000000000..7bd5e5a78c5 --- /dev/null +++ b/lucene/licenses/jetty-continuation-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +e5859cddb2cac51fd8339668bd35ccac106cb28f diff --git a/lucene/licenses/jetty-http-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-http-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index c44b514bcbe..00000000000 --- a/lucene/licenses/jetty-http-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7acb9ea4deaba904a49e304ac24f9b3a8ddb5881 diff --git a/lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 new file mode 100644 index 00000000000..36812d204b4 --- /dev/null +++ b/lucene/licenses/jetty-http-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +0d460bece4dd9666b46cbd18f8d7fd31cf02ecd9 diff --git a/lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 46b17d2aadf..00000000000 --- a/lucene/licenses/jetty-io-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -80693ce94fa34647e9af613ba17c443feb624590 diff --git a/lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 new file mode 100644 index 00000000000..d88fbd5f52a --- /dev/null +++ b/lucene/licenses/jetty-io-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +820eea368623939c2113902b1ca7a98186f64a73 diff --git a/lucene/licenses/jetty-server-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-server-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index bd9bf9f1911..00000000000 --- a/lucene/licenses/jetty-server-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19c5309325d5819a9e22bfee66a3c0d50750ed03 diff --git a/lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 new file mode 100644 index 00000000000..dd66f473319 --- /dev/null +++ b/lucene/licenses/jetty-server-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +25b1963b0a1c56202ec37046adc55861815107ce diff --git a/lucene/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 822f1595ff6..00000000000 --- a/lucene/licenses/jetty-servlet-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -606f9724b14bf58c915ee0e37f6425c52dae7b76 diff --git a/lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 new file mode 100644 index 00000000000..6ff3ebd2180 --- /dev/null +++ b/lucene/licenses/jetty-servlet-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +ea45368ea7fd04026038f89e6910f17f70939641 diff --git a/lucene/licenses/jetty-util-9.4.34.v20201102.jar.sha1 b/lucene/licenses/jetty-util-9.4.34.v20201102.jar.sha1 deleted file mode 100644 index 5b96d842b73..00000000000 --- a/lucene/licenses/jetty-util-9.4.34.v20201102.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47993d1def63ca9e8bc7284716a89031f642db82 diff --git a/lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 new file mode 100644 index 00000000000..9870323ef5c --- /dev/null +++ b/lucene/licenses/jetty-util-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +548c76ea00d7eb3e2bcea273174e5d030639d109 diff --git a/lucene/licenses/jetty-util-ajax-9.4.41.v20210516.jar.sha1 b/lucene/licenses/jetty-util-ajax-9.4.41.v20210516.jar.sha1 new file mode 100644 index 00000000000..23af8c84736 --- /dev/null +++ b/lucene/licenses/jetty-util-ajax-9.4.41.v20210516.jar.sha1 @@ -0,0 +1 @@ +d4c1d66fc62796a17548e6c344fbf89b5889f873 diff --git a/versions.lock b/versions.lock index 1217c6cf9fd..5bfeac5561a 100644 --- a/versions.lock +++ b/versions.lock @@ -18,12 +18,13 @@ org.apache.opennlp:opennlp-tools:1.9.1 (1 constraints: 0d050c36) org.carrot2:morfologik-fsa:2.1.5 (1 constraints: d70d9836) org.carrot2:morfologik-polish:2.1.5 (1 constraints: 0a05fd35) org.carrot2:morfologik-stemming:2.1.5 (2 constraints: 0b12640c) -org.eclipse.jetty:jetty-continuation:9.4.34.v20201102 (1 constraints: 7207007d) -org.eclipse.jetty:jetty-http:9.4.34.v20201102 (1 constraints: ef0f2ecd) -org.eclipse.jetty:jetty-io:9.4.34.v20201102 (2 constraints: 061feb64) -org.eclipse.jetty:jetty-server:9.4.34.v20201102 (1 constraints: 7207007d) -org.eclipse.jetty:jetty-servlet:9.4.34.v20201102 (1 constraints: 7207007d) -org.eclipse.jetty:jetty-util:9.4.34.v20201102 (2 constraints: 471d80d8) +org.eclipse.jetty:jetty-continuation:9.4.41.v20210516 (1 constraints: 7907fe7c) +org.eclipse.jetty:jetty-http:9.4.41.v20210516 (1 constraints: f60f2ccd) +org.eclipse.jetty:jetty-io:9.4.41.v20210516 (2 constraints: 141f4566) +org.eclipse.jetty:jetty-server:9.4.41.v20210516 (1 constraints: 7907fe7c) +org.eclipse.jetty:jetty-servlet:9.4.41.v20210516 (1 constraints: 7907fe7c) +org.eclipse.jetty:jetty-util:9.4.41.v20210516 (3 constraints: 422efaf1) +org.eclipse.jetty:jetty-util-ajax:9.4.41.v20210516 (1 constraints: 64101be2) org.hamcrest:hamcrest:2.2 (1 constraints: a8041f2c) org.locationtech.spatial4j:spatial4j:0.7 (1 constraints: ab041e2c) org.ow2.asm:asm:7.2 (2 constraints: 900e3e5e) diff --git a/versions.props b/versions.props index 9da9afb83dd..4b5a2c239d0 100644 --- a/versions.props +++ b/versions.props @@ -21,7 +21,7 @@ org.apache.httpcomponents:httpcore=4.4.13 org.apache.logging.log4j:*=2.13.2 org.apache.opennlp:opennlp-tools=1.9.1 org.carrot2:morfologik-*=2.1.5 -org.eclipse.jetty:*=9.4.34.v20201102 +org.eclipse.jetty:*=9.4.41.v20210516 org.hamcrest:*=2.2 org.locationtech.jts:jts-core=1.15.0 org.locationtech.spatial4j:*=0.7