Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4259: Carrot2 dependency should be declared on the mini version, not the core. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1452220 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dawid Weiss 2013-03-04 09:30:00 +00:00
parent 326531d820
commit 2080245c8d
8 changed files with 53 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-tools/maven/pom.xml.template
View File

@ -347,7 +347,7 @@
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
<artifactId>carrot2-mini</artifactId>
<version>3.6.2</version>
</dependency>
<dependency>

42
dev-tools/maven/solr/contrib/clustering/pom.xml.template
View File

@ -64,48 +64,8 @@
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
<artifactId>carrot2-mini</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-snowball</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-smartcn</artifactId>
</exclusion>
<exclusion>
<groupId>net.java.dev.rome</groupId>
<artifactId>rome</artifactId>
</exclusion>
<exclusion>
<groupId>net.java.dev.rome</groupId>
<artifactId>rome-fetcher</artifactId>
</exclusion>
<exclusion>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.carrot2</groupId>
<artifactId>morfologik-stemming</artifactId>
</exclusion>
<exclusion>
<groupId>jfree</groupId>
<artifactId>jcommon</artifactId>

3
solr/CHANGES.txt
View File

@ -231,6 +231,9 @@ Optimizations
Other Changes
----------------------
* SOLR-4259: Carrot2 dependency should be declared on the mini version, not the core.
(Dawid Weiss).
* SOLR-4348: Make the lock type configurable by system property by default.
(Mark Miller)

2
solr/contrib/clustering/ivy.xml
View File

@ -19,7 +19,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="clustering"/>
<dependencies>
<dependency org="org.carrot2" name="carrot2-core" rev="3.6.2" transitive="false"/>
<dependency org="org.carrot2" name="carrot2-mini" rev="3.6.2" transitive="false"/>
<dependency org="org.carrot2.attributes" name="attributes-binder" rev="1.0.1" transitive="false"/>
<dependency org="com.carrotsearch" name="hppc" rev="0.4.1" transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.7.4" transitive="false"/>

1
solr/licenses/carrot2-core-3.6.2.jar.sha1
View File

@ -1 +0,0 @@
e88e96cd62c6c22d02d12c72e5209e7a46690190

1
solr/licenses/carrot2-mini-3.6.2.jar.sha1 Normal file
View File

@ -0,0 +1 @@
ffd6e0f7ef6c189bf8b456ef749f1ce600d6df74

72
solr/licenses/carrot2-core-LICENSE-BSD_LIKE.txt → solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt
View File

@ -1,36 +1,36 @@
Carrot2 Project
Copyright (C) 2002-2010, Dawid Weiss, Stanisław Osiński.
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 the Carrot2 Project nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
- We kindly request that you include in the end-user documentation provided with
the redistribution and/or in the software itself an acknowledgement equivalent
to the following: "This product includes software developed by the Carrot2
Project."
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 OWNER 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.
Carrot2 Project
Copyright (C) 2002-2013, Dawid Weiss, Stanisław Osiński.
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 the Carrot2 Project nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
- We kindly request that you include in the end-user documentation provided with
the redistribution and/or in the software itself an acknowledgement equivalent
to the following: "This product includes software developed by the Carrot2
Project."
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 OWNER 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.

20
solr/licenses/carrot2-core-NOTICE.txt → solr/licenses/carrot2-mini-NOTICE.txt
View File

@ -1,10 +1,10 @@
=========================================================================
== Carrot2 Notice ==
=========================================================================
Copyright (C) 2002-2010, Dawid Weiss, Stanislaw Osinski.
Portions (C) Contributors listed in "carrot2.CONTRIBUTORS" file.
All rights reserved.
This product includes software developed by the Carrot2 Project.
See http://project.carrot2.org/
=========================================================================
== Carrot2 Notice ==
=========================================================================
Copyright (C) 2002-2013, Dawid Weiss, Stanislaw Osinski.
Portions (C) Contributors listed in "carrot2.CONTRIBUTORS" file.
All rights reserved.
This product includes software developed by the Carrot2 Project.
See http://project.carrot2.org/