Revert : Dockerfiles are now in docker/ folder

.classpath

@@ -65,26 +65,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.1.jar"/>
-	<classpathentry kind="lib" path="lib/solr-solrj-5.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/solr-core-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/solr-solrj-5.5.2.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.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="lib" path="lib/lucene-analyzers-common-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-classification-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-codecs-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-core-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-facet-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-grouping-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-highlighter-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-join-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-memory-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-misc-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queries-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queryparser-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-spatial-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-suggest-5.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-backward-codecs-5.5.2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-57_1.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer.jar"/>

Dockerfile

@@ -1,35 +0,0 @@
-# Base image : latest stable Debian 
-FROM debian:latest
-
-# Install needed packages
-RUN apt-get update && apt-get install -yq \
-	default-jdk \
-	ant \
-	git
-	
-# set current working dir
-WORKDIR /opt
-
-# clone main YaCy git repository (we need to clone git repository to generate correct version when building from source)
-RUN git clone https://github.com/yacy/yacy_search_server.git
-
-# trace content of source directory
-RUN ls -la /opt/yacy_search_server
-
-# set current working dir
-WORKDIR /opt/yacy_search_server
-	
-# Compile with ant
-RUN ant compile
-
-# make some cleaning to reduce image size
-RUN rm -rf .git && apt-get clean
-
-# Expose port 8090
-EXPOSE 8090
-
-# Set data volume : can be used to persist yacy data and configuration
-VOLUME ["/opt/yacy_search_server/DATA"]
-
-# Start yacy ind debug mode (-d) to display console logs and to wait for yacy process
-CMD sh /opt/yacy_search_server/startYACY.sh -d

build.xml

@@ -208,22 +208,22 @@
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.9.2.jar" />
     	<pathelement location="${lib}/log4j-over-slf4j-1.7.21.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}/lucene-analyzers-common-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-phonetic-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-backward-codecs-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-classification-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-codecs-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-core-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-facet-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-grouping-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-highlighter-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-join-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-memory-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-misc-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-queries-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-queryparser-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-spatial-5.5.2.jar" />
+    	<pathelement location="${lib}/lucene-suggest-5.5.2.jar" />
 	<pathelement location="${lib}/jsonic-1.2.0.jar" />
 	<pathelement location="${lib}/langdetect.jar" />
     	<pathelement location="${lib}/metadata-extractor-2.9.1.jar" />
@@ -234,8 +234,8 @@
     	<pathelement location="${lib}/poi-scratchpad-3.14-20160307.jar" />
         <pathelement location="${lib}/slf4j-api-1.7.21.jar" />
         <pathelement location="${lib}/slf4j-jdk14-1.7.21.jar" />
-        <pathelement location="${lib}/solr-core-5.5.1.jar" />
-        <pathelement location="${lib}/solr-solrj-5.5.1.jar" />
+        <pathelement location="${lib}/solr-core-5.5.2.jar" />
+        <pathelement location="${lib}/solr-solrj-5.5.2.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" />

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>net.yacy</groupId>
     <artifactId>yacycore</artifactId>
-    <version>1.83</version>
+    <version>1.91</version>
     <packaging>jar</packaging>
     <description>YaCy - a Peer to Peer Web Search Engine</description>
     <name>YaCy Search Server</name>
@@ -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.1</solr.version> 
+        <solr.version>5.5.2</solr.version> 
         <!-- the Jetty version used in dependency section for all related dependencies -->
         <jetty.version>9.2.17.v20160517</jetty.version>