Merge remote-tracking branch 'origin/master' into docker

.classpath

@@ -66,26 +66,26 @@
 	<classpathentry kind="lib" path="lib/httpclient-4.5.2.jar"/>
 	<classpathentry kind="lib" path="lib/httpmime-4.5.2.jar"/>
 	<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>
-	<classpathentry kind="lib" path="lib/solr-core-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/solr-solrj-5.5.0.jar"/>
+	<classpathentry kind="lib" path="lib/solr-core-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/solr-solrj-5.5.1.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.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-classification-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-codecs-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-core-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-facet-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-grouping-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-highlighter-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-join-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-memory-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-misc-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queries-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queryparser-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-spatial-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-suggest-5.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-backward-codecs-5.5.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-common-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-classification-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-codecs-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-core-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-facet-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-grouping-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-highlighter-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-join-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-memory-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-misc-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queries-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queryparser-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-spatial-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-suggest-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-backward-codecs-5.5.1.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

@@ -209,22 +209,22 @@
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.9.1.jar" />
     	<pathelement location="${lib}/log4j-over-slf4j-1.7.18.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-common-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-phonetic-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-backward-codecs-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-classification-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-codecs-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-core-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-facet-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-grouping-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-highlighter-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-join-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-memory-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-misc-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-queries-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-queryparser-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-spatial-5.5.0.jar" />
-    	<pathelement location="${lib}/lucene-suggest-5.5.0.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-common-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-phonetic-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-backward-codecs-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-classification-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-codecs-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-core-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-facet-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-grouping-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-highlighter-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-join-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-memory-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-misc-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-queries-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-queryparser-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-spatial-5.5.1.jar" />
+    	<pathelement location="${lib}/lucene-suggest-5.5.1.jar" />
 	<pathelement location="${lib}/jsonic-1.2.0.jar" />
 	<pathelement location="${lib}/langdetect.jar" />
     	<pathelement location="${lib}/metadata-extractor-2.9.1.jar" />
@@ -235,8 +235,8 @@
     	<pathelement location="${lib}/poi-scratchpad-3.14-20160307.jar" />
         <pathelement location="${lib}/slf4j-api-1.7.18.jar" />
         <pathelement location="${lib}/slf4j-jdk14-1.7.18.jar" />
-        <pathelement location="${lib}/solr-core-5.5.0.jar" />
-        <pathelement location="${lib}/solr-solrj-5.5.0.jar" />
+        <pathelement location="${lib}/solr-core-5.5.1.jar" />
+        <pathelement location="${lib}/solr-solrj-5.5.1.jar" />
     	<pathelement location="${lib}/spatial4j-0.5.jar" />
         <pathelement location="${lib}/stax2-api_3.1.4.jar" />        
     	<pathelement location="${lib}/webcat-swf-0.1.jar" />

htroot/index.html

@@ -215,6 +215,5 @@
     ::
     #%env/templates/simplefooter.template%#
     #(/topmenu)#
-    <img src="cytag.png?icon=invisible&amp;nick=yacyh_#[clientid]#&amp;tag=search" alt=""/>
   </body>
 </html>

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.5.0</solr.version> 
+        <solr.version>5.5.1</solr.version> 
         <!-- the Jetty version used in dependency section for all related dependencies -->
         <jetty.version>9.2.16.v20160414</jetty.version>
                 

source/net/yacy/search/Switchboard.java

@@ -279,7 +279,7 @@ public final class Switchboard extends serverSwitch {
     public List<Pattern> networkWhitelist, networkBlacklist;
     public FilterEngine domainList;
     private Dispatcher dhtDispatcher;
-    public LinkedBlockingQueue<String> trail;
+    public LinkedBlockingQueue<String> trail; // connect infos from cytag servlet
     public SeedDB peers;
     public WorkTables tables;
     public Tray tray;