diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index 446cfb5539e..38e2d464bfc 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -305,7 +305,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.3.0 +org.restlet.jee.version = 2.4.0 /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 fcbac162a3e..40bd76cecb5 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -203,6 +203,8 @@ Improvements * SOLR-14132: Upgrade Angular JS 1.3.8 to 1.7.9 (Kevin Risden) +* SOLR-14221: Upgrade restlet to version 2.4.0 (janhoy) + Optimizations --------------------- diff --git a/solr/licenses/org.restlet-2.3.0.jar.sha1 b/solr/licenses/org.restlet-2.3.0.jar.sha1 deleted file mode 100644 index 77e949d323e..00000000000 --- a/solr/licenses/org.restlet-2.3.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4c5d184e23fa729726668a90dc7338d80c4e7e6f diff --git a/solr/licenses/org.restlet-2.4.0.jar.sha1 b/solr/licenses/org.restlet-2.4.0.jar.sha1 new file mode 100644 index 00000000000..469dee0d216 --- /dev/null +++ b/solr/licenses/org.restlet-2.4.0.jar.sha1 @@ -0,0 +1 @@ +80f34dd07c6f515f226aa1050908179679625821 diff --git a/solr/licenses/org.restlet.ext.servlet-2.3.0.jar.sha1 b/solr/licenses/org.restlet.ext.servlet-2.3.0.jar.sha1 deleted file mode 100644 index 32c31ad33cc..00000000000 --- a/solr/licenses/org.restlet.ext.servlet-2.3.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9303e20d0397c0304342943560c3a1693fd7ce7d 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 new file mode 100644 index 00000000000..1c36a58cdf8 --- /dev/null +++ b/solr/licenses/org.restlet.ext.servlet-2.4.0.jar.sha1 @@ -0,0 +1 @@ +34fc0a5d08cfe68299887de9790de4d53ab80302 diff --git a/versions.lock b/versions.lock index 19fcc7f9716..cd7a73ecd4a 100644 --- a/versions.lock +++ b/versions.lock @@ -199,8 +199,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.3.0 (2 constraints: e3159ee6) -org.restlet.jee:org.restlet.ext.servlet:2.3.0 (1 constraints: 0705fe35) +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.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: 6ef487eb) diff --git a/versions.props b/versions.props index 7f25678af73..544f93dd1f2 100644 --- a/versions.props +++ b/versions.props @@ -99,7 +99,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.3.0 +org.restlet.jee:*=2.4.0 org.rrd4j:rrd4j=3.5 org.slf4j:*=1.7.24 org.tallison:jmatio=1.5