commit 58c338dfc34e606f20ee82c2faa4c99bf82113fa Author: Dawid Weiss Date: Mon Jun 25 21:57:48 2012 +0200 Upgrade to 1.5.3, tests not passing. diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath index 46ab697..f5bdac1 100644 --- a/dev-tools/eclipse/dot.classpath +++ b/dev-tools/eclipse/dot.classpath @@ -97,9 +97,9 @@ - - - + + + diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template index 14ffae8..3e30464 100644 --- a/dev-tools/maven/pom.xml.template +++ b/dev-tools/maven/pom.xml.template @@ -303,7 +303,7 @@ org.carrot2 morfologik-polish - 1.5.2 + 1.5.3 org.codehaus.woodstox diff --git a/lucene/analysis/morfologik/build.xml b/lucene/analysis/morfologik/build.xml index d7e5c5a..d4455c7 100644 --- a/lucene/analysis/morfologik/build.xml +++ b/lucene/analysis/morfologik/build.xml @@ -27,9 +27,9 @@ - - - + + + diff --git a/lucene/analysis/morfologik/ivy.xml b/lucene/analysis/morfologik/ivy.xml index f35e1ae..c5fa721 100644 --- a/lucene/analysis/morfologik/ivy.xml +++ b/lucene/analysis/morfologik/ivy.xml @@ -19,9 +19,9 @@ - - - + + + diff --git a/lucene/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar.sha1 b/lucene/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar.sha1 deleted file mode 100644 index e182839..0000000 --- a/lucene/analysis/morfologik/lib/morfologik-fsa-1.5.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1513ee81494d7856f607ff8fffc74b4c6cbe0d48 diff --git a/lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar.sha1 b/lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar.sha1 new file mode 100644 index 0000000..3d3b86d --- /dev/null +++ b/lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar.sha1 @@ -0,0 +1 @@ +d1f729cd3019e6d86485226202f84458141a5688 diff --git a/lucene/analysis/morfologik/lib/morfologik-fsa-LICENSE-BSD.txt b/lucene/analysis/morfologik/lib/morfologik-fsa-LICENSE-BSD.txt index 2684a83..f97fb7d 100644 --- a/lucene/analysis/morfologik/lib/morfologik-fsa-LICENSE-BSD.txt +++ b/lucene/analysis/morfologik/lib/morfologik-fsa-LICENSE-BSD.txt @@ -1,6 +1,6 @@ Copyright (c) 2006 Dawid Weiss -Copyright (c) 2007-2011 Dawid Weiss, Marcin Miłkowski +Copyright (c) 2007-2012 Dawid Weiss, Marcin Miłkowski All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/lucene/analysis/morfologik/lib/morfologik-polish-1.5.2.jar.sha1 b/lucene/analysis/morfologik/lib/morfologik-polish-1.5.2.jar.sha1 deleted file mode 100644 index be196fa..0000000 --- a/lucene/analysis/morfologik/lib/morfologik-polish-1.5.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee23a00580efe973aafa6f2c225e52951832901b diff --git a/lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar.sha1 b/lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar.sha1 new file mode 100644 index 0000000..6eb48a4 --- /dev/null +++ b/lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar.sha1 @@ -0,0 +1 @@ +8217b6f7ad018ceda0e824b2e60340000da4397a diff --git a/lucene/analysis/morfologik/lib/morfologik-polish-LICENSE-BSD.txt b/lucene/analysis/morfologik/lib/morfologik-polish-LICENSE-BSD.txt new file mode 100644 index 0000000..04ffd07 --- /dev/null +++ b/lucene/analysis/morfologik/lib/morfologik-polish-LICENSE-BSD.txt @@ -0,0 +1,62 @@ +BSD-licensed dictionary of Polish (Morfologik) + +Copyright (c) 2012, 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. + +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 SOFTWARE IS PROVIDED BY COPYRIGHT HOLDERS “AS IS” AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; 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. + +-- + +BSD-licensed dictionary of Polish (SGJP) +http://sgjp.pl/morfeusz/ + +Copyright © 2011 Zygmunt Saloni, Włodzimierz Gruszczyński, + Marcin Woliński, Robert Wołosz + +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. + +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 SOFTWARE IS PROVIDED BY COPYRIGHT HOLDERS “AS IS” AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; 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. \ No newline at end of file diff --git a/lucene/analysis/morfologik/lib/morfologik-polish-LICENSE-COMPOUND.txt b/lucene/analysis/morfologik/lib/morfologik-polish-LICENSE-COMPOUND.txt deleted file mode 100644 index 772cffe..0000000 --- a/lucene/analysis/morfologik/lib/morfologik-polish-LICENSE-COMPOUND.txt +++ /dev/null @@ -1,42 +0,0 @@ -morfologik-polish, TERMS OF LICENCE - -This JAR contains and makes use of data from Polish ispell/myspell -dictionaries hosted at http://www.sjp.pl/slownik/en/ and is -licenced on the terms of (inter alia): GPL, LGPL, MPL or CC-SA licenses. - -Part-of-speech tags were added in Morfologik project and are not found -in the data from sjp.pl. - ------ - -BSD-licensed dictionary of Polish (SGJP) -http://sgjp.pl/morfeusz/ - -Copyright © 2011 Zygmunt Saloni, Włodzimierz Gruszczyński, - Marcin Woliński, Robert Wołosz - -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. - -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 SOFTWARE IS PROVIDED BY COPYRIGHT HOLDERS “AS IS” AND ANY EXPRESS -OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; 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. diff --git a/lucene/analysis/morfologik/lib/morfologik-polish-NOTICE.txt b/lucene/analysis/morfologik/lib/morfologik-polish-NOTICE.txt index f4d3c6c..a8a3aa1 100644 --- a/lucene/analysis/morfologik/lib/morfologik-polish-NOTICE.txt +++ b/lucene/analysis/morfologik/lib/morfologik-polish-NOTICE.txt @@ -1,9 +1,6 @@ -This product includes BSD-licensed software developed by Dawid Weiss and Marcin Miłkowski -(http://morfologik.blogspot.com/). -This JAR contains and makes use of data from Polish ispell/myspell -dictionaries hosted at http://www.sjp.pl/slownik/en/ and is -licenced on the terms of (inter alia): GPL, LGPL, MPL or CC-SA licenses. +This product includes data from BSD-licensed dictionary of Polish (Morfologik) +(http://morfologik.blogspot.com/) This product includes data from BSD-licensed dictionary of Polish (SGJP) (http://sgjp.pl/morfeusz/) diff --git a/lucene/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar.sha1 b/lucene/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar.sha1 deleted file mode 100644 index 26d203a..0000000 --- a/lucene/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eba98b7cd049e07d55a64b180345954b62e42ec5 diff --git a/lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar.sha1 b/lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar.sha1 new file mode 100644 index 0000000..c31642b --- /dev/null +++ b/lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar.sha1 @@ -0,0 +1 @@ +c4ead57b78fa71b00553ff21da6fb5a326e914e8 diff --git a/lucene/analysis/morfologik/lib/morfologik-stemming-LICENSE-BSD.txt b/lucene/analysis/morfologik/lib/morfologik-stemming-LICENSE-BSD.txt index 2684a83..f97fb7d 100644 --- a/lucene/analysis/morfologik/lib/morfologik-stemming-LICENSE-BSD.txt +++ b/lucene/analysis/morfologik/lib/morfologik-stemming-LICENSE-BSD.txt @@ -1,6 +1,6 @@ Copyright (c) 2006 Dawid Weiss -Copyright (c) 2007-2011 Dawid Weiss, Marcin Miłkowski +Copyright (c) 2007-2012 Dawid Weiss, Marcin Miłkowski All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java index 599fd42..b7c7f5e 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java +++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java @@ -7,7 +7,6 @@ import java.util.Map; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.apache.solr.schema.IndexSchema; /** * Licensed to the Apache Software Foundation (ASF) under one or more