bump to solr/lucene 5.4.0

.classpath

@@ -67,26 +67,26 @@
 	<classpathentry kind="lib" path="lib/httpclient-4.5.1.jar"/>
 	<classpathentry kind="lib" path="lib/httpmime-4.5.1.jar"/>
 	<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>
-	<classpathentry kind="lib" path="lib/solr-core-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/solr-solrj-5.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/solr-core-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/solr-solrj-5.4.0.jar"/>
 	<classpathentry kind="lib" path="lib/stax2-api-3.1.4.jar"/>
 	<classpathentry kind="lib" path="lib/woodstox-core-asl-4.4.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-common-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-classification-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-codecs-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-core-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-facet-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-grouping-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-highlighter-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-join-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-memory-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-misc-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queries-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queryparser-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-spatial-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-suggest-5.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-backward-codecs-5.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-common-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-classification-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-codecs-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-core-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-facet-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-grouping-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-highlighter-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-join-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-memory-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-misc-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queries-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queryparser-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-spatial-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-suggest-5.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-backward-codecs-5.4.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-56_1.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer.jar"/>

build.xml

@@ -211,22 +211,22 @@
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.8.3.jar" />
     	<pathelement location="${lib}/log4j-over-slf4j-1.7.13.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-common-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-phonetic-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-backward-codecs-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-classification-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-codecs-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-core-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-facet-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-grouping-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-highlighter-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-join-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-memory-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-misc-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-queries-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-queryparser-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-spatial-5.3.1.jar" />
-    	<pathelement location="${lib}/lucene-suggest-5.3.1.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-common-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-phonetic-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-backward-codecs-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-classification-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-codecs-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-core-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-facet-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-grouping-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-highlighter-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-join-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-memory-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-misc-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-queries-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-queryparser-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-spatial-5.4.0.jar" />
+    	<pathelement location="${lib}/lucene-suggest-5.4.0.jar" />
 	<pathelement location="${lib}/jsonic-1.2.0.jar" />
 	<pathelement location="${lib}/langdetect.jar" />
     	<pathelement location="${lib}/metadata-extractor-2.8.1.jar" />
@@ -237,8 +237,8 @@
     	<pathelement location="${lib}/poi-scratchpad-3.13-20150929.jar" />
         <pathelement location="${lib}/slf4j-api-1.7.13.jar" />
         <pathelement location="${lib}/slf4j-jdk14-1.7.13.jar" />
-        <pathelement location="${lib}/solr-core-5.3.1.jar" />
-        <pathelement location="${lib}/solr-solrj-5.3.1.jar" />
+        <pathelement location="${lib}/solr-core-5.4.0.jar" />
+        <pathelement location="${lib}/solr-solrj-5.4.0.jar" />
     	<pathelement location="${lib}/spatial4j-0.4.1.jar" />
         <pathelement location="${lib}/stax2-api_3.1.4.jar" />        
     	<pathelement location="${lib}/webcat-0.1-swf.jar" />

nbproject/project.xml

@@ -83,7 +83,7 @@
             <compilation-unit>
                 <package-root>source</package-root>
                 <package-root>htroot</package-root>
