You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2018/05/25 07:19:16 UTC
[2/2] lucene-solr:branch_7x: SOLR-12396: Upgrade Carrot2 to 3.16.0,
HPPC to 0.8.1, morfologik to 2.1.5
SOLR-12396: Upgrade Carrot2 to 3.16.0, HPPC to 0.8.1, morfologik to 2.1.5
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b93e973b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b93e973b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b93e973b
Branch: refs/heads/branch_7x
Commit: b93e973b10ca38f93ce39a3c9dbd640f2bce3390
Parents: 1ec82d0
Author: Dawid Weiss <dw...@apache.org>
Authored: Fri May 25 09:16:41 2018 +0200
Committer: Dawid Weiss <dw...@apache.org>
Committed: Fri May 25 09:18:41 2018 +0200
----------------------------------------------------------------------
lucene/ivy-versions.properties | 8 ++++----
lucene/licenses/hppc-0.7.3.jar.sha1 | 1 -
lucene/licenses/hppc-0.8.1.jar.sha1 | 1 +
lucene/licenses/morfologik-fsa-2.1.1.jar.sha1 | 1 -
lucene/licenses/morfologik-fsa-2.1.5.jar.sha1 | 1 +
lucene/licenses/morfologik-polish-2.1.1.jar.sha1 | 1 -
lucene/licenses/morfologik-polish-2.1.5.jar.sha1 | 1 +
lucene/licenses/morfologik-stemming-2.1.1.jar.sha1 | 1 -
lucene/licenses/morfologik-stemming-2.1.5.jar.sha1 | 1 +
solr/CHANGES.txt | 4 +++-
solr/contrib/clustering/README.txt | 2 +-
solr/licenses/attributes-binder-1.3.1.jar.sha1 | 1 -
solr/licenses/attributes-binder-1.3.3.jar.sha1 | 1 +
solr/licenses/carrot2-mini-3.15.0.jar.sha1 | 1 -
solr/licenses/carrot2-mini-3.16.0.jar.sha1 | 1 +
solr/licenses/hppc-0.7.3.jar.sha1 | 1 -
solr/licenses/hppc-0.8.1.jar.sha1 | 1 +
solr/licenses/morfologik-fsa-2.1.1.jar.sha1 | 1 -
solr/licenses/morfologik-fsa-2.1.5.jar.sha1 | 1 +
solr/licenses/morfologik-polish-2.1.1.jar.sha1 | 1 -
solr/licenses/morfologik-polish-2.1.5.jar.sha1 | 1 +
solr/licenses/morfologik-stemming-2.1.1.jar.sha1 | 1 -
solr/licenses/morfologik-stemming-2.1.5.jar.sha1 | 1 +
solr/solr-ref-guide/src/result-clustering.adoc | 2 +-
24 files changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 0486ece..3579720 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -9,7 +9,7 @@ com.carrotsearch.randomizedtesting.version = 2.6.0
/com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
/com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}
-/com.carrotsearch/hppc = 0.7.3
+/com.carrotsearch/hppc = 0.8.1
/com.cybozu.labs/langdetect = 1.1-20120112
/com.drewnoakes/metadata-extractor = 2.10.1
@@ -228,12 +228,12 @@ org.bouncycastle.version = 1.54
/org.bouncycastle/bcpkix-jdk15on = ${org.bouncycastle.version}
/org.bouncycastle/bcprov-jdk15on = ${org.bouncycastle.version}
-/org.carrot2.attributes/attributes-binder = 1.3.1
+/org.carrot2.attributes/attributes-binder = 1.3.3
/org.carrot2.shaded/carrot2-guava = 18.0
-/org.carrot2/carrot2-mini = 3.15.0
+/org.carrot2/carrot2-mini = 3.16.0
-org.carrot2.morfologik.version = 2.1.1
+org.carrot2.morfologik.version = 2.1.5
/org.carrot2/morfologik-fsa = ${org.carrot2.morfologik.version}
/org.carrot2/morfologik-polish = ${org.carrot2.morfologik.version}
/org.carrot2/morfologik-stemming = ${org.carrot2.morfologik.version}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/lucene/licenses/hppc-0.7.3.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/hppc-0.7.3.jar.sha1 b/lucene/licenses/hppc-0.7.3.jar.sha1
deleted file mode 100644
index df3f33a..0000000
--- a/lucene/licenses/hppc-0.7.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1a9c77da84ac7db6a78b49c60947983490ece324
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/lucene/licenses/hppc-0.8.1.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/hppc-0.8.1.jar.sha1 b/lucene/licenses/hppc-0.8.1.jar.sha1
new file mode 100644
index 0000000..7006e68
--- /dev/null
+++ b/lucene/licenses/hppc-0.8.1.jar.sha1
@@ -0,0 +1 @@
+ffc7ba8f289428b9508ab484b8001dea944ae603
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/lucene/licenses/morfologik-fsa-2.1.1.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-fsa-2.1.1.jar.sha1 b/lucene/licenses/morfologik-fsa-2.1.1.jar.sha1
deleted file mode 100644
index 4ceed4b..0000000
--- a/lucene/licenses/morfologik-fsa-2.1.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-87866deba6aa5d19956fbe3406d8ddb5f19f5352
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/lucene/licenses/morfologik-fsa-2.1.5.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-fsa-2.1.5.jar.sha1 b/lucene/licenses/morfologik-fsa-2.1.5.jar.sha1
new file mode 100644
index 0000000..638ac07
--- /dev/null
+++ b/lucene/licenses/morfologik-fsa-2.1.5.jar.sha1
@@ -0,0 +1 @@
+8c28fea0e928b6eb1070926ad5820a3013020fa5
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/lucene/licenses/morfologik-polish-2.1.1.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-polish-2.1.1.jar.sha1 b/lucene/licenses/morfologik-polish-2.1.1.jar.sha1
deleted file mode 100644
index e625def..0000000
--- a/lucene/licenses/morfologik-polish-2.1.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-41483a4bd785a065e03aad9be4449c21d89e2d50
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/lucene/licenses/morfologik-polish-2.1.5.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-polish-2.1.5.jar.sha1 b/lucene/licenses/morfologik-polish-2.1.5.jar.sha1
new file mode 100644
index 0000000..cb29f24
--- /dev/null
+++ b/lucene/licenses/morfologik-polish-2.1.5.jar.sha1
@@ -0,0 +1 @@
+9e3dd781cf27337d64ab1bb0fc98d8b6c0fecf59
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/lucene/licenses/morfologik-stemming-2.1.1.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-stemming-2.1.1.jar.sha1 b/lucene/licenses/morfologik-stemming-2.1.1.jar.sha1
deleted file mode 100644
index 6437873..0000000
--- a/lucene/licenses/morfologik-stemming-2.1.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5c169bab2e7dd04f5cb03d179a73a4339cc1d0a2
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/lucene/licenses/morfologik-stemming-2.1.5.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-stemming-2.1.5.jar.sha1 b/lucene/licenses/morfologik-stemming-2.1.5.jar.sha1
new file mode 100644
index 0000000..56e3d97
--- /dev/null
+++ b/lucene/licenses/morfologik-stemming-2.1.5.jar.sha1
@@ -0,0 +1 @@
+a195cbd8ffa3481ea0608a8ec1518f9fc771e78f
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0c82d8d..71c484f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -23,7 +23,7 @@ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this r
Versions of Major Components
---------------------
Apache Tika 1.17
-Carrot2 3.15.0
+Carrot2 3.16.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
Apache ZooKeeper 3.4.11
@@ -44,6 +44,8 @@ Upgrade Notes
New Features
----------------------
+* SOLR-12396: Upgrade Carrot2 to 3.16.0, HPPC to 0.8.1, morfologik to 2.1.5. (Dawid Weiss)
+
* SOLR-11200: A new CMS config option 'ioThrottle' to manually enable/disable
ConcurrentMergeSchedule.doAutoIOThrottle. (Amrit Sarkar, Nawab Zada Asad iqbal via Dawid Weiss)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/contrib/clustering/README.txt
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/README.txt b/solr/contrib/clustering/README.txt
index 0c9b1fc..5e9dcb5 100644
--- a/solr/contrib/clustering/README.txt
+++ b/solr/contrib/clustering/README.txt
@@ -1,4 +1,4 @@
The Clustering contrib plugin for Solr provides a generic mechanism for plugging in third party clustering implementations.
It currently provides clustering support for search results using the Carrot2 project.
-See http://wiki.apache.org/solr/ClusteringComponent for how to get started.
+See https://lucene.apache.org/solr/guide/result-clustering for how to get started.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/attributes-binder-1.3.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/attributes-binder-1.3.1.jar.sha1 b/solr/licenses/attributes-binder-1.3.1.jar.sha1
deleted file mode 100644
index 0467976..0000000
--- a/solr/licenses/attributes-binder-1.3.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-25e015cc2cfa2080aa53cca3449b1272da9065b4
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/attributes-binder-1.3.3.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/attributes-binder-1.3.3.jar.sha1 b/solr/licenses/attributes-binder-1.3.3.jar.sha1
new file mode 100644
index 0000000..bad28fb
--- /dev/null
+++ b/solr/licenses/attributes-binder-1.3.3.jar.sha1
@@ -0,0 +1 @@
+7f13f63e2e213f6ea38364836408d2dc11f29804
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/carrot2-mini-3.15.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/carrot2-mini-3.15.0.jar.sha1 b/solr/licenses/carrot2-mini-3.15.0.jar.sha1
deleted file mode 100644
index cd87a99..0000000
--- a/solr/licenses/carrot2-mini-3.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5d76ec388711056bfaaacc354ed04ffa6811c7b7
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/carrot2-mini-3.16.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/carrot2-mini-3.16.0.jar.sha1 b/solr/licenses/carrot2-mini-3.16.0.jar.sha1
new file mode 100644
index 0000000..0b34d73
--- /dev/null
+++ b/solr/licenses/carrot2-mini-3.16.0.jar.sha1
@@ -0,0 +1 @@
+6bb27fd0dfe24a5671d9751a943728a54be48ed7
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/hppc-0.7.3.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/hppc-0.7.3.jar.sha1 b/solr/licenses/hppc-0.7.3.jar.sha1
deleted file mode 100644
index df3f33a..0000000
--- a/solr/licenses/hppc-0.7.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1a9c77da84ac7db6a78b49c60947983490ece324
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/hppc-0.8.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/hppc-0.8.1.jar.sha1 b/solr/licenses/hppc-0.8.1.jar.sha1
new file mode 100644
index 0000000..7006e68
--- /dev/null
+++ b/solr/licenses/hppc-0.8.1.jar.sha1
@@ -0,0 +1 @@
+ffc7ba8f289428b9508ab484b8001dea944ae603
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/morfologik-fsa-2.1.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-fsa-2.1.1.jar.sha1 b/solr/licenses/morfologik-fsa-2.1.1.jar.sha1
deleted file mode 100644
index 4ceed4b..0000000
--- a/solr/licenses/morfologik-fsa-2.1.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-87866deba6aa5d19956fbe3406d8ddb5f19f5352
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/morfologik-fsa-2.1.5.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-fsa-2.1.5.jar.sha1 b/solr/licenses/morfologik-fsa-2.1.5.jar.sha1
new file mode 100644
index 0000000..638ac07
--- /dev/null
+++ b/solr/licenses/morfologik-fsa-2.1.5.jar.sha1
@@ -0,0 +1 @@
+8c28fea0e928b6eb1070926ad5820a3013020fa5
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/morfologik-polish-2.1.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-polish-2.1.1.jar.sha1 b/solr/licenses/morfologik-polish-2.1.1.jar.sha1
deleted file mode 100644
index e625def..0000000
--- a/solr/licenses/morfologik-polish-2.1.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-41483a4bd785a065e03aad9be4449c21d89e2d50
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/morfologik-polish-2.1.5.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-polish-2.1.5.jar.sha1 b/solr/licenses/morfologik-polish-2.1.5.jar.sha1
new file mode 100644
index 0000000..cb29f24
--- /dev/null
+++ b/solr/licenses/morfologik-polish-2.1.5.jar.sha1
@@ -0,0 +1 @@
+9e3dd781cf27337d64ab1bb0fc98d8b6c0fecf59
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/morfologik-stemming-2.1.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-stemming-2.1.1.jar.sha1 b/solr/licenses/morfologik-stemming-2.1.1.jar.sha1
deleted file mode 100644
index 6437873..0000000
--- a/solr/licenses/morfologik-stemming-2.1.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5c169bab2e7dd04f5cb03d179a73a4339cc1d0a2
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/licenses/morfologik-stemming-2.1.5.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-stemming-2.1.5.jar.sha1 b/solr/licenses/morfologik-stemming-2.1.5.jar.sha1
new file mode 100644
index 0000000..56e3d97
--- /dev/null
+++ b/solr/licenses/morfologik-stemming-2.1.5.jar.sha1
@@ -0,0 +1 @@
+a195cbd8ffa3481ea0608a8ec1518f9fc771e78f
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b93e973b/solr/solr-ref-guide/src/result-clustering.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/result-clustering.adoc b/solr/solr-ref-guide/src/result-clustering.adoc
index 2c1766b..928cf0a 100644
--- a/solr/solr-ref-guide/src/result-clustering.adoc
+++ b/solr/solr-ref-guide/src/result-clustering.adoc
@@ -53,7 +53,7 @@ bin/solr start -e techproducts -Dsolr.clustering.enabled=true
You can now try out the clustering handler by opening the following URL in a browser:
-`\http://localhost:8983/solr/techproducts/clustering?q=*:*&rows=100&wt=xml`
+`\http://localhost:8983/solr/techproducts/clustering?q=\*:*&rows=100&wt=xml`
The output XML should include search hits and an array of automatically discovered clusters at the end, resembling the output shown here: