Upgrade to Lucene 4.7

Closes #5104 Closes #5129 Closes #3757
elastic · Feb 19, 2014 · a12e02a · a12e02a
1 parent 1d54343
commit a12e02a
Show file tree

Hide file tree

Showing 29 changed files with 191 additions and 3,344 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,15 +22,21 @@
         <developerConnection>scm:git:git@github.com:elasticsearch/elasticsearch.git</developerConnection>
         <url>http://github.com/elasticsearch/elasticsearch</url>
     </scm>
-
+    <repositories>
+        <repository>
+            <id>lucene</id>
+            <name>lucene staging</name>
+            <url>http://people.apache.org/~simonw/staging_area/lucene-solr-4.7.0-RC1-rev1569660/lucene/maven</url>
+        </repository>
+    </repositories>
     <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 +63,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