diff --git a/.classpath b/.classpath index ba0b6f28d..ef5987ea8 100644 --- a/.classpath +++ b/.classpath @@ -67,26 +67,26 @@ - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index 41f11264f..421549918 100644 --- a/build.xml +++ b/build.xml @@ -211,22 +211,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -237,8 +237,8 @@ - - + + diff --git a/lib/lucene-analyzers-common-5.4.0.jar b/lib/lucene-analyzers-common-5.4.1.jar similarity index 94% rename from lib/lucene-analyzers-common-5.4.0.jar rename to lib/lucene-analyzers-common-5.4.1.jar index 16b447e17..bcbeedb93 100644 Binary files a/lib/lucene-analyzers-common-5.4.0.jar and b/lib/lucene-analyzers-common-5.4.1.jar differ diff --git a/lib/lucene-analyzers-phonetic-5.4.0.jar b/lib/lucene-analyzers-phonetic-5.4.1.jar similarity index 89% rename from lib/lucene-analyzers-phonetic-5.4.0.jar rename to lib/lucene-analyzers-phonetic-5.4.1.jar index ebaa8ba00..acf38f760 100644 Binary files a/lib/lucene-analyzers-phonetic-5.4.0.jar and b/lib/lucene-analyzers-phonetic-5.4.1.jar differ diff --git a/lib/lucene-backward-codecs-5.4.0.jar b/lib/lucene-backward-codecs-5.4.1.jar similarity index 92% rename from lib/lucene-backward-codecs-5.4.0.jar rename to lib/lucene-backward-codecs-5.4.1.jar index 73ae74e4b..67b83eefa 100644 Binary files a/lib/lucene-backward-codecs-5.4.0.jar and b/lib/lucene-backward-codecs-5.4.1.jar differ diff --git a/lib/lucene-classification-5.4.0.jar b/lib/lucene-classification-5.4.1.jar similarity index 93% rename from lib/lucene-classification-5.4.0.jar rename to lib/lucene-classification-5.4.1.jar index 408caf843..2c36bbb47 100644 Binary files a/lib/lucene-classification-5.4.0.jar and b/lib/lucene-classification-5.4.1.jar differ diff --git a/lib/lucene-codecs-5.4.0.jar b/lib/lucene-codecs-5.4.1.jar similarity index 93% rename from lib/lucene-codecs-5.4.0.jar rename to lib/lucene-codecs-5.4.1.jar index f780c9ae7..4fd60fcf3 100644 Binary files a/lib/lucene-codecs-5.4.0.jar and b/lib/lucene-codecs-5.4.1.jar differ diff --git a/lib/lucene-core-5.4.0.jar b/lib/lucene-core-5.4.1.jar similarity index 90% rename from lib/lucene-core-5.4.0.jar rename to lib/lucene-core-5.4.1.jar index 52d41e54a..769566bc8 100644 Binary files a/lib/lucene-core-5.4.0.jar and b/lib/lucene-core-5.4.1.jar differ diff --git a/lib/lucene-facet-5.4.0.jar b/lib/lucene-facet-5.4.1.jar similarity index 91% rename from lib/lucene-facet-5.4.0.jar rename to lib/lucene-facet-5.4.1.jar index fa65b53ba..941d1d154 100644 Binary files a/lib/lucene-facet-5.4.0.jar and b/lib/lucene-facet-5.4.1.jar differ diff --git a/lib/lucene-grouping-5.4.0.jar b/lib/lucene-grouping-5.4.1.jar similarity index 91% rename from lib/lucene-grouping-5.4.0.jar rename to lib/lucene-grouping-5.4.1.jar index 694e569af..06ed59dda 100644 Binary files a/lib/lucene-grouping-5.4.0.jar and b/lib/lucene-grouping-5.4.1.jar differ diff --git a/lib/lucene-highlighter-5.4.0.jar b/lib/lucene-highlighter-5.4.1.jar similarity index 90% rename from lib/lucene-highlighter-5.4.0.jar rename to lib/lucene-highlighter-5.4.1.jar index fc565b589..381ea4759 100644 Binary files a/lib/lucene-highlighter-5.4.0.jar and b/lib/lucene-highlighter-5.4.1.jar differ diff --git a/lib/lucene-join-5.4.0.jar b/lib/lucene-join-5.4.1.jar similarity index 90% rename from lib/lucene-join-5.4.0.jar rename to lib/lucene-join-5.4.1.jar index 34193e1da..16a3e8792 100644 Binary files a/lib/lucene-join-5.4.0.jar and b/lib/lucene-join-5.4.1.jar differ diff --git a/lib/lucene-memory-5.4.0.jar b/lib/lucene-memory-5.4.1.jar similarity index 91% rename from lib/lucene-memory-5.4.0.jar rename to lib/lucene-memory-5.4.1.jar index 0853094dc..6b65fe259 100644 Binary files a/lib/lucene-memory-5.4.0.jar and b/lib/lucene-memory-5.4.1.jar differ diff --git a/lib/lucene-misc-5.4.0.jar b/lib/lucene-misc-5.4.1.jar similarity index 87% rename from lib/lucene-misc-5.4.0.jar rename to lib/lucene-misc-5.4.1.jar index 4cc68c3b9..8d36fe7ed 100644 Binary files a/lib/lucene-misc-5.4.0.jar and b/lib/lucene-misc-5.4.1.jar differ diff --git a/lib/lucene-queries-5.4.0.jar b/lib/lucene-queries-5.4.1.jar similarity index 89% rename from lib/lucene-queries-5.4.0.jar rename to lib/lucene-queries-5.4.1.jar index 52e3d0218..168771d5d 100644 Binary files a/lib/lucene-queries-5.4.0.jar and b/lib/lucene-queries-5.4.1.jar differ diff --git a/lib/lucene-queryparser-5.4.0.jar b/lib/lucene-queryparser-5.4.1.jar similarity index 90% rename from lib/lucene-queryparser-5.4.0.jar rename to lib/lucene-queryparser-5.4.1.jar index d928ea956..f7c2e477c 100644 Binary files a/lib/lucene-queryparser-5.4.0.jar and b/lib/lucene-queryparser-5.4.1.jar differ diff --git a/lib/lucene-spatial-5.4.0.jar b/lib/lucene-spatial-5.4.1.jar similarity index 91% rename from lib/lucene-spatial-5.4.0.jar rename to lib/lucene-spatial-5.4.1.jar index 711a9a053..f534568aa 100644 Binary files a/lib/lucene-spatial-5.4.0.jar and b/lib/lucene-spatial-5.4.1.jar differ diff --git a/lib/lucene-suggest-5.4.0.jar b/lib/lucene-suggest-5.4.1.jar similarity index 90% rename from lib/lucene-suggest-5.4.0.jar rename to lib/lucene-suggest-5.4.1.jar index 4c0156d9e..348a75501 100644 Binary files a/lib/lucene-suggest-5.4.0.jar and b/lib/lucene-suggest-5.4.1.jar differ diff --git a/lib/solr-core-5.4.0.jar b/lib/solr-core-5.4.1.jar similarity index 88% rename from lib/solr-core-5.4.0.jar rename to lib/solr-core-5.4.1.jar index 8d361d50a..e896612af 100644 Binary files a/lib/solr-core-5.4.0.jar and b/lib/solr-core-5.4.1.jar differ diff --git a/lib/solr-solrj-5.4.0.jar b/lib/solr-solrj-5.4.1.jar similarity index 89% rename from lib/solr-solrj-5.4.0.jar rename to lib/solr-solrj-5.4.1.jar index a5b38a049..1cdea0ccf 100644 Binary files a/lib/solr-solrj-5.4.0.jar and b/lib/solr-solrj-5.4.1.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index 1c999d492..29214a076 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/common-image-3.2.1.jar;lib/common-io-3.2.1.jar;lib/common-lang-3.2.1.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.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.11.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-bmp-3.2.1.jar;lib/imageio-core-3.2.1.jar;lib/imageio-metadata-3.2.1.jar;lib/imageio-tiff-3.2.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.13.jar;lib/jempbox-1.8.11.jar;lib/jetty-client-9.2.14.v20151106.jar;lib/jetty-continuation-9.2.14.v20151106.jar;lib/jetty-deploy-9.2.14.v20151106.jar;lib/jetty-http-9.2.14.v20151106.jar;lib/jetty-io-9.2.14.v20151106.jar;lib/jetty-jmx-9.2.14.v20151106.jar;lib/jetty-proxy-9.2.14.v20151106.jar;lib/jetty-security-9.2.14.v20151106.jar;lib/jetty-server-9.2.14.v20151106.jar;lib/jetty-servlet-9.2.14.v20151106.jar;lib/jetty-servlets-9.2.14.v20151106.jar;lib/jetty-util-9.2.14.v20151106.jar;lib/jetty-webapp-9.2.14.v20151106.jar;lib/jetty-xml-9.2.14.v20151106.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsonic-1.2.0.jar;lib/jsoup-1.8.3.jar;lib/langdetect.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.4.0.jar;lib/lucene-analyzers-phonetic-5.4.0.jar;lib/lucene-backward-codecs-5.4.0.jar;lib/lucene-classification-5.4.0.jar;lib/lucene-codecs-5.4.0.jar;lib/lucene-core-5.4.0.jar;lib/lucene-facet-5.4.0.jar;lib/lucene-grouping-5.4.0.jar;lib/lucene-highlighter-5.4.0.jar;lib/lucene-join-5.4.0.jar;lib/lucene-memory-5.4.0.jar;lib/lucene-misc-5.4.0.jar;lib/lucene-queries-5.4.0.jar;lib/lucene-queryparser-5.4.0.jar;lib/lucene-spatial-5.4.0.jar;lib/lucene-suggest-5.4.0.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.11.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.4.0.jar;lib/solr-solrj-5.4.0.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-swf-0.1.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.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/common-image-3.2.1.jar;lib/common-io-3.2.1.jar;lib/common-lang-3.2.1.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.10.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.11.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.1.jar;lib/icu4j-56_1.jar;lib/imageio-bmp-3.2.1.jar;lib/imageio-core-3.2.1.jar;lib/imageio-metadata-3.2.1.jar;lib/imageio-tiff-3.2.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.13.jar;lib/jempbox-1.8.11.jar;lib/jetty-client-9.2.14.v20151106.jar;lib/jetty-continuation-9.2.14.v20151106.jar;lib/jetty-deploy-9.2.14.v20151106.jar;lib/jetty-http-9.2.14.v20151106.jar;lib/jetty-io-9.2.14.v20151106.jar;lib/jetty-jmx-9.2.14.v20151106.jar;lib/jetty-proxy-9.2.14.v20151106.jar;lib/jetty-security-9.2.14.v20151106.jar;lib/jetty-server-9.2.14.v20151106.jar;lib/jetty-servlet-9.2.14.v20151106.jar;lib/jetty-servlets-9.2.14.v20151106.jar;lib/jetty-util-9.2.14.v20151106.jar;lib/jetty-webapp-9.2.14.v20151106.jar;lib/jetty-xml-9.2.14.v20151106.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsonic-1.2.0.jar;lib/jsoup-1.8.3.jar;lib/langdetect.jar;lib/log4j-over-slf4j-1.7.13.jar;lib/lucene-analyzers-common-5.4.1.jar;lib/lucene-analyzers-phonetic-5.4.1.jar;lib/lucene-backward-codecs-5.4.1.jar;lib/lucene-classification-5.4.1.jar;lib/lucene-codecs-5.4.1.jar;lib/lucene-core-5.4.1.jar;lib/lucene-facet-5.4.1.jar;lib/lucene-grouping-5.4.1.jar;lib/lucene-highlighter-5.4.1.jar;lib/lucene-join-5.4.1.jar;lib/lucene-memory-5.4.1.jar;lib/lucene-misc-5.4.1.jar;lib/lucene-queries-5.4.1.jar;lib/lucene-queryparser-5.4.1.jar;lib/lucene-spatial-5.4.1.jar;lib/lucene-suggest-5.4.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.11.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/slf4j-api-1.7.13.jar;lib/slf4j-jdk14-1.7.13.jar;lib/solr-core-5.4.1.jar;lib/solr-solrj-5.4.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-swf-0.1.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.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 3c895d0fa..d5eabd974 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 1.7 1.7 - 5.4.0 + 5.4.1 9.2.14.v20151106