update to solr 4.9.0

26 files changed, 54 insertions, 54 deletions

diff --git a/.classpath b/.classpath
index aa2aff8c5..695551b5d 100644
--- a/.classpath
+++ b/.classpath
@@ -39,24 +39,7 @@
 	<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>
 	<classpathentry kind="lib" path="lib/guava-16.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/spatial4j-0.4.1.jar"/>
-	<classpathentry kind="lib" path="lib/solr-core-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/solr-solrj-4.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/zookeeper-3.4.6.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-classification-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-codecs-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-core-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-facet-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-grouping-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-highlighter-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-join-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-memory-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-misc-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queries-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queryparser-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-spatial-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-suggest-4.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/org.restlet.jar"/>
 	<classpathentry kind="lib" path="lib/fontbox-1.8.5.jar"/>
 	<classpathentry kind="lib" path="lib/jempbox-1.8.5.jar"/>
@@ -67,6 +50,23 @@
 	<classpathentry kind="lib" path="lib/poi-scratchpad-3.10-FINAL-20140208.jar"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.3.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.6.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-classification-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-codecs-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-core-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-facet-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-grouping-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-highlighter-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-join-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-memory-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-misc-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queries-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queryparser-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-spatial-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-suggest-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/solr-core-4.9.0.jar"/>
+	<classpathentry kind="lib" path="lib/solr-solrj-4.9.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-core.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer.jar"/>
diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
index 014d9817d..e55a6e998 100644
--- a/addon/YaCy.app/Contents/Info.plist
+++ b/addon/YaCy.app/Contents/Info.plist
@@ -79,21 +79,21 @@
 			<string>$JAVAROOT/lib/jsch-0.1.50.jar</string>
 			<string>$JAVAROOT/lib/json-simple-1.1.1.jar</string>
 			<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
-			<string>$JAVAROOT/lib/lucene-analyzers-common-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-classification-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-codecs-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-core-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-facet-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-grouping-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-highlighter-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-join-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-memory-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-misc-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-queries-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-queryparser-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-spatial-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/lucene-suggest-4.8.1.jar</string>
+			<string>$JAVAROOT/lib/lucene-analyzers-common-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-classification-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-codecs-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-core-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-facet-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-grouping-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-highlighter-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-join-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-memory-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-misc-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-queries-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-queryparser-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-spatial-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-suggest-4.9.0.jar</string>
 			<string>$JAVAROOT/lib/metadata-extractor-2.6.2.jar</string>
 			<string>$JAVAROOT/lib/noggit-0.5.jar</string>
 			<string>$JAVAROOT/lib/org.restlet.jar</string>
@@ -102,8 +102,8 @@
 			<string>$JAVAROOT/lib/poi-scratchpad-3.10-FINAL-20140208.jar</string>
 			<string>$JAVAROOT/lib/slf4j-api-1.7.6.jar</string>
 			<string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string>
-			<string>$JAVAROOT/lib/solr-core-4.8.1.jar</string>
-			<string>$JAVAROOT/lib/solr-solrj-4.8.1.jar</string>
+			<string>$JAVAROOT/lib/solr-core-4.9.0.jar</string>
+			<string>$JAVAROOT/lib/solr-solrj-4.9.0.jar</string>
 			<string>$JAVAROOT/lib/spatial4j-0.4.1.jar</string>
 			<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
 			<string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>
diff --git a/build.xml b/build.xml
index 8576fec84..ad13735ac 100644
--- a/build.xml
+++ b/build.xml
@@ -204,21 +204,21 @@
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.6.3.jar" />
     	<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-common-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-phonetic-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-classification-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-codecs-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-core-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-facet-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-grouping-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-highlighter-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-join-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-memory-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-misc-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-queries-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-queryparser-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-spatial-4.8.1.jar" />
-    	<pathelement location="${lib}/lucene-suggest-4.8.1.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-common-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-phonetic-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-classification-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-codecs-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-core-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-facet-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-grouping-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-highlighter-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-join-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-memory-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-misc-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-queries-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-queryparser-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-spatial-4.9.0.jar" />
+    	<pathelement location="${lib}/lucene-suggest-4.9.0.jar" />
     	<pathelement location="${lib}/metadata-extractor-2.6.2.jar" />
     	<pathelement location="${lib}/noggit-0.5.jar" />
     	<pathelement location="${lib}/org.restlet.jar" />
