From 32a0f402d66a1da33498a12d98ab366579f40f1c Mon Sep 17 00:00:00 2001 From: "Chris M. Hostetter" Date: Mon, 23 Jul 2012 17:33:24 +0000 Subject: [PATCH] SOLR-3623: Fixed inconsistent treatment of third-party dependencies for solr contribs analysis-extras & uima git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1364728 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 + solr/common-build.xml | 53 ++++++++-------- solr/contrib/analysis-extras/README.txt | 7 ++- solr/contrib/analysis-extras/build.xml | 19 +++--- solr/contrib/analysis-extras/ivy.xml | 3 + .../lib/morfologik-fsa-1.5.3.jar.sha1 | 1 + .../lib/morfologik-fsa-LICENSE-BSD.txt | 29 +++++++++ .../lib/morfologik-fsa-NOTICE.txt | 2 + .../lib/morfologik-polish-1.5.3.jar.sha1 | 1 + .../lib/morfologik-polish-LICENSE-BSD.txt | 62 +++++++++++++++++++ .../lib/morfologik-polish-NOTICE.txt | 6 ++ .../lib/morfologik-stemming-1.5.3.jar.sha1 | 1 + .../lib/morfologik-stemming-LICENSE-BSD.txt | 29 +++++++++ .../lib/morfologik-stemming-NOTICE.txt | 2 + solr/contrib/uima/README.txt | 1 + 15 files changed, 182 insertions(+), 36 deletions(-) create mode 100644 solr/contrib/analysis-extras/lib/morfologik-fsa-1.5.3.jar.sha1 create mode 100644 solr/contrib/analysis-extras/lib/morfologik-fsa-LICENSE-BSD.txt create mode 100644 solr/contrib/analysis-extras/lib/morfologik-fsa-NOTICE.txt create mode 100644 solr/contrib/analysis-extras/lib/morfologik-polish-1.5.3.jar.sha1 create mode 100644 solr/contrib/analysis-extras/lib/morfologik-polish-LICENSE-BSD.txt create mode 100644 solr/contrib/analysis-extras/lib/morfologik-polish-NOTICE.txt create mode 100644 solr/contrib/analysis-extras/lib/morfologik-stemming-1.5.3.jar.sha1 create mode 100644 solr/contrib/analysis-extras/lib/morfologik-stemming-LICENSE-BSD.txt create mode 100644 solr/contrib/analysis-extras/lib/morfologik-stemming-NOTICE.txt diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 2508771e4df..9900f4a37c6 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -131,6 +131,8 @@ Bug Fixes * SOLR-3663: There are a couple of bugs in the sync process when a leader goes down and a new leader is elected. (Mark Miller) +* SOLR-3623: Fixed inconsistent treatment of third-party dependencies for + solr contribs analysis-extras & uima (hossman) Other Changes ---------------------- diff --git a/solr/common-build.xml b/solr/common-build.xml index e97a2aaa8a6..20170152fac 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -70,21 +70,32 @@ --> + + + + + + + + + + + + + + + + - - - - - - - - - - - - + @@ -125,7 +136,7 @@ @@ -137,19 +148,11 @@ + + - - - - - - - - - - - - diff --git a/solr/contrib/analysis-extras/README.txt b/solr/contrib/analysis-extras/README.txt index c9329438fe7..c7cfbc37f60 100644 --- a/solr/contrib/analysis-extras/README.txt +++ b/solr/contrib/analysis-extras/README.txt @@ -9,8 +9,11 @@ Relies upon the following lucene components (in lucene-libs/): * lucene-analyzers-icu-X.Y.jar * lucene-analyzers-smartcn-X.Y.jar * lucene-analyzers-stempel-X.Y.jar - -And the ICU library (in lib/): + * lucene-analyzers-morfologik-X.Y.jar + * lucene-analyzers-smartcn-X.Y.jar + +And the following third-party library (in lib/): * icu4j-X.Y.jar + * morfologik-*.jar diff --git a/solr/contrib/analysis-extras/build.xml b/solr/contrib/analysis-extras/build.xml index 93519b05d54..398b7201ea6 100644 --- a/solr/contrib/analysis-extras/build.xml +++ b/solr/contrib/analysis-extras/build.xml @@ -24,13 +24,17 @@ + + + + + + + - - - - - + + @@ -38,10 +42,7 @@ depends="jar-analyzers-icu, jar-analyzers-smartcn, jar-analyzers-stempel, jar-analyzers-morfologik"> - - - - + diff --git a/solr/contrib/analysis-extras/ivy.xml b/solr/contrib/analysis-extras/ivy.xml index 62fcffbab96..6329c419bb1 100644 --- a/solr/contrib/analysis-extras/ivy.xml +++ b/solr/contrib/analysis-extras/ivy.xml @@ -20,6 +20,9 @@ + + + diff --git a/solr/contrib/analysis-extras/lib/morfologik-fsa-1.5.3.jar.sha1 b/solr/contrib/analysis-extras/lib/morfologik-fsa-1.5.3.jar.sha1 new file mode 100644 index 00000000000..3d3b86d5f8c --- /dev/null +++ b/solr/contrib/analysis-extras/lib/morfologik-fsa-1.5.3.jar.sha1 @@ -0,0 +1 @@ +d1f729cd3019e6d86485226202f84458141a5688 diff --git a/solr/contrib/analysis-extras/lib/morfologik-fsa-LICENSE-BSD.txt b/solr/contrib/analysis-extras/lib/morfologik-fsa-LICENSE-BSD.txt new file mode 100644 index 00000000000..f97fb7dfe38 --- /dev/null +++ b/solr/contrib/analysis-extras/lib/morfologik-fsa-LICENSE-BSD.txt @@ -0,0 +1,29 @@ + +Copyright (c) 2006 Dawid Weiss +Copyright (c) 2007-2012 Dawid Weiss, 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: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * 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. + + * Neither the name of Morfologik nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +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 +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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/solr/contrib/analysis-extras/lib/morfologik-fsa-NOTICE.txt b/solr/contrib/analysis-extras/lib/morfologik-fsa-NOTICE.txt new file mode 100644 index 00000000000..18ba2f3e39c --- /dev/null +++ b/solr/contrib/analysis-extras/lib/morfologik-fsa-NOTICE.txt @@ -0,0 +1,2 @@ +This product includes BSD-licensed software developed by Dawid Weiss and Marcin Miłkowski +(http://morfologik.blogspot.com/). diff --git a/solr/contrib/analysis-extras/lib/morfologik-polish-1.5.3.jar.sha1 b/solr/contrib/analysis-extras/lib/morfologik-polish-1.5.3.jar.sha1 new file mode 100644 index 00000000000..6eb48a47896 --- /dev/null +++ b/solr/contrib/analysis-extras/lib/morfologik-polish-1.5.3.jar.sha1 @@ -0,0 +1 @@ +8217b6f7ad018ceda0e824b2e60340000da4397a diff --git a/solr/contrib/analysis-extras/lib/morfologik-polish-LICENSE-BSD.txt b/solr/contrib/analysis-extras/lib/morfologik-polish-LICENSE-BSD.txt new file mode 100644 index 00000000000..04ffd07ece9 --- /dev/null +++ b/solr/contrib/analysis-extras/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/solr/contrib/analysis-extras/lib/morfologik-polish-NOTICE.txt b/solr/contrib/analysis-extras/lib/morfologik-polish-NOTICE.txt new file mode 100644 index 00000000000..a8a3aa11a3d --- /dev/null +++ b/solr/contrib/analysis-extras/lib/morfologik-polish-NOTICE.txt @@ -0,0 +1,6 @@ + +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/solr/contrib/analysis-extras/lib/morfologik-stemming-1.5.3.jar.sha1 b/solr/contrib/analysis-extras/lib/morfologik-stemming-1.5.3.jar.sha1 new file mode 100644 index 00000000000..c31642be45d --- /dev/null +++ b/solr/contrib/analysis-extras/lib/morfologik-stemming-1.5.3.jar.sha1 @@ -0,0 +1 @@ +c4ead57b78fa71b00553ff21da6fb5a326e914e8 diff --git a/solr/contrib/analysis-extras/lib/morfologik-stemming-LICENSE-BSD.txt b/solr/contrib/analysis-extras/lib/morfologik-stemming-LICENSE-BSD.txt new file mode 100644 index 00000000000..f97fb7dfe38 --- /dev/null +++ b/solr/contrib/analysis-extras/lib/morfologik-stemming-LICENSE-BSD.txt @@ -0,0 +1,29 @@ + +Copyright (c) 2006 Dawid Weiss +Copyright (c) 2007-2012 Dawid Weiss, 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: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * 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. + + * Neither the name of Morfologik nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +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 +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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/solr/contrib/analysis-extras/lib/morfologik-stemming-NOTICE.txt b/solr/contrib/analysis-extras/lib/morfologik-stemming-NOTICE.txt new file mode 100644 index 00000000000..18ba2f3e39c --- /dev/null +++ b/solr/contrib/analysis-extras/lib/morfologik-stemming-NOTICE.txt @@ -0,0 +1,2 @@ +This product includes BSD-licensed software developed by Dawid Weiss and Marcin Miłkowski +(http://morfologik.blogspot.com/). diff --git a/solr/contrib/uima/README.txt b/solr/contrib/uima/README.txt index 9d45910666e..70d49f8ff37 100644 --- a/solr/contrib/uima/README.txt +++ b/solr/contrib/uima/README.txt @@ -6,6 +6,7 @@ To start using Solr UIMA Metadata Extraction Library you should go through the f or set tags in solrconfig.xml appropriately to point those jar files. + 2. modify your schema.xml adding the fields you want to be hold metadata specifying proper values for type, indexed, stored and multiValued options: