Merge branch 'master' of git@github.com:yacy/yacy_search_server.git

.classpath

@@ -70,20 +70,20 @@
 	<classpathentry kind="lib" path="lib/solr-core-4.10.3.jar"/>
 	<classpathentry kind="lib" path="lib/solr-solrj-4.10.3.jar"/>
 	<classpathentry kind="lib" path="lib/chardet.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-client-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-continuation-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-deploy-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-http-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-io-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-jmx-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-proxy-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-security-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-server-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-servlet-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-servlets-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-util-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-webapp-9.2.10.v20150310.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-xml-9.2.10.v20150310.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-client-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-continuation-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-deploy-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-http-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-io-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-jmx-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-proxy-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-security-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-server-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-servlet-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-servlets-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-util-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-webapp-9.2.11.v20150529.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-xml-9.2.11.v20150529.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"/>

build.xml

@@ -187,20 +187,20 @@
     	<pathelement location="${lib}/jcl-over-slf4j-1.7.9.jar" />
     	<pathelement location="${lib}/jempbox-1.8.9.jar" />
         <pathelement location="${lib}/javax.servlet-api-3.1.0.jar" />
-        <pathelement location="${lib}/jetty-client-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-continuation-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-deploy-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-http-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-io-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-jmx-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-proxy-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-security-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-server-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-servlet-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-servlets-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-util-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-webapp-9.2.10.v20150310.jar" />
-        <pathelement location="${lib}/jetty-xml-9.2.10.v20150310.jar" />
+        <pathelement location="${lib}/jetty-client-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-continuation-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-deploy-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-http-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-io-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-jmx-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-proxy-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-security-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-server-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-servlet-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-servlets-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-util-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-webapp-9.2.11.v20150529.jar" />
+        <pathelement location="${lib}/jetty-xml-9.2.11.v20150529.jar" />
     	<pathelement location="${lib}/jsch-0.1.52.jar" />
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.8.2.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/commons-codec-1.10.jar;lib/commons-compress-1.9.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.9.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.4.jar;lib/httpcore-4.4.1.jar;lib/httpmime-4.4.jar;lib/icu4j-core.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.9.jar;lib/jempbox-1.8.9.jar;lib/jetty-client-9.2.10.v20150310.jar;lib/jetty-continuation-9.2.10.v20150310.jar;lib/jetty-deploy-9.2.10.v20150310.jar;lib/jetty-http-9.2.10.v20150310.jar;lib/jetty-io-9.2.10.v20150310.jar;lib/jetty-jmx-9.2.10.v20150310.jar;lib/jetty-proxy-9.2.10.v20150310.jar;lib/jetty-security-9.2.10.v20150310.jar;lib/jetty-server-9.2.10.v20150310.jar;lib/jetty-servlet-9.2.10.v20150310.jar;lib/jetty-servlets-9.2.10.v20150310.jar;lib/jetty-util-9.2.10.v20150310.jar;lib/jetty-webapp-9.2.10.v20150310.jar;lib/jetty-xml-9.2.10.v20150310.jar;lib/jsch-0.1.52.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.2.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.3.jar;lib/lucene-analyzers-phonetic-4.10.3.jar;lib/lucene-classification-4.10.3.jar;lib/lucene-codecs-4.10.3.jar;lib/lucene-core-4.10.3.jar;lib/lucene-facet-4.10.3.jar;lib/lucene-grouping-4.10.3.jar;lib/lucene-highlighter-4.10.3.jar;lib/lucene-join-4.10.3.jar;lib/lucene-memory-4.10.3.jar;lib/lucene-misc-4.10.3.jar;lib/lucene-queries-4.10.3.jar;lib/lucene-queryparser-4.10.3.jar;lib/lucene-spatial-4.10.3.jar;lib/lucene-suggest-4.10.3.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.9.jar;lib/poi-3.12-20150511.jar;lib/poi-scratchpad-3.12-20150511.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.3.jar;lib/solr-solrj-4.10.3.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.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/commons-codec-1.10.jar;lib/commons-compress-1.9.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.9.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.4.jar;lib/httpcore-4.4.1.jar;lib/httpmime-4.4.jar;lib/icu4j-core.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.9.jar;lib/jempbox-1.8.9.jar;lib/jetty-client-9.2.11.v20150529.jar;lib/jetty-continuation-9.2.11.v20150529.jar;lib/jetty-deploy-9.2.11.v20150529.jar;lib/jetty-http-9.2.11.v20150529.jar;lib/jetty-io-9.2.11.v20150529.jar;lib/jetty-jmx-9.2.11.v20150529.jar;lib/jetty-proxy-9.2.11.v20150529.jar;lib/jetty-security-9.2.11.v20150529.jar;lib/jetty-server-9.2.11.v20150529.jar;lib/jetty-servlet-9.2.11.v20150529.jar;lib/jetty-servlets-9.2.11.v20150529.jar;lib/jetty-util-9.2.11.v20150529.jar;lib/jetty-webapp-9.2.11.v20150529.jar;lib/jetty-xml-9.2.11.v20150529.jar;lib/jsch-0.1.52.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.2.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.3.jar;lib/lucene-analyzers-phonetic-4.10.3.jar;lib/lucene-classification-4.10.3.jar;lib/lucene-codecs-4.10.3.jar;lib/lucene-core-4.10.3.jar;lib/lucene-facet-4.10.3.jar;lib/lucene-grouping-4.10.3.jar;lib/lucene-highlighter-4.10.3.jar;lib/lucene-join-4.10.3.jar;lib/lucene-memory-4.10.3.jar;lib/lucene-misc-4.10.3.jar;lib/lucene-queries-4.10.3.jar;lib/lucene-queryparser-4.10.3.jar;lib/lucene-spatial-4.10.3.jar;lib/lucene-suggest-4.10.3.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.9.jar;lib/poi-3.12-20150511.jar;lib/poi-scratchpad-3.12-20150511.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.3.jar;lib/solr-solrj-4.10.3.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.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

@@ -36,7 +36,7 @@
         <!-- the Solr version used in dependency section for all related dependencies -->
         <solr.version>4.10.3</solr.version> 
         <!-- the Jetty version used in dependency section for all related dependencies -->
-        <jetty.version>9.2.10.v20150310</jetty.version>
+        <jetty.version>9.2.11.v20150529</jetty.version>
                 
         <!-- properties used for filtering yacyBuildProperties.java -->       
         <REPL_DATE>${DSTAMP}</REPL_DATE>