[hibernate-commits] Hibernate SVN: r19202 - in search/trunk: hibernate-search and 1 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Fri Apr 9 11:56:53 EDT 2010
Author: epbernard
Date: 2010-04-09 11:56:53 -0400 (Fri, 09 Apr 2010)
New Revision: 19202
Modified:
search/trunk/hibernate-search/pom.xml
search/trunk/hibernate-search/src/main/docbook/en-US/modules/getting-started.xml
search/trunk/pom.xml
Log:
HSEARCH-491 make solr mandatory and exclude unnecessary deps. make lucene-analyzers and lucene-snowball mandatory
Modified: search/trunk/hibernate-search/pom.xml
===================================================================
--- search/trunk/hibernate-search/pom.xml 2010-04-09 15:38:14 UTC (rev 19201)
+++ search/trunk/hibernate-search/pom.xml 2010-04-09 15:56:53 UTC (rev 19202)
@@ -64,12 +64,10 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-snowball</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>jgroups</groupId>
Modified: search/trunk/hibernate-search/src/main/docbook/en-US/modules/getting-started.xml
===================================================================
--- search/trunk/hibernate-search/src/main/docbook/en-US/modules/getting-started.xml 2010-04-09 15:38:14 UTC (rev 19201)
+++ search/trunk/hibernate-search/src/main/docbook/en-US/modules/getting-started.xml 2010-04-09 15:56:53 UTC (rev 19202)
@@ -83,7 +83,7 @@
@Field,...</emphasis>) for which there exists so far no
alternative configuration. The tutorial is tested against version
3.5 of Hibernate Annotations (part of the Hibernate Core
- distribution). </entry>
+ distribution).</entry>
</row>
</tbody>
</tgroup>
@@ -129,55 +129,13 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>3.5.0-Final</version>
-</dependency>
-<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>1.4.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.stax-utils</groupId>
- <artifactId>stax-utils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-lucene-core</artifactId>
- </exclusion>
- </exclusions>
-</dependency>
-<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-snowball</artifactId>
- <version>2.9.2</version>
-</dependency>
-<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-snowball</artifactId>
- <version>2.9.2</version>
-</dependency>
-<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
- <version>2.9.2</version>
</dependency></programlisting>
</example>
<para>Not all dependencies are required. Only the
<emphasis>hibernate-search</emphasis> dependency is mandatory. This
dependency, together with its required transitive dependencies, contain
- all required classes needed to use Hibernate Search. </para>
+ all required classes needed to use Hibernate Search.</para>
<para><emphasis>hibernate-annotations</emphasis> is needed if you want to
use annotations to configure your domain model but don't want to use JPA's
@@ -188,16 +146,14 @@
XML configuration available for Hibernate Search but we provide a powerful
programmatic mapping API that elegantly replace this kind of deployment
descriptor (see <xref linkend="hsearch-mapping-programmaticapi" /> for
- more information). </para>
+ more information).</para>
<para><emphasis>hibernate-entitymanager</emphasis> is required if you want
- to use Hibernate Search in conjunction with JPA. </para>
+ to use Hibernate Search in conjunction with JPA.</para>
- <para>The Solr dependencies are needed if you want to utilize Solr's
- analyzer framework. More about this later. </para>
-
- <para>And finally, the <literal>lucene-snowball</literal> dependency is
- needed if you want to use Lucene's snowball stemmer.</para>
+ <para>And finally, you might want to add optional dependencies related to
+ Lucene (if you use some of the contribs of Lucene). By default, we add
+ lucene-snowball and lucene-analyzers as dependencies.</para>
</section>
<section>
@@ -540,10 +496,7 @@
more about the factory classes available you can either browse the Solr
JavaDoc or read the corresponding section on the <ulink
url="http://wiki.apache.org/solr/AnalyzersTokenizersTokenFilters">Solr
- Wiki.</ulink> Note that depending on the chosen factory class additional
- libraries on top of the Solr dependencies might be required. For example,
- the <classname>PhoneticFilterFactory</classname> depends on <ulink
- url="http://commons.apache.org/codec">commons-codec</ulink>.</para>
+ Wiki.</ulink></para>
<para>In the example below a
<classname>StandardTokenizerFactory</classname> is used followed by two
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2010-04-09 15:38:14 UTC (rev 19201)
+++ search/trunk/pom.xml 2010-04-09 15:56:53 UTC (rev 19202)
@@ -144,11 +144,6 @@
<version>${slf4jVersion}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>1.4.0</version>
- </dependency>
</dependencies>
<dependencyManagement>
@@ -203,7 +198,6 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>1.4.0</version>
- <optional>true</optional>
<exclusions>
<exclusion>
<groupId>commons-httpclient</groupId>
@@ -225,6 +219,51 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-lucene-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-commons-csv</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queries</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-misc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spellchecker</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ </exclusion>
+
</exclusions>
</dependency>
<dependency>
More information about the hibernate-commits
mailing list