diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index da3e827db52..d3a396bb8f7 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -307,7 +307,7 @@ org.ow2.asm.version = 7.2 /org.ow2.asm/asm = ${org.ow2.asm.version} /org.ow2.asm/asm-commons = ${org.ow2.asm.version} -org.restlet.jee.version = 2.4.0 +org.restlet.jee.version = 2.4.3 /org.restlet.jee/org.restlet = ${org.restlet.jee.version} /org.restlet.jee/org.restlet.ext.servlet = ${org.restlet.jee.version} diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index f465a19c8fb..ee251468164 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -84,6 +84,8 @@ Other Changes * LUCENE-9411: Fail complation on warnings, 9x gradle-only (Erick Erickson, Dawid Weiss) Deserves mention here as well as Lucene CHANGES.txt since it affects both. +* SOLR-14603: Update the Restlet version. (marcussorealheis) + Bug Fixes --------------------- * SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution @@ -447,6 +449,8 @@ Other Changes * SOLR-14066: Data Import Handler is deprecated. It is scheduled to be removed as of 9.0 and a community supported package for the same may now be used instead. (Ishan Chattopadhyaya, janhoy) +* Upgrade Restlet to 2.4.3 (Marcus Eagan via Ishan Chattopadhyaya) + ================== 8.5.2 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/licenses/org.restlet-2.4.0.jar.sha1 b/solr/licenses/org.restlet-2.4.0.jar.sha1 deleted file mode 100644 index 469dee0d216..00000000000 --- a/solr/licenses/org.restlet-2.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -80f34dd07c6f515f226aa1050908179679625821 diff --git a/solr/licenses/org.restlet-2.4.3.jar.sha1 b/solr/licenses/org.restlet-2.4.3.jar.sha1 new file mode 100644 index 00000000000..67a7f5c7fae --- /dev/null +++ b/solr/licenses/org.restlet-2.4.3.jar.sha1 @@ -0,0 +1 @@ +fb9441cfe1e17b04976bed9b0dfd8c4a39c41b78 diff --git a/solr/licenses/org.restlet.ext.servlet-2.4.0.jar.sha1 b/solr/licenses/org.restlet.ext.servlet-2.4.0.jar.sha1 deleted file mode 100644 index 1c36a58cdf8..00000000000 --- a/solr/licenses/org.restlet.ext.servlet-2.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -34fc0a5d08cfe68299887de9790de4d53ab80302 diff --git a/solr/licenses/org.restlet.ext.servlet-2.4.3.jar.sha1 b/solr/licenses/org.restlet.ext.servlet-2.4.3.jar.sha1 new file mode 100644 index 00000000000..b0aa84b827c --- /dev/null +++ b/solr/licenses/org.restlet.ext.servlet-2.4.3.jar.sha1 @@ -0,0 +1 @@ +5e805b9c6c07cd21958288805451236895316f56 diff --git a/versions.lock b/versions.lock index 78282b23ec8..d9121d535a6 100644 --- a/versions.lock +++ b/versions.lock @@ -201,8 +201,8 @@ org.jsoup:jsoup:1.12.1 (1 constraints: 3705303b) org.locationtech.spatial4j:spatial4j:0.7 (1 constraints: ab041e2c) org.ow2.asm:asm:7.2 (2 constraints: 900e3e5e) org.ow2.asm:asm-commons:7.2 (1 constraints: ad042e2c) -org.restlet.jee:org.restlet:2.4.0 (2 constraints: e515d4e6) -org.restlet.jee:org.restlet.ext.servlet:2.4.0 (1 constraints: 08050136) +org.restlet.jee:org.restlet:2.4.3 (2 constraints: eb156ae7) +org.restlet.jee:org.restlet.ext.servlet:2.4.3 (1 constraints: 0b050436) org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c) org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b) org.slf4j:slf4j-api:1.7.24 (18 constraints: 64f415d2) diff --git a/versions.props b/versions.props index 7a3511a9682..5757104f9a8 100644 --- a/versions.props +++ b/versions.props @@ -98,7 +98,7 @@ org.locationtech.spatial4j:*=0.7 org.mockito:mockito-core=2.23.4 org.objenesis:objenesis=2.6 org.ow2.asm:*=7.2 -org.restlet.jee:*=2.4.0 +org.restlet.jee:*=2.4.3 org.rrd4j:rrd4j=3.5 org.slf4j:*=1.7.24 org.tallison:jmatio=1.5