You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2020/02/02 11:17:00 UTC

[lucene-solr] branch branch_8x updated: SOLR-14221: Upgrade restlet to version 2.4.0 (#1211)

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new e4721d9  SOLR-14221: Upgrade restlet to version 2.4.0 (#1211)
e4721d9 is described below

commit e4721d9a2d85ef66ee54cc62c1c4694f2059ffe3
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Sun Feb 2 11:35:14 2020 +0100

    SOLR-14221: Upgrade restlet to version 2.4.0 (#1211)
    
    (cherry picked from commit 16b8d50284d679ec77bd444c2452d9f92f828b73)
---
 lucene/ivy-versions.properties                       | 2 +-
 solr/CHANGES.txt                                     | 2 ++
 solr/licenses/org.restlet-2.3.0.jar.sha1             | 1 -
 solr/licenses/org.restlet-2.4.0.jar.sha1             | 1 +
 solr/licenses/org.restlet.ext.servlet-2.3.0.jar.sha1 | 1 -
 solr/licenses/org.restlet.ext.servlet-2.4.0.jar.sha1 | 1 +
 6 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index a19bb8b..f6cc43c 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -309,7 +309,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 1c72f93..40454a9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -121,6 +121,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 77e949d..0000000
--- 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 0000000..469dee0
--- /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 32c31ad..0000000
--- 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 0000000..1c36a58
--- /dev/null
+++ b/solr/licenses/org.restlet.ext.servlet-2.4.0.jar.sha1
@@ -0,0 +1 @@
+34fc0a5d08cfe68299887de9790de4d53ab80302