Upgrade to Lucene 4.7

Closes elastic#5104 Closes elastic#5129 Closes elastic#3757
jpountz · Feb 26, 2014 · 609e88c · 609e88c
1 parent 90e57c1
commit 609e88c
Show file tree

Hide file tree

Showing 29 changed files with 176 additions and 3,345 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,15 +22,14 @@
         <developerConnection>scm:git:git@github.com:elasticsearch/elasticsearch.git</developerConnection>
         <url>http://github.com/elasticsearch/elasticsearch</url>
     </scm>
-
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
         <version>7</version>
     </parent>
 
     <properties>
-        <lucene.version>4.6.1</lucene.version>
+        <lucene.version>4.7.0</lucene.version>
         <tests.jvms>1</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
         <tests.output>onerror</tests.output>
@@ -57,12 +56,6 @@
             <version>${lucene.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-expressions</artifactId>
-            <version>${lucene.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

diff --git a/src/main/java/org/apache/lucene/analysis/miscellaneous/XASCIIFoldingFilter.java b/src/main/java/org/apache/lucene/analysis/miscellaneous/XASCIIFoldingFilter.java
diff --git a/src/main/java/org/apache/lucene/queryparser/XSimpleQueryParser.java b/src/main/java/org/apache/lucene/queryparser/XSimpleQueryParser.java
diff --git a/src/main/java/org/apache/lucene/search/XReferenceManager.java b/src/main/java/org/apache/lucene/search/XReferenceManager.java