You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/07/04 08:16:05 UTC

[lucene-solr] branch jira/solr-14603 created (now a6b2690)

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

ishan pushed a change to branch jira/solr-14603
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.


      at a6b2690  SOLR-14603: Update Restlet to 2.4.3

This branch includes the following new commits:

     new a6b2690  SOLR-14603: Update Restlet to 2.4.3

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[lucene-solr] 01/01: SOLR-14603: Update Restlet to 2.4.3

Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit a6b26903a12737eddbf45aa6e73afa40860f1694
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Sat Jul 4 13:45:43 2020 +0530

    SOLR-14603: Update Restlet to 2.4.3
---
 lucene/ivy-versions.properties                       | 2 +-
 solr/CHANGES.txt                                     | 2 ++
 solr/licenses/org.restlet-2.4.0.jar.sha1             | 1 -
 solr/licenses/org.restlet-2.4.3.jar.sha1             | 1 +
 solr/licenses/org.restlet.ext.servlet-2.4.3.jar.sha1 | 1 +
 versions.lock                                        | 4 ++--
 versions.props                                       | 2 +-
 7 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index da3e827..d3a396b 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 f465a19..c3b2024 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
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 469dee0..0000000
--- 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 0000000..67a7f5c
--- /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.3.jar.sha1 b/solr/licenses/org.restlet.ext.servlet-2.4.3.jar.sha1
new file mode 100644
index 0000000..b0aa84b
--- /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 78282b2..d9121d5 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 7a3511a..5757104 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