[hibernate-commits] Hibernate SVN: r19125 - in search/trunk: hibernate-search and 3 other directories.

[hibernate-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-03-28 18:48:08 -0400 (Sun, 28 Mar 2010)
New Revision: 19125

Modified:
   search/trunk/hibernate-search-archetype/pom.xml
   search/trunk/hibernate-search/pom.xml
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/analyzer/Article.java
   search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/analyzer/solr/Team.java
   search/trunk/pom.xml
Log:
HSEARCH-454 Upgrade Solr dependencies (Gustavo Fernandes)

Modified: search/trunk/hibernate-search/pom.xml
===================================================================
--- search/trunk/hibernate-search/pom.xml	2010-03-28 19:07:14 UTC (rev 19124)
+++ search/trunk/hibernate-search/pom.xml	2010-03-28 22:48:08 UTC (rev 19125)
@@ -59,10 +59,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
-            <artifactId>solr-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.solr</groupId>
             <artifactId>solr-core</artifactId>
         </dependency>
         <dependency>

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/analyzer/Article.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/analyzer/Article.java	2010-03-28 19:07:14 UTC (rev 19124)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/analyzer/Article.java	2010-03-28 22:48:08 UTC (rev 19125)
@@ -31,10 +31,10 @@
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 
-import org.apache.solr.analysis.EnglishPorterFilterFactory;
 import org.apache.solr.analysis.GermanStemFilterFactory;
 import org.apache.solr.analysis.LowerCaseFilterFactory;
 import org.apache.solr.analysis.StandardTokenizerFactory;
+import org.apache.solr.analysis.SnowballPorterFilterFactory;
 
 import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.AnalyzerDefs;
@@ -43,6 +43,7 @@
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
+import org.hibernate.search.annotations.Parameter;
 import org.hibernate.search.annotations.Store;
 import org.hibernate.search.annotations.TokenFilterDef;
 import org.hibernate.search.annotations.TokenizerDef;
@@ -57,8 +58,9 @@
 				tokenizer = @TokenizerDef(factory = StandardTokenizerFactory.class),
 				filters = {
 						@TokenFilterDef(factory = LowerCaseFilterFactory.class),
-						@TokenFilterDef(factory = EnglishPorterFilterFactory.class
-						)
+						@TokenFilterDef(factory = SnowballPorterFilterFactory.class, params =   {
+                          @Parameter(name = "language", value = "English")
+                        })
 				}),
 		@AnalyzerDef(name = "de",
 				tokenizer = @TokenizerDef(factory = StandardTokenizerFactory.class),

Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/analyzer/solr/Team.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/analyzer/solr/Team.java	2010-03-28 19:07:14 UTC (rev 19124)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/analyzer/solr/Team.java	2010-03-28 22:48:08 UTC (rev 19125)
@@ -150,7 +150,7 @@
 				filters = {
 						@TokenFilterDef(factory = PhoneticFilterFactory.class, params = {
 								@Parameter(name = "encoder", value = "Metaphone"),
-								@Parameter(name = "inject", value = "true")
+								@Parameter(name = "inject", value = "false")
 						})
 				})
 })

Modified: search/trunk/hibernate-search-archetype/pom.xml
===================================================================
--- search/trunk/hibernate-search-archetype/pom.xml	2010-03-28 19:07:14 UTC (rev 19124)
+++ search/trunk/hibernate-search-archetype/pom.xml	2010-03-28 22:48:08 UTC (rev 19125)
@@ -32,10 +32,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
-            <artifactId>solr-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.solr</groupId>
             <artifactId>solr-core</artifactId>
             <exclusions>
                 <exclusion>
@@ -43,10 +39,6 @@
                     <artifactId>commons-httpclient</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.solr</groupId>
-                    <artifactId>solr-solrj</artifactId>
-                </exclusion>
-                <exclusion>
                     <groupId>woodstox</groupId>
                     <artifactId>wstx-asl</artifactId>
                 </exclusion>

Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml	2010-03-28 19:07:14 UTC (rev 19124)
+++ search/trunk/pom.xml	2010-03-28 22:48:08 UTC (rev 19125)
@@ -144,6 +144,11 @@
             <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>
@@ -196,13 +201,8 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.solr</groupId>
-                <artifactId>solr-common</artifactId>
-                <version>1.3.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.solr</groupId>
                 <artifactId>solr-core</artifactId>
-                <version>1.3.0</version>
+                <version>1.4.0</version>
                 <optional>true</optional>
                 <exclusions>
                     <exclusion>
@@ -210,10 +210,6 @@
                         <artifactId>commons-httpclient</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.solr</groupId>
-                        <artifactId>solr-solrj</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>woodstox</groupId>
                         <artifactId>wstx-asl</artifactId>
                     </exclusion>