@@ -227,8 +227,8 @@
     	<pathelement location="${lib}/poi-scratchpad-3.10-FINAL-20140208.jar" />
         <pathelement location="${lib}/slf4j-api-1.7.6.jar" />
         <pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" />
-        <pathelement location="${lib}/solr-core-4.8.1.jar" />
-        <pathelement location="${lib}/solr-solrj-4.8.1.jar" />
+        <pathelement location="${lib}/solr-core-4.9.0.jar" />
+        <pathelement location="${lib}/solr-solrj-4.9.0.jar" />
     	<pathelement location="${lib}/spatial4j-0.4.1.jar" />
     	<pathelement location="${lib}/webcat-0.1-swf.jar" />
     	<pathelement location="${lib}/wstx-asl-3.2.9.jar" />
diff --git a/defaults/solr/solrconfig.xml b/defaults/solr/solrconfig.xml
index 405d50b8c..6dd15bef6 100644
--- a/defaults/solr/solrconfig.xml
+++ b/defaults/solr/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>4.7</luceneMatchVersion>
+  <luceneMatchVersion>4.9</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in
diff --git a/lib/lucene-analyzers-common-4.8.1.jar b/lib/lucene-analyzers-common-4.9.0.jar
index b6a915838..e618bdf24 100644
--- a/lib/lucene-analyzers-common-4.8.1.jar
+++ b/lib/lucene-analyzers-common-4.9.0.jar
diff --git a/lib/lucene-analyzers-phonetic-4.8.1.jar b/lib/lucene-analyzers-phonetic-4.9.0.jar
index f462f3bc4..4c2fbc759 100644
--- a/lib/lucene-analyzers-phonetic-4.8.1.jar
+++ b/lib/lucene-analyzers-phonetic-4.9.0.jar
diff --git a/lib/lucene-classification-4.8.1.jar b/lib/lucene-classification-4.9.0.jar
index f93dc8e9c..a15b6f20c 100644
--- a/lib/lucene-classification-4.8.1.jar
+++ b/lib/lucene-classification-4.9.0.jar
diff --git a/lib/lucene-codecs-4.8.1.jar b/lib/lucene-codecs-4.8.1.jar
deleted file mode 100644
index ac74284c2..000000000
--- a/lib/lucene-codecs-4.8.1.jar
+++ /dev/null
diff --git a/lib/lucene-codecs-4.9.0.jar b/lib/lucene-codecs-4.9.0.jar
new file mode 100644
index 000000000..b70bc4e8e
--- /dev/null
+++ b/lib/lucene-codecs-4.9.0.jar
diff --git a/lib/lucene-core-4.8.1.jar b/lib/lucene-core-4.9.0.jar
index a3758de17..bc6df59f4 100644
--- a/lib/lucene-core-4.8.1.jar
+++ b/lib/lucene-core-4.9.0.jar
diff --git a/lib/lucene-facet-4.8.1.jar b/lib/lucene-facet-4.9.0.jar
index 8b92f8cce..af8db4fd1 100644
--- a/lib/lucene-facet-4.8.1.jar
+++ b/lib/lucene-facet-4.9.0.jar
diff --git a/lib/lucene-grouping-4.8.1.jar b/lib/lucene-grouping-4.9.0.jar
index fcc61512d..9c020b9f1 100644
--- a/lib/lucene-grouping-4.8.1.jar
+++ b/lib/lucene-grouping-4.9.0.jar
diff --git a/lib/lucene-highlighter-4.8.1.jar b/lib/lucene-highlighter-4.9.0.jar
index b3bdb9012..2bba29ac9 100644
--- a/lib/lucene-highlighter-4.8.1.jar
+++ b/lib/lucene-highlighter-4.9.0.jar
diff --git a/lib/lucene-join-4.8.1.jar b/lib/lucene-join-4.9.0.jar
index c63d328b2..75fae7670 100644
--- a/lib/lucene-join-4.8.1.jar
+++ b/lib/lucene-join-4.9.0.jar
diff --git a/lib/lucene-memory-4.8.1.jar b/lib/lucene-memory-4.8.1.jar
deleted file mode 100644
index 05c9620b0..000000000
--- a/lib/lucene-memory-4.8.1.jar
+++ /dev/null
diff --git a/lib/lucene-memory-4.9.0.jar b/lib/lucene-memory-4.9.0.jar
new file mode 100644
index 000000000..004969a64
--- /dev/null
+++ b/lib/lucene-memory-4.9.0.jar
diff --git a/lib/lucene-misc-4.8.1.jar b/lib/lucene-misc-4.9.0.jar
index ca7b1f473..9e4bb7fa6 100644
--- a/lib/lucene-misc-4.8.1.jar
+++ b/lib/lucene-misc-4.9.0.jar
diff --git a/lib/lucene-queries-4.8.1.jar b/lib/lucene-queries-4.9.0.jar
index e621aaa47..79eec7d82 100644
--- a/lib/lucene-queries-4.8.1.jar
+++ b/lib/lucene-queries-4.9.0.jar
diff --git a/lib/lucene-queryparser-4.8.1.jar b/lib/lucene-queryparser-4.9.0.jar
index 02cdca789..2a27a6741 100644
--- a/lib/lucene-queryparser-4.8.1.jar
+++ b/lib/lucene-queryparser-4.9.0.jar
diff --git a/lib/lucene-spatial-4.8.1.jar b/lib/lucene-spatial-4.9.0.jar
index d1e978d2f..81fcc16a6 100644
--- a/lib/lucene-spatial-4.8.1.jar
+++ b/lib/lucene-spatial-4.9.0.jar
diff --git a/lib/lucene-suggest-4.8.1.jar b/lib/lucene-suggest-4.9.0.jar
index 609e7df48..afa9779e2 100644
--- a/lib/lucene-suggest-4.8.1.jar
+++ b/lib/lucene-suggest-4.9.0.jar
diff --git a/lib/solr-core-4.8.1.License b/lib/solr-core-4.9.0.License
index 534e44ea1..534e44ea1 100644
--- a/lib/solr-core-4.8.1.License
+++ b/lib/solr-core-4.9.0.License
diff --git a/lib/solr-core-4.8.1.jar b/lib/solr-core-4.9.0.jar
index cc614b02d..be8b9ca32 100644
--- a/lib/solr-core-4.8.1.jar
+++ b/lib/solr-core-4.9.0.jar
diff --git a/lib/solr-solrj-4.8.1.License b/lib/solr-solrj-4.9.0.License
index 8f21d8b38..8f21d8b38 100644
--- a/lib/solr-solrj-4.8.1.License
+++ b/lib/solr-solrj-4.9.0.License
diff --git a/lib/solr-solrj-4.8.1.jar b/lib/solr-solrj-4.9.0.jar
index 5cc38f24e..94afd982f 100644
--- a/lib/solr-solrj-4.8.1.jar
+++ b/lib/solr-solrj-4.9.0.jar
diff --git a/source/net/yacy/search/index/Fulltext.java b/source/net/yacy/search/index/Fulltext.java
index d06696c55..b77eff8f1 100644
--- a/source/net/yacy/search/index/Fulltext.java
+++ b/source/net/yacy/search/index/Fulltext.java
@@ -79,8 +79,8 @@ import org.apache.lucene.util.Version;
 
 public final class Fulltext {
 
-    private static final String SOLR_PATH = "solr_47"; // the number should be identical to the number in the property luceneMatchVersion in solrconfig.xml
-    private static final String SOLR_OLD_PATH[] = new String[]{"solr_36", "solr_40", "solr_44", "solr_45", "solr_46"};
+    private static final String SOLR_PATH = "solr_4_9"; // the number should be identical to the number in the property luceneMatchVersion in solrconfig.xml
+    private static final String SOLR_OLD_PATH[] = new String[]{"solr_36", "solr_40", "solr_44", "solr_45", "solr_46", "solr_47"};
     
     // class objects
     private final File                    segmentPath;