diff --git a/.classpath b/.classpath index f945035d7..ad8b6a14e 100644 --- a/.classpath +++ b/.classpath @@ -67,26 +67,26 @@ - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index fb2815037..2e855d308 100644 --- a/build.xml +++ b/build.xml @@ -205,22 +205,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -229,8 +229,8 @@ - - + + diff --git a/lib/lucene-analyzers-common-5.2.0.jar b/lib/lucene-analyzers-common-5.2.1.jar similarity index 94% rename from lib/lucene-analyzers-common-5.2.0.jar rename to lib/lucene-analyzers-common-5.2.1.jar index 9cc923559..aaa26a135 100644 Binary files a/lib/lucene-analyzers-common-5.2.0.jar and b/lib/lucene-analyzers-common-5.2.1.jar differ diff --git a/lib/lucene-analyzers-phonetic-5.2.0.jar b/lib/lucene-analyzers-phonetic-5.2.1.jar similarity index 89% rename from lib/lucene-analyzers-phonetic-5.2.0.jar rename to lib/lucene-analyzers-phonetic-5.2.1.jar index 3287b9d37..838b8daf2 100644 Binary files a/lib/lucene-analyzers-phonetic-5.2.0.jar and b/lib/lucene-analyzers-phonetic-5.2.1.jar differ diff --git a/lib/lucene-backward-codecs-5.2.0.jar b/lib/lucene-backward-codecs-5.2.1.jar similarity index 92% rename from lib/lucene-backward-codecs-5.2.0.jar rename to lib/lucene-backward-codecs-5.2.1.jar index 3176e662e..bbdfff8b2 100644 Binary files a/lib/lucene-backward-codecs-5.2.0.jar and b/lib/lucene-backward-codecs-5.2.1.jar differ diff --git a/lib/lucene-classification-5.2.0.jar b/lib/lucene-classification-5.2.1.jar similarity index 92% rename from lib/lucene-classification-5.2.0.jar rename to lib/lucene-classification-5.2.1.jar index 290be7a74..9901b5a97 100644 Binary files a/lib/lucene-classification-5.2.0.jar and b/lib/lucene-classification-5.2.1.jar differ diff --git a/lib/lucene-codecs-5.2.0.jar b/lib/lucene-codecs-5.2.1.jar similarity index 93% rename from lib/lucene-codecs-5.2.0.jar rename to lib/lucene-codecs-5.2.1.jar index e5faf7922..be7e95778 100644 Binary files a/lib/lucene-codecs-5.2.0.jar and b/lib/lucene-codecs-5.2.1.jar differ diff --git a/lib/lucene-core-5.2.0.jar b/lib/lucene-core-5.2.1.jar similarity index 88% rename from lib/lucene-core-5.2.0.jar rename to lib/lucene-core-5.2.1.jar index 6b192d886..18b887f79 100644 Binary files a/lib/lucene-core-5.2.0.jar and b/lib/lucene-core-5.2.1.jar differ diff --git a/lib/lucene-facet-5.2.0.jar b/lib/lucene-facet-5.2.1.jar similarity index 91% rename from lib/lucene-facet-5.2.0.jar rename to lib/lucene-facet-5.2.1.jar index 587afa2b1..fb96a545d 100644 Binary files a/lib/lucene-facet-5.2.0.jar and b/lib/lucene-facet-5.2.1.jar differ diff --git a/lib/lucene-grouping-5.2.0.jar b/lib/lucene-grouping-5.2.1.jar similarity index 90% rename from lib/lucene-grouping-5.2.0.jar rename to lib/lucene-grouping-5.2.1.jar index 977019d0a..6d7b46dd1 100644 Binary files a/lib/lucene-grouping-5.2.0.jar and b/lib/lucene-grouping-5.2.1.jar differ diff --git a/lib/lucene-highlighter-5.2.0.jar b/lib/lucene-highlighter-5.2.1.jar similarity index 91% rename from lib/lucene-highlighter-5.2.0.jar rename to lib/lucene-highlighter-5.2.1.jar index d20d5d6c9..e81ecbd7c 100644 Binary files a/lib/lucene-highlighter-5.2.0.jar and b/lib/lucene-highlighter-5.2.1.jar differ diff --git a/lib/lucene-join-5.2.0.jar b/lib/lucene-join-5.2.1.jar similarity index 90% rename from lib/lucene-join-5.2.0.jar rename to lib/lucene-join-5.2.1.jar index 08fec00ac..570275134 100644 Binary files a/lib/lucene-join-5.2.0.jar and b/lib/lucene-join-5.2.1.jar differ diff --git a/lib/lucene-memory-5.2.0.jar b/lib/lucene-memory-5.2.1.jar similarity index 91% rename from lib/lucene-memory-5.2.0.jar rename to lib/lucene-memory-5.2.1.jar index 6bc7dc8a9..7c4eb8ec2 100644 Binary files a/lib/lucene-memory-5.2.0.jar and b/lib/lucene-memory-5.2.1.jar differ diff --git a/lib/lucene-misc-5.2.0.jar b/lib/lucene-misc-5.2.1.jar similarity index 91% rename from lib/lucene-misc-5.2.0.jar rename to lib/lucene-misc-5.2.1.jar index 69dc8474f..ce6eeba16 100644 Binary files a/lib/lucene-misc-5.2.0.jar and b/lib/lucene-misc-5.2.1.jar differ diff --git a/lib/lucene-queries-5.2.0.jar b/lib/lucene-queries-5.2.1.jar similarity index 87% rename from lib/lucene-queries-5.2.0.jar rename to lib/lucene-queries-5.2.1.jar index 145acb91e..01742fa90 100644 Binary files a/lib/lucene-queries-5.2.0.jar and b/lib/lucene-queries-5.2.1.jar differ diff --git a/lib/lucene-queryparser-5.2.0.jar b/lib/lucene-queryparser-5.2.1.jar similarity index 90% rename from lib/lucene-queryparser-5.2.0.jar rename to lib/lucene-queryparser-5.2.1.jar index bc8926528..ee7599359 100644 Binary files a/lib/lucene-queryparser-5.2.0.jar and b/lib/lucene-queryparser-5.2.1.jar differ diff --git a/lib/lucene-spatial-5.2.0.jar b/lib/lucene-spatial-5.2.1.jar similarity index 91% rename from lib/lucene-spatial-5.2.0.jar rename to lib/lucene-spatial-5.2.1.jar index d8478e77c..51b36233f 100644 Binary files a/lib/lucene-spatial-5.2.0.jar and b/lib/lucene-spatial-5.2.1.jar differ diff --git a/lib/lucene-suggest-5.2.0.jar b/lib/lucene-suggest-5.2.1.jar similarity index 92% rename from lib/lucene-suggest-5.2.0.jar rename to lib/lucene-suggest-5.2.1.jar index c78858bdc..e30c5d41d 100644 Binary files a/lib/lucene-suggest-5.2.0.jar and b/lib/lucene-suggest-5.2.1.jar differ diff --git a/lib/solr-core-5.2.0.jar b/lib/solr-core-5.2.1.jar similarity index 91% rename from lib/solr-core-5.2.0.jar rename to lib/solr-core-5.2.1.jar index 3a01c46b9..cd2844a21 100644 Binary files a/lib/solr-core-5.2.0.jar and b/lib/solr-core-5.2.1.jar differ diff --git a/lib/solr-solrj-5.2.0.jar b/lib/solr-solrj-5.2.1.jar similarity index 91% rename from lib/solr-solrj-5.2.0.jar rename to lib/solr-solrj-5.2.1.jar index e2a4e7855..1e33bd0e8 100644 Binary files a/lib/solr-solrj-5.2.0.jar and b/lib/solr-solrj-5.2.1.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index 0111dcb53..4d204ae8c 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -83,7 +83,7 @@ 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.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.5.jar;lib/httpcore-4.4.1.jar;lib/httpmime-4.5.jar;lib/icu4j-55_1.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.12.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.53.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.2.jar;lib/log4j-over-slf4j-1.7.12.jar;lib/lucene-analyzers-common-5.2.0.jar;lib/lucene-analyzers-phonetic-5.2.0.jar;lib/lucene-backward-codecs-5.2.0.jar;lib/lucene-classification-5.2.0.jar;lib/lucene-codecs-5.2.0.jar;lib/lucene-core-5.2.0.jar;lib/lucene-facet-5.2.0.jar;lib/lucene-grouping-5.2.0.jar;lib/lucene-highlighter-5.2.0.jar;lib/lucene-join-5.2.0.jar;lib/lucene-memory-5.2.0.jar;lib/lucene-misc-5.2.0.jar;lib/lucene-queries-5.2.0.jar;lib/lucene-queryparser-5.2.0.jar;lib/lucene-spatial-5.2.0.jar;lib/lucene-suggest-5.2.0.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.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.12.jar;lib/slf4j-jdk14-1.7.12.jar;lib/solr-core-5.2.0.jar;lib/solr-solrj-5.2.0.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.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.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.5.jar;lib/httpcore-4.4.1.jar;lib/httpmime-4.5.jar;lib/icu4j-55_1.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.12.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.53.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.2.jar;lib/log4j-over-slf4j-1.7.12.jar;lib/lucene-analyzers-common-5.2.1.jar;lib/lucene-analyzers-phonetic-5.2.1.jar;lib/lucene-backward-codecs-5.2.1.jar;lib/lucene-classification-5.2.1.jar;lib/lucene-codecs-5.2.1.jar;lib/lucene-core-5.2.1.jar;lib/lucene-facet-5.2.1.jar;lib/lucene-grouping-5.2.1.jar;lib/lucene-highlighter-5.2.1.jar;lib/lucene-join-5.2.1.jar;lib/lucene-memory-5.2.1.jar;lib/lucene-misc-5.2.1.jar;lib/lucene-queries-5.2.1.jar;lib/lucene-queryparser-5.2.1.jar;lib/lucene-spatial-5.2.1.jar;lib/lucene-suggest-5.2.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.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.12.jar;lib/slf4j-jdk14-1.7.12.jar;lib/solr-core-5.2.1.jar;lib/solr-solrj-5.2.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.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 6ff698b1b..617a3ef3c 100644 --- a/pom.xml +++ b/pom.xml @@ -421,7 +421,7 @@ org.slf4j jcl-over-slf4j - 1.7.9 + 1.7.12 org.apache.pdfbox @@ -451,7 +451,7 @@ org.slf4j log4j-over-slf4j - 1.7.9 + 1.7.12 org.apache.lucene @@ -536,12 +536,12 @@ org.slf4j slf4j-api - 1.7.9 + 1.7.12 org.slf4j slf4j-jdk14 - 1.7.9 + 1.7.12 org.apache.solr