-                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/common-image-3.2.1.jar;lib/common-io-3.2.1.jar;lib/common-lang-3.2.1.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.10.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-bmp-3.2.1.jar;lib/imageio-core-3.2.1.jar;lib/imageio-metadata-3.2.1.jar;lib/imageio-tiff-3.2.1.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.13.jar;lib/jempbox-1.8.10.jar;lib/jetty-client-9.2.14.v20151106.jar;lib/jetty-continuation-9.2.14.v20151106.jar;lib/jetty-deploy-9.2.14.v20151106.jar;lib/jetty-http-9.2.14.v20151106.jar;lib/jetty-io-9.2.14.v20151106.jar;lib/jetty-jmx-9.2.14.v20151106.jar;lib/jetty-proxy-9.2.14.v20151106.jar;lib/jetty-security-9.2.14.v20151106.jar;lib/jetty-server-9.2.14.v20151106.jar;lib/jetty-servlet-9.2.14.v20151106.jar;lib/jetty-servlets-9.2.14.v20151106.jar;lib/jetty-util-9.2.14.v20151106.jar;lib/jetty-webapp-9.2.14.v20151106.jar;lib/jetty-xml-9.2.14.v20151106.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsonic-1.2.0.jar;lib/jsoup-1.8.3.jar;lib/langdetect.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.3.1.jar;lib/lucene-analyzers-phonetic-5.3.1.jar;lib/lucene-backward-codecs-5.3.1.jar;lib/lucene-classification-5.3.1.jar;lib/lucene-codecs-5.3.1.jar;lib/lucene-core-5.3.1.jar;lib/lucene-facet-5.3.1.jar;lib/lucene-grouping-5.3.1.jar;lib/lucene-highlighter-5.3.1.jar;lib/lucene-join-5.3.1.jar;lib/lucene-memory-5.3.1.jar;lib/lucene-misc-5.3.1.jar;lib/lucene-queries-5.3.1.jar;lib/lucene-queryparser-5.3.1.jar;lib/lucene-spatial-5.3.1.jar;lib/lucene-suggest-5.3.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.10.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.3.1.jar;lib/solr-solrj-5.3.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
+                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/common-image-3.2.1.jar;lib/common-io-3.2.1.jar;lib/common-lang-3.2.1.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.10.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-bmp-3.2.1.jar;lib/imageio-core-3.2.1.jar;lib/imageio-metadata-3.2.1.jar;lib/imageio-tiff-3.2.1.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.13.jar;lib/jempbox-1.8.10.jar;lib/jetty-client-9.2.14.v20151106.jar;lib/jetty-continuation-9.2.14.v20151106.jar;lib/jetty-deploy-9.2.14.v20151106.jar;lib/jetty-http-9.2.14.v20151106.jar;lib/jetty-io-9.2.14.v20151106.jar;lib/jetty-jmx-9.2.14.v20151106.jar;lib/jetty-proxy-9.2.14.v20151106.jar;lib/jetty-security-9.2.14.v20151106.jar;lib/jetty-server-9.2.14.v20151106.jar;lib/jetty-servlet-9.2.14.v20151106.jar;lib/jetty-servlets-9.2.14.v20151106.jar;lib/jetty-util-9.2.14.v20151106.jar;lib/jetty-webapp-9.2.14.v20151106.jar;lib/jetty-xml-9.2.14.v20151106.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsonic-1.2.0.jar;lib/jsoup-1.8.3.jar;lib/langdetect.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.4.0.jar;lib/lucene-analyzers-phonetic-5.4.0.jar;lib/lucene-backward-codecs-5.4.0.jar;lib/lucene-classification-5.4.0.jar;lib/lucene-codecs-5.4.0.jar;lib/lucene-core-5.4.0.jar;lib/lucene-facet-5.4.0.jar;lib/lucene-grouping-5.4.0.jar;lib/lucene-highlighter-5.4.0.jar;lib/lucene-join-5.4.0.jar;lib/lucene-memory-5.4.0.jar;lib/lucene-misc-5.4.0.jar;lib/lucene-queries-5.4.0.jar;lib/lucene-queryparser-5.4.0.jar;lib/lucene-spatial-5.4.0.jar;lib/lucene-suggest-5.4.0.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.10.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.4.0.jar;lib/solr-solrj-5.4.0.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
                 <built-to>lib/yacycore.jar</built-to>
                 <source-level>1.7</source-level>
             </compilation-unit>

pom.xml

@@ -34,7 +34,7 @@
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
         <!-- the Solr version used in dependency section for all related dependencies -->
-        <solr.version>5.3.1</solr.version> 
+        <solr.version>5.4.0</solr.version> 
         <!-- the Jetty version used in dependency section for all related dependencies -->
         <jetty.version>9.2.14.v20151106</jetty.version>
                 

source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java

@@ -79,10 +79,9 @@ public class EmbeddedInstance implements SolrInstance {
         }
         
         // initialize the coreContainer
-        String containerDir = this.containerPath.getAbsolutePath(); // the home directory of all cores
         File configFile = new File(solr_config, "solr.xml"); //  the configuration file for all cores
-        this.coreContainer = CoreContainer.createAndLoad(containerDir, configFile); // this may take indefinitely long if solr files are broken
-        if (this.coreContainer == null) throw new IOException("cannot create core container dir = " + containerDir + ", configFile = " + configFile);
+        this.coreContainer = CoreContainer.createAndLoad(containerPath.toPath(), configFile.toPath()); // this may take indefinitely long if solr files are broken
+        if (this.coreContainer == null) throw new IOException("cannot create core container dir = " + containerPath + ", configFile = " + configFile);
 
         // get the default core from the coreContainer
         this.defaultCoreName = givenDefaultCoreName;