diff --git a/.classpath b/.classpath index 870bfad72..1b3d1c1f1 100644 --- a/.classpath +++ b/.classpath @@ -29,7 +29,7 @@ - + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 46c124a31..c69d0140b 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -42,7 +42,7 @@ $JAVAROOT/lib/bcmail-jdk15-145.jar $JAVAROOT/lib/bcprov-jdk15-145.jar $JAVAROOT/lib/commons-codec-1.7.jar - $JAVAROOT/lib/commons-compress-1.4.1.jar + $JAVAROOT/lib/commons-compress-1.8.jar $JAVAROOT/lib/commons-fileupload-1.2.2.jar $JAVAROOT/lib/commons-io-2.1.jar $JAVAROOT/lib/commons-jxpath-1.3.jar diff --git a/build.xml b/build.xml index c1f5d659f..0819c58ca 100644 --- a/build.xml +++ b/build.xml @@ -166,7 +166,7 @@ - + diff --git a/lib/commons-compress-1.4.1.jar b/lib/commons-compress-1.4.1.jar deleted file mode 100644 index b58761e81..000000000 Binary files a/lib/commons-compress-1.4.1.jar and /dev/null differ diff --git a/lib/commons-compress-1.4.1.License b/lib/commons-compress-1.8.License similarity index 100% rename from lib/commons-compress-1.4.1.License rename to lib/commons-compress-1.8.License diff --git a/lib/commons-compress-1.8.jar b/lib/commons-compress-1.8.jar new file mode 100644 index 000000000..940b06873 Binary files /dev/null and b/lib/commons-compress-1.8.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index 59ef48081..a92e5fa28 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -83,7 +83,7 @@ source htroot - lib/J7Zip-modified.jar;lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.jar;lib/commons-compress-1.4.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.8.3.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-15.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.3.jar;lib/httpcore-4.3.2.jar;lib/httpmime-4.3.3.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.8.3.jar;lib/jena-2.6.4.jar;lib/jetty-client-8.1.14.v20131031.jar;lib/jetty-continuation-8.1.14.v20131031.jar;lib/jetty-http-8.1.14.v20131031.jar;lib/jetty-io-8.1.14.v20131031.jar;lib/jetty-security-8.1.14.v20131031.jar;lib/jetty-server-8.1.14.v20131031.jar;lib/jetty-servlet-8.1.14.v20131031.jar;lib/jetty-servlets-8.1.14.v20131031.jar;lib/jetty-util-8.1.14.v20131031.jar;lib/jetty-webapp-8.1.14.v20131031.jar;lib/jetty-xml-8.1.14.v20131031.jar;lib/jsch-0.1.50.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.6.0.jar;lib/lucene-analyzers-phonetic-4.6.0.jar;lib/lucene-classification-4.6.0.jar;lib/lucene-codecs-4.6.0.jar;lib/lucene-core-4.6.0.jar;lib/lucene-facet-4.6.0.jar;lib/lucene-grouping-4.6.0.jar;lib/lucene-highlighter-4.6.0.jar;lib/lucene-join-4.6.0.jar;lib/lucene-memory-4.6.0.jar;lib/lucene-misc-4.6.0.jar;lib/lucene-queries-4.6.0.jar;lib/lucene-queryparser-4.6.0.jar;lib/lucene-spatial-4.6.0.jar;lib/lucene-suggest-4.6.0.jar;lib/metadata-extractor-2.6.2.jar;lib/noggit-0.5.jar;lib/pdfbox-1.8.3.jar;lib/poi-3.9-20121203.jar;lib/poi-scratchpad-3.9-20121203.jar;lib/sax-2.0.1.jar;lib/servlet-api-3.0.jar;lib/slf4j-api-1.7.2.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.6.0.jar;lib/solr-solrj-4.6.0.jar;lib/spatial4j-0.3.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/zookeeper-3.4.5.jar + lib/J7Zip-modified.jar;lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.jar;lib/commons-compress-1.8.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.8.4.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-16.0.1.jar;lib/htmllexer.jar;lib/httpclient-4.3.3.jar;lib/httpcore-4.3.2.jar;lib/httpmime-4.3.3.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.8.4.jar;lib/jetty-client-8.1.14.v20131031.jar;lib/jetty-continuation-8.1.14.v20131031.jar;lib/jetty-http-8.1.14.v20131031.jar;lib/jetty-io-8.1.14.v20131031.jar;lib/jetty-security-8.1.14.v20131031.jar;lib/jetty-server-8.1.14.v20131031.jar;lib/jetty-servlet-8.1.14.v20131031.jar;lib/jetty-servlets-8.1.14.v20131031.jar;lib/jetty-util-8.1.14.v20131031.jar;lib/jetty-webapp-8.1.14.v20131031.jar;lib/jetty-xml-8.1.14.v20131031.jar;lib/jsch-0.1.50.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.6.1.jar;lib/lucene-analyzers-phonetic-4.6.1.jar;lib/lucene-classification-4.6.1.jar;lib/lucene-codecs-4.6.1.jar;lib/lucene-core-4.6.1.jar;lib/lucene-facet-4.6.1.jar;lib/lucene-grouping-4.6.1.jar;lib/lucene-highlighter-4.6.1.jar;lib/lucene-join-4.6.1.jar;lib/lucene-memory-4.6.1.jar;lib/lucene-misc-4.6.0.jar;lib/lucene-queries-4.6.0.jar;lib/lucene-queryparser-4.6.1.jar;lib/lucene-spatial-4.6.1.jar;lib/lucene-suggest-4.6.1.jar;lib/metadata-extractor-2.6.2.jar;lib/noggit-0.5.jar;lib/pdfbox-1.8.4.jar;lib/poi-3.9-20121203.jar;lib/poi-scratchpad-3.9-20121203.jar;lib/sax-2.0.1.jar;lib/servlet-api-3.0.jar;lib/slf4j-api-1.7.2.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.6.1.jar;lib/solr-solrj-4.6.1.jar;lib/spatial4j-0.3.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/zookeeper-3.4.5.jar lib/yacycore.jar 1.6 diff --git a/pom.xml b/pom.xml index 24e9c8e7b..75fdb0969 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ net.yacy yacycore - 1.70 + 1.71 jar YaCy - a Peer to Peer Web Search Engine YaCy @@ -300,7 +300,7 @@ org.apache.commons commons-compress - 1.6 + 1.8 commons-fileupload