diff --git a/.classpath b/.classpath index 1992dccdb..b1e7b987b 100644 --- a/.classpath +++ b/.classpath @@ -52,23 +52,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 984a205fc..bbc8b1af6 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -81,21 +81,21 @@ $JAVAROOT/lib/json-simple-1.1.1.jar $JAVAROOT/lib/jsoup-1.8.1.jar $JAVAROOT/lib/log4j-over-slf4j-1.7.9.jar - $JAVAROOT/lib/lucene-analyzers-common-4.10.2.jar - $JAVAROOT/lib/lucene-analyzers-phonetic-4.10.2.jar - $JAVAROOT/lib/lucene-classification-4.10.2.jar - $JAVAROOT/lib/lucene-codecs-4.10.2.jar - $JAVAROOT/lib/lucene-core-4.10.2.jar - $JAVAROOT/lib/lucene-facet-4.10.2.jar - $JAVAROOT/lib/lucene-grouping-4.10.2.jar - $JAVAROOT/lib/lucene-highlighter-4.10.2.jar - $JAVAROOT/lib/lucene-join-4.10.2.jar - $JAVAROOT/lib/lucene-memory-4.10.2.jar - $JAVAROOT/lib/lucene-misc-4.10.2.jar - $JAVAROOT/lib/lucene-queries-4.10.2.jar - $JAVAROOT/lib/lucene-queryparser-4.10.2.jar - $JAVAROOT/lib/lucene-spatial-4.10.2.jar - $JAVAROOT/lib/lucene-suggest-4.10.2.jar + $JAVAROOT/lib/lucene-analyzers-common-4.10.3.jar + $JAVAROOT/lib/lucene-analyzers-phonetic-4.10.3.jar + $JAVAROOT/lib/lucene-classification-4.10.3.jar + $JAVAROOT/lib/lucene-codecs-4.10.3.jar + $JAVAROOT/lib/lucene-core-4.10.3.jar + $JAVAROOT/lib/lucene-facet-4.10.3.jar + $JAVAROOT/lib/lucene-grouping-4.10.3.jar + $JAVAROOT/lib/lucene-highlighter-4.10.3.jar + $JAVAROOT/lib/lucene-join-4.10.3.jar + $JAVAROOT/lib/lucene-memory-4.10.3.jar + $JAVAROOT/lib/lucene-misc-4.10.3.jar + $JAVAROOT/lib/lucene-queries-4.10.3.jar + $JAVAROOT/lib/lucene-queryparser-4.10.3.jar + $JAVAROOT/lib/lucene-spatial-4.10.3.jar + $JAVAROOT/lib/lucene-suggest-4.10.3.jar $JAVAROOT/lib/metadata-extractor-2.7.0.jar $JAVAROOT/lib/noggit-0.5.jar $JAVAROOT/lib/org.restlet.jar @@ -104,8 +104,8 @@ $JAVAROOT/lib/poi-scratchpad-3.10.1.jar $JAVAROOT/lib/slf4j-api-1.7.9.jar $JAVAROOT/lib/slf4j-jdk14-1.7.9.jar - $JAVAROOT/lib/solr-core-4.10.2.jar - $JAVAROOT/lib/solr-solrj-4.10.2.jar + $JAVAROOT/lib/solr-core-4.10.3.jar + $JAVAROOT/lib/solr-solrj-4.10.3.jar $JAVAROOT/lib/spatial4j-0.4.1.jar $JAVAROOT/lib/webcat-0.1-swf.jar $JAVAROOT/lib/weupnp-0.1.2.jar diff --git a/build.xml b/build.xml index 305bde3d8..34fe7af0e 100644 --- a/build.xml +++ b/build.xml @@ -205,21 +205,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -228,8 +228,8 @@ - - + + diff --git a/defaults/solr/solrconfig.xml b/defaults/solr/solrconfig.xml index 384dc0d5b..b0876544e 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. --> - 4.10.2 + 4.10.3 - - + - 1 + 20 - 100 - + 200 + source htroot - 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.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.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.8.jar;lib/jetty-client-9.2.6.v20141205.jar;lib/jetty-continuation-9.2.6.v20141205.jar;lib/jetty-deploy-9.2.6.v20141205.jar;lib/jetty-http-9.2.6.v20141205.jar;lib/jetty-io-9.2.6.v20141205.jar;lib/jetty-jmx-9.2.6.v20141205.jar;lib/jetty-proxy-9.2.6.v20141205.jar;lib/jetty-security-9.2.6.v20141205.jar;lib/jetty-server-9.2.6.v20141205.jar;lib/jetty-servlet-9.2.6.v20141205.jar;lib/jetty-servlets-9.2.6.v20141205.jar;lib/jetty-util-9.2.6.v20141205.jar;lib/jetty-webapp-9.2.6.v20141205.jar;lib/jetty-xml-9.2.6.v20141205.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.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 + 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.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.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.8.jar;lib/jetty-client-9.2.6.v20141205.jar;lib/jetty-continuation-9.2.6.v20141205.jar;lib/jetty-deploy-9.2.6.v20141205.jar;lib/jetty-http-9.2.6.v20141205.jar;lib/jetty-io-9.2.6.v20141205.jar;lib/jetty-jmx-9.2.6.v20141205.jar;lib/jetty-proxy-9.2.6.v20141205.jar;lib/jetty-security-9.2.6.v20141205.jar;lib/jetty-server-9.2.6.v20141205.jar;lib/jetty-servlet-9.2.6.v20141205.jar;lib/jetty-servlets-9.2.6.v20141205.jar;lib/jetty-util-9.2.6.v20141205.jar;lib/jetty-webapp-9.2.6.v20141205.jar;lib/jetty-xml-9.2.6.v20141205.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.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.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.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 lib/yacycore.jar 1.7 diff --git a/pom.xml b/pom.xml index 7f55bcbbe..38f4c89ea 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 1.7 1.7 - 4.10.2 + 4.10.3 ${DSTAMP}