You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/02/24 07:12:39 UTC
[32/53] [abbrv] lucene-solr git commit: SOLR-8711: Upgrade Carrot2
clustering dependency to 3.12.0 SOLR-8710: Upgrade morfologik-stemming to
version 2.1.0 LUCENE-7040: Upgrade morfologik-stemming to version 2.1.0
SOLR-8711: Upgrade Carrot2 clustering dependency to 3.12.0
SOLR-8710: Upgrade morfologik-stemming to version 2.1.0
LUCENE-7040: Upgrade morfologik-stemming to version 2.1.0
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ed90697d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ed90697d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ed90697d
Branch: refs/heads/apiv2
Commit: ed90697dd2db5233b46cbf6902a7186538864102
Parents: b14fb50
Author: Dawid Weiss <da...@carrotsearch.com>
Authored: Mon Feb 22 18:23:50 2016 +0100
Committer: Dawid Weiss <da...@carrotsearch.com>
Committed: Mon Feb 22 18:23:50 2016 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
lucene/ivy-versions.properties | 4 ++--
lucene/licenses/morfologik-fsa-2.0.1.jar.sha1 | 1 -
lucene/licenses/morfologik-fsa-2.1.0.jar.sha1 | 1 +
lucene/licenses/morfologik-fsa-LICENSE-BSD.txt | 2 +-
lucene/licenses/morfologik-polish-2.0.1.jar.sha1 | 1 -
lucene/licenses/morfologik-polish-2.1.0.jar.sha1 | 1 +
lucene/licenses/morfologik-polish-LICENSE-BSD.txt | 16 +++++++++-------
lucene/licenses/morfologik-stemming-2.0.1.jar.sha1 | 1 -
lucene/licenses/morfologik-stemming-2.1.0.jar.sha1 | 1 +
lucene/licenses/morfologik-stemming-LICENSE-BSD.txt | 2 +-
solr/CHANGES.txt | 6 +++++-
solr/licenses/carrot2-mini-3.10.4.jar.sha1 | 1 -
solr/licenses/carrot2-mini-3.12.0.jar.sha1 | 1 +
solr/licenses/morfologik-fsa-2.0.1.jar.sha1 | 1 -
solr/licenses/morfologik-fsa-2.1.0.jar.sha1 | 1 +
solr/licenses/morfologik-fsa-LICENSE-BSD.txt | 2 +-
solr/licenses/morfologik-polish-2.0.1.jar.sha1 | 1 -
solr/licenses/morfologik-polish-2.1.0.jar.sha1 | 1 +
solr/licenses/morfologik-polish-LICENSE-BSD.txt | 16 +++++++++-------
solr/licenses/morfologik-stemming-2.0.1.jar.sha1 | 1 -
solr/licenses/morfologik-stemming-2.1.0.jar.sha1 | 1 +
solr/licenses/morfologik-stemming-LICENSE-BSD.txt | 2 +-
23 files changed, 39 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 9df0150..9794611 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -64,6 +64,9 @@ New Features
* LUCENE-6989: Add preliminary support for MMapDirectory unmapping in Java 9.
(Uwe Schindler, Chris Hegarty, Peter Levart)
+* LUCENE-7040: Upgrade morfologik-stemming to version 2.1.0.
+ (Dawid Weiss)
+
API Changes
* LUCENE-6067: Accountable.getChildResources has a default
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 1f832e9..0c2808b 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -213,9 +213,9 @@ org.bouncycastle.version = 1.45
/org.carrot2.attributes/attributes-binder = 1.2.3
/org.carrot2.shaded/carrot2-guava = 18.0
-/org.carrot2/carrot2-mini = 3.10.4
+/org.carrot2/carrot2-mini = 3.12.0
-org.carrot2.morfologik.version = 2.0.1
+org.carrot2.morfologik.version = 2.1.0
/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/ed90697d/lucene/licenses/morfologik-fsa-2.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-fsa-2.0.1.jar.sha1 b/lucene/licenses/morfologik-fsa-2.0.1.jar.sha1
deleted file mode 100644
index 2d5f0a7..0000000
--- a/lucene/licenses/morfologik-fsa-2.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-23b4c04bb74f80e77573dc3ab84c8b4203f68d50
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/licenses/morfologik-fsa-2.1.0.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-fsa-2.1.0.jar.sha1 b/lucene/licenses/morfologik-fsa-2.1.0.jar.sha1
new file mode 100644
index 0000000..42c0fb3
--- /dev/null
+++ b/lucene/licenses/morfologik-fsa-2.1.0.jar.sha1
@@ -0,0 +1 @@
+88e5993f73c102f378c711f6e47221b7a9e22d25
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/licenses/morfologik-fsa-LICENSE-BSD.txt
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-fsa-LICENSE-BSD.txt b/lucene/licenses/morfologik-fsa-LICENSE-BSD.txt
index 31ebad0..635227a 100644
--- a/lucene/licenses/morfologik-fsa-LICENSE-BSD.txt
+++ b/lucene/licenses/morfologik-fsa-LICENSE-BSD.txt
@@ -1,6 +1,6 @@
Copyright (c) 2006 Dawid Weiss
-Copyright (c) 2007-2015 Dawid Weiss, Marcin Miłkowski
+Copyright (c) 2007-2016 Dawid Weiss, Marcin Miłkowski
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/licenses/morfologik-polish-2.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-polish-2.0.1.jar.sha1 b/lucene/licenses/morfologik-polish-2.0.1.jar.sha1
deleted file mode 100644
index 4647d1c..0000000
--- a/lucene/licenses/morfologik-polish-2.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b35034de153a79d0afeeeee2ff883d548a178961
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/licenses/morfologik-polish-2.1.0.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-polish-2.1.0.jar.sha1 b/lucene/licenses/morfologik-polish-2.1.0.jar.sha1
new file mode 100644
index 0000000..7f8b4c2
--- /dev/null
+++ b/lucene/licenses/morfologik-polish-2.1.0.jar.sha1
@@ -0,0 +1 @@
+d5a9c7721bce2ef17444abbe25ac2e65bfaa181f
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/licenses/morfologik-polish-LICENSE-BSD.txt
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-polish-LICENSE-BSD.txt b/lucene/licenses/morfologik-polish-LICENSE-BSD.txt
index 660f633..f0af542 100644
--- a/lucene/licenses/morfologik-polish-LICENSE-BSD.txt
+++ b/lucene/licenses/morfologik-polish-LICENSE-BSD.txt
@@ -1,18 +1,20 @@
BSD-licensed dictionary of Polish (Morfologik)
-Morfologik Polish dictionary.
-Version: 2.0 PoliMorf
-Copyright (c) 2013, Marcin Miłkowski
+VERSION: 2.1 PoliMorf
+BUILD: 2016-02-13 19:37:50+01:00
+GIT: 6e63b53
+
+Copyright (c) 2016, Marcin Miłkowski
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+ list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -23,4 +25,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/licenses/morfologik-stemming-2.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-stemming-2.0.1.jar.sha1 b/lucene/licenses/morfologik-stemming-2.0.1.jar.sha1
deleted file mode 100644
index 808e482..0000000
--- a/lucene/licenses/morfologik-stemming-2.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df9434b431bbed20ded67ede439c7dfb1e29e9f8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/licenses/morfologik-stemming-2.1.0.jar.sha1
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-stemming-2.1.0.jar.sha1 b/lucene/licenses/morfologik-stemming-2.1.0.jar.sha1
new file mode 100644
index 0000000..78f1961
--- /dev/null
+++ b/lucene/licenses/morfologik-stemming-2.1.0.jar.sha1
@@ -0,0 +1 @@
+94167b64752138a246cc33cbf1a3b0bfe5274b7c
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/lucene/licenses/morfologik-stemming-LICENSE-BSD.txt
----------------------------------------------------------------------
diff --git a/lucene/licenses/morfologik-stemming-LICENSE-BSD.txt b/lucene/licenses/morfologik-stemming-LICENSE-BSD.txt
index 31ebad0..635227a 100644
--- a/lucene/licenses/morfologik-stemming-LICENSE-BSD.txt
+++ b/lucene/licenses/morfologik-stemming-LICENSE-BSD.txt
@@ -1,6 +1,6 @@
Copyright (c) 2006 Dawid Weiss
-Copyright (c) 2007-2015 Dawid Weiss, Marcin Miłkowski
+Copyright (c) 2007-2016 Dawid Weiss, Marcin Miłkowski
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 25c3a50..6f6133f 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.7
-Carrot2 3.10.4
+Carrot2 3.12.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
Apache ZooKeeper 3.4.6
@@ -290,6 +290,10 @@ Other Changes
* SOLR-8693: Improve ZkStateReader logging. (Scott Blum via Mark Miller)
+* SOLR-8710: Upgrade morfologik-stemming to version 2.1.0. (Dawid Weiss)
+
+* SOLR-8711: Upgrade Carrot2 clustering dependency to 3.12.0. (Dawid Weiss)
+
======================= 5.5.0 =======================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/carrot2-mini-3.10.4.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/carrot2-mini-3.10.4.jar.sha1 b/solr/licenses/carrot2-mini-3.10.4.jar.sha1
deleted file mode 100644
index 8bc4a85..0000000
--- a/solr/licenses/carrot2-mini-3.10.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-25b82ce95f12e123f2516bda25eb0305c57d7407
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/carrot2-mini-3.12.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/carrot2-mini-3.12.0.jar.sha1 b/solr/licenses/carrot2-mini-3.12.0.jar.sha1
new file mode 100644
index 0000000..5a90da6
--- /dev/null
+++ b/solr/licenses/carrot2-mini-3.12.0.jar.sha1
@@ -0,0 +1 @@
+9d8b42afe43ba5c0a0c5d67208d5c919e45c3584
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/morfologik-fsa-2.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-fsa-2.0.1.jar.sha1 b/solr/licenses/morfologik-fsa-2.0.1.jar.sha1
deleted file mode 100644
index 2d5f0a7..0000000
--- a/solr/licenses/morfologik-fsa-2.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-23b4c04bb74f80e77573dc3ab84c8b4203f68d50
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/morfologik-fsa-2.1.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-fsa-2.1.0.jar.sha1 b/solr/licenses/morfologik-fsa-2.1.0.jar.sha1
new file mode 100644
index 0000000..42c0fb3
--- /dev/null
+++ b/solr/licenses/morfologik-fsa-2.1.0.jar.sha1
@@ -0,0 +1 @@
+88e5993f73c102f378c711f6e47221b7a9e22d25
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/morfologik-fsa-LICENSE-BSD.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-fsa-LICENSE-BSD.txt b/solr/licenses/morfologik-fsa-LICENSE-BSD.txt
index 4daba47..635227a 100644
--- a/solr/licenses/morfologik-fsa-LICENSE-BSD.txt
+++ b/solr/licenses/morfologik-fsa-LICENSE-BSD.txt
@@ -1,6 +1,6 @@
Copyright (c) 2006 Dawid Weiss
-Copyright (c) 2007-2013 Dawid Weiss, Marcin Miłkowski
+Copyright (c) 2007-2016 Dawid Weiss, Marcin Miłkowski
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/morfologik-polish-2.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-polish-2.0.1.jar.sha1 b/solr/licenses/morfologik-polish-2.0.1.jar.sha1
deleted file mode 100644
index 4647d1c..0000000
--- a/solr/licenses/morfologik-polish-2.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b35034de153a79d0afeeeee2ff883d548a178961
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/morfologik-polish-2.1.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-polish-2.1.0.jar.sha1 b/solr/licenses/morfologik-polish-2.1.0.jar.sha1
new file mode 100644
index 0000000..7f8b4c2
--- /dev/null
+++ b/solr/licenses/morfologik-polish-2.1.0.jar.sha1
@@ -0,0 +1 @@
+d5a9c7721bce2ef17444abbe25ac2e65bfaa181f
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/morfologik-polish-LICENSE-BSD.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-polish-LICENSE-BSD.txt b/solr/licenses/morfologik-polish-LICENSE-BSD.txt
index 660f633..f0af542 100644
--- a/solr/licenses/morfologik-polish-LICENSE-BSD.txt
+++ b/solr/licenses/morfologik-polish-LICENSE-BSD.txt
@@ -1,18 +1,20 @@
BSD-licensed dictionary of Polish (Morfologik)
-Morfologik Polish dictionary.
-Version: 2.0 PoliMorf
-Copyright (c) 2013, Marcin Miłkowski
+VERSION: 2.1 PoliMorf
+BUILD: 2016-02-13 19:37:50+01:00
+GIT: 6e63b53
+
+Copyright (c) 2016, Marcin Miłkowski
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+ list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -23,4 +25,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/morfologik-stemming-2.0.1.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-stemming-2.0.1.jar.sha1 b/solr/licenses/morfologik-stemming-2.0.1.jar.sha1
deleted file mode 100644
index 808e482..0000000
--- a/solr/licenses/morfologik-stemming-2.0.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-df9434b431bbed20ded67ede439c7dfb1e29e9f8
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/morfologik-stemming-2.1.0.jar.sha1
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-stemming-2.1.0.jar.sha1 b/solr/licenses/morfologik-stemming-2.1.0.jar.sha1
new file mode 100644
index 0000000..78f1961
--- /dev/null
+++ b/solr/licenses/morfologik-stemming-2.1.0.jar.sha1
@@ -0,0 +1 @@
+94167b64752138a246cc33cbf1a3b0bfe5274b7c
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ed90697d/solr/licenses/morfologik-stemming-LICENSE-BSD.txt
----------------------------------------------------------------------
diff --git a/solr/licenses/morfologik-stemming-LICENSE-BSD.txt b/solr/licenses/morfologik-stemming-LICENSE-BSD.txt
index 4daba47..635227a 100644
--- a/solr/licenses/morfologik-stemming-LICENSE-BSD.txt
+++ b/solr/licenses/morfologik-stemming-LICENSE-BSD.txt
@@ -1,6 +1,6 @@
Copyright (c) 2006 Dawid Weiss
-Copyright (c) 2007-2013 Dawid Weiss, Marcin Miłkowski
+Copyright (c) 2007-2016 Dawid Weiss, Marcin Miłkowski
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,