You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by dw...@apache.org on 2022/11/10 20:44:33 UTC
[solr] branch branch_9x updated: SOLR-16545: upgrade carrot2 to 4.5.0 (backport to 9x) (#1175)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 376a5e44334 SOLR-16545: upgrade carrot2 to 4.5.0 (backport to 9x) (#1175)
376a5e44334 is described below
commit 376a5e44334d636b20c43e891d83d3dbb6d369d3
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Thu Nov 10 21:44:28 2022 +0100
SOLR-16545: upgrade carrot2 to 4.5.0 (backport to 9x) (#1175)
---
solr/CHANGES.txt | 2 ++
solr/licenses/carrot2-core-4.4.3.jar.sha1 | 1 -
solr/licenses/carrot2-core-4.5.0.jar.sha1 | 1 +
versions.lock | 2 +-
versions.props | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e7256e51975..687367d1c4b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -80,6 +80,8 @@ Build
Other Changes
---------------------
+* SOLR-16545: Upgrade Carrot2 to 4.5.0 (Dawid Weiss)
+
* SOLR-16150: Embedded ZK Server used for zkRun should advertise itself on specific bound interfaces instead of
generically on localhost. (Mike Drob)
diff --git a/solr/licenses/carrot2-core-4.4.3.jar.sha1 b/solr/licenses/carrot2-core-4.4.3.jar.sha1
deleted file mode 100644
index 5f41e10f8cc..00000000000
--- a/solr/licenses/carrot2-core-4.4.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df52360694057e0d3a0d6f38334d72616c584db2
diff --git a/solr/licenses/carrot2-core-4.5.0.jar.sha1 b/solr/licenses/carrot2-core-4.5.0.jar.sha1
new file mode 100644
index 00000000000..e73e922edcf
--- /dev/null
+++ b/solr/licenses/carrot2-core-4.5.0.jar.sha1
@@ -0,0 +1 @@
+05d9c3ec8dbf009dfe9e62a2a87654983eec7f4b
diff --git a/versions.lock b/versions.lock
index f7585ee5491..3711adb11a3 100644
--- a/versions.lock
+++ b/versions.lock
@@ -223,7 +223,7 @@ org.bouncycastle:bcpkix-jdk15on:1.70 (2 constraints: ce1b11b3)
org.bouncycastle:bcprov-jdk15on:1.70 (4 constraints: 1f34ee12)
org.bouncycastle:bcutil-jdk15on:1.70 (2 constraints: 961ad454)
org.brotli:dec:0.1.2 (1 constraints: 5a0ce101)
-org.carrot2:carrot2-core:4.4.3 (1 constraints: 0d050e36)
+org.carrot2:carrot2-core:4.5.0 (1 constraints: 0b050e36)
org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
diff --git a/versions.props b/versions.props
index 924e4ee0023..17c5f946055 100644
--- a/versions.props
+++ b/versions.props
@@ -55,7 +55,7 @@ org.apache.opennlp:opennlp-tools=1.9.4
org.apache.tika:*=1.28.4
org.apache.zookeeper:*=3.8.0
org.bitbucket.b_c:jose4j=0.7.9
-org.carrot2:carrot2-core=4.4.3
+org.carrot2:carrot2-core=4.5.0
org.codehaus.woodstox:stax2-api=4.2.1
org.eclipse.jetty*:*=9.4.48.v20220622
org.glassfish.hk2*:*=2.6.1