diff --git a/.classpath b/.classpath index 3c8b3cd7e..e915be266 100644 --- a/.classpath +++ b/.classpath @@ -37,7 +37,7 @@ - + @@ -67,26 +67,26 @@ - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index 6e9ea2c11..a9a428306 100644 --- a/build.xml +++ b/build.xml @@ -211,22 +211,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -237,9 +237,9 @@ - - - + + + diff --git a/lib/lucene-analyzers-common-5.4.1.jar b/lib/lucene-analyzers-common-5.5.0.jar similarity index 85% rename from lib/lucene-analyzers-common-5.4.1.jar rename to lib/lucene-analyzers-common-5.5.0.jar index bcbeedb93..f4706ba9f 100644 Binary files a/lib/lucene-analyzers-common-5.4.1.jar and b/lib/lucene-analyzers-common-5.5.0.jar differ diff --git a/lib/lucene-analyzers-phonetic-5.4.1.jar b/lib/lucene-analyzers-phonetic-5.5.0.jar similarity index 84% rename from lib/lucene-analyzers-phonetic-5.4.1.jar rename to lib/lucene-analyzers-phonetic-5.5.0.jar index acf38f760..0eaba74ba 100644 Binary files a/lib/lucene-analyzers-phonetic-5.4.1.jar and b/lib/lucene-analyzers-phonetic-5.5.0.jar differ diff --git a/lib/lucene-backward-codecs-5.4.1.jar b/lib/lucene-backward-codecs-5.4.1.jar deleted file mode 100644 index 67b83eefa..000000000 Binary files a/lib/lucene-backward-codecs-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-backward-codecs-5.5.0.jar b/lib/lucene-backward-codecs-5.5.0.jar new file mode 100644 index 000000000..6be43920e Binary files /dev/null and b/lib/lucene-backward-codecs-5.5.0.jar differ diff --git a/lib/lucene-classification-5.4.1.jar b/lib/lucene-classification-5.5.0.jar similarity index 92% rename from lib/lucene-classification-5.4.1.jar rename to lib/lucene-classification-5.5.0.jar index 2c36bbb47..4dfb6806a 100644 Binary files a/lib/lucene-classification-5.4.1.jar and b/lib/lucene-classification-5.5.0.jar differ diff --git a/lib/lucene-codecs-5.4.1.jar b/lib/lucene-codecs-5.5.0.jar similarity index 84% rename from lib/lucene-codecs-5.4.1.jar rename to lib/lucene-codecs-5.5.0.jar index 4fd60fcf3..ff64c17c4 100644 Binary files a/lib/lucene-codecs-5.4.1.jar and b/lib/lucene-codecs-5.5.0.jar differ diff --git a/lib/lucene-core-5.4.1.jar b/lib/lucene-core-5.5.0.jar similarity index 74% rename from lib/lucene-core-5.4.1.jar rename to lib/lucene-core-5.5.0.jar index 769566bc8..ef6a46015 100644 Binary files a/lib/lucene-core-5.4.1.jar and b/lib/lucene-core-5.5.0.jar differ diff --git a/lib/lucene-facet-5.4.1.jar b/lib/lucene-facet-5.4.1.jar deleted file mode 100644 index 941d1d154..000000000 Binary files a/lib/lucene-facet-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-facet-5.5.0.jar b/lib/lucene-facet-5.5.0.jar new file mode 100644 index 000000000..aa3eef220 Binary files /dev/null and b/lib/lucene-facet-5.5.0.jar differ diff --git a/lib/lucene-grouping-5.4.1.jar b/lib/lucene-grouping-5.4.1.jar deleted file mode 100644 index 06ed59dda..000000000 Binary files a/lib/lucene-grouping-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-grouping-5.5.0.jar b/lib/lucene-grouping-5.5.0.jar new file mode 100644 index 000000000..b29482ae7 Binary files /dev/null and b/lib/lucene-grouping-5.5.0.jar differ diff --git a/lib/lucene-highlighter-5.4.1.jar b/lib/lucene-highlighter-5.4.1.jar deleted file mode 100644 index 381ea4759..000000000 Binary files a/lib/lucene-highlighter-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-highlighter-5.5.0.jar b/lib/lucene-highlighter-5.5.0.jar new file mode 100644 index 000000000..b7d9e45f9 Binary files /dev/null and b/lib/lucene-highlighter-5.5.0.jar differ diff --git a/lib/lucene-join-5.4.1.jar b/lib/lucene-join-5.4.1.jar deleted file mode 100644 index 16a3e8792..000000000 Binary files a/lib/lucene-join-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-join-5.5.0.jar b/lib/lucene-join-5.5.0.jar new file mode 100644 index 000000000..d6b436ca5 Binary files /dev/null and b/lib/lucene-join-5.5.0.jar differ diff --git a/lib/lucene-memory-5.4.1.jar b/lib/lucene-memory-5.4.1.jar deleted file mode 100644 index 6b65fe259..000000000 Binary files a/lib/lucene-memory-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-memory-5.5.0.jar b/lib/lucene-memory-5.5.0.jar new file mode 100644 index 000000000..81c1acdd8 Binary files /dev/null and b/lib/lucene-memory-5.5.0.jar differ diff --git a/lib/lucene-misc-5.4.1.jar b/lib/lucene-misc-5.4.1.jar deleted file mode 100644 index 8d36fe7ed..000000000 Binary files a/lib/lucene-misc-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-misc-5.5.0.jar b/lib/lucene-misc-5.5.0.jar new file mode 100644 index 000000000..789a77f4b Binary files /dev/null and b/lib/lucene-misc-5.5.0.jar differ diff --git a/lib/lucene-queries-5.4.1.jar b/lib/lucene-queries-5.4.1.jar deleted file mode 100644 index 168771d5d..000000000 Binary files a/lib/lucene-queries-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-queries-5.5.0.jar b/lib/lucene-queries-5.5.0.jar new file mode 100644 index 000000000..895138abe Binary files /dev/null and b/lib/lucene-queries-5.5.0.jar differ diff --git a/lib/lucene-queryparser-5.4.1.jar b/lib/lucene-queryparser-5.4.1.jar deleted file mode 100644 index f7c2e477c..000000000 Binary files a/lib/lucene-queryparser-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-queryparser-5.5.0.jar b/lib/lucene-queryparser-5.5.0.jar new file mode 100644 index 000000000..e69bb905c Binary files /dev/null and b/lib/lucene-queryparser-5.5.0.jar differ diff --git a/lib/lucene-spatial-5.4.1.jar b/lib/lucene-spatial-5.4.1.jar deleted file mode 100644 index f534568aa..000000000 Binary files a/lib/lucene-spatial-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-spatial-5.5.0.jar b/lib/lucene-spatial-5.5.0.jar new file mode 100644 index 000000000..adcbae78d Binary files /dev/null and b/lib/lucene-spatial-5.5.0.jar differ diff --git a/lib/lucene-suggest-5.4.1.jar b/lib/lucene-suggest-5.4.1.jar deleted file mode 100644 index 348a75501..000000000 Binary files a/lib/lucene-suggest-5.4.1.jar and /dev/null differ diff --git a/lib/lucene-suggest-5.5.0.jar b/lib/lucene-suggest-5.5.0.jar new file mode 100644 index 000000000..191a0b3d1 Binary files /dev/null and b/lib/lucene-suggest-5.5.0.jar differ diff --git a/lib/solr-core-5.4.1.jar b/lib/solr-core-5.4.1.jar deleted file mode 100644 index e896612af..000000000 Binary files a/lib/solr-core-5.4.1.jar and /dev/null differ diff --git a/lib/solr-core-5.5.0.jar b/lib/solr-core-5.5.0.jar new file mode 100644 index 000000000..74c6a7f5d Binary files /dev/null and b/lib/solr-core-5.5.0.jar differ diff --git a/lib/solr-solrj-5.4.1.jar b/lib/solr-solrj-5.4.1.jar deleted file mode 100644 index 1cdea0ccf..000000000 Binary files a/lib/solr-solrj-5.4.1.jar and /dev/null differ diff --git a/lib/solr-solrj-5.5.0.jar b/lib/solr-solrj-5.5.0.jar new file mode 100644 index 000000000..33e4c6df7 Binary files /dev/null and b/lib/solr-solrj-5.5.0.jar differ diff --git a/lib/spatial4j-0.4.1.jar b/lib/spatial4j-0.4.1.jar deleted file mode 100644 index e62c0b480..000000000 Binary files a/lib/spatial4j-0.4.1.jar and /dev/null differ diff --git a/lib/spatial4j-0.5.jar b/lib/spatial4j-0.5.jar new file mode 100644 index 000000000..02fa52ea9 Binary files /dev/null and b/lib/spatial4j-0.5.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index 8bf970f29..e9db1e837 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.2.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.2.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.16.jar;lib/jempbox-1.8.11.jar;lib/jetty-client-9.2.15.v20160210.jar;lib/jetty-continuation-9.2.15.v20160210.jar;lib/jetty-deploy-9.2.15.v20160210.jar;lib/jetty-http-9.2.15.v20160210.jar;lib/jetty-io-9.2.15.v20160210.jar;lib/jetty-jmx-9.2.15.v20160210.jar;lib/jetty-proxy-9.2.15.v20160210.jar;lib/jetty-security-9.2.15.v20160210.jar;lib/jetty-server-9.2.15.v20160210.jar;lib/jetty-servlet-9.2.15.v20160210.jar;lib/jetty-servlets-9.2.15.v20160210.jar;lib/jetty-util-9.2.15.v20160210.jar;lib/jetty-webapp-9.2.15.v20160210.jar;lib/jetty-xml-9.2.15.v20160210.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.16.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.16.jar;lib/slf4j-jdk14-1.7.16.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.4.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.2.jar;lib/httpcore-4.4.4.jar;lib/httpmime-4.5.2.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.16.jar;lib/jempbox-1.8.11.jar;lib/jetty-client-9.2.15.v20160210.jar;lib/jetty-continuation-9.2.15.v20160210.jar;lib/jetty-deploy-9.2.15.v20160210.jar;lib/jetty-http-9.2.15.v20160210.jar;lib/jetty-io-9.2.15.v20160210.jar;lib/jetty-jmx-9.2.15.v20160210.jar;lib/jetty-proxy-9.2.15.v20160210.jar;lib/jetty-security-9.2.15.v20160210.jar;lib/jetty-server-9.2.15.v20160210.jar;lib/jetty-servlet-9.2.15.v20160210.jar;lib/jetty-servlets-9.2.15.v20160210.jar;lib/jetty-util-9.2.15.v20160210.jar;lib/jetty-webapp-9.2.15.v20160210.jar;lib/jetty-xml-9.2.15.v20160210.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.16.jar;lib/lucene-analyzers-common-5.5.0.jar;lib/lucene-analyzers-phonetic-5.5.0.jar;lib/lucene-backward-codecs-5.5.0.jar;lib/lucene-classification-5.5.0.jar;lib/lucene-codecs-5.5.0.jar;lib/lucene-core-5.5.0.jar;lib/lucene-facet-5.5.0.jar;lib/lucene-grouping-5.5.0.jar;lib/lucene-highlighter-5.5.0.jar;lib/lucene-join-5.5.0.jar;lib/lucene-memory-5.5.0.jar;lib/lucene-misc-5.5.0.jar;lib/lucene-queries-5.5.0.jar;lib/lucene-queryparser-5.5.0.jar;lib/lucene-spatial-5.5.0.jar;lib/lucene-suggest-5.5.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.16.jar;lib/slf4j-jdk14-1.7.16.jar;lib/solr-core-5.5.0.jar;lib/solr-solrj-5.5.0.jar;lib/spatial4j-0.5.jar;lib/stax2-api-3.1.4.jar;lib/webcat-swf-0.1.jar;lib/weupnp-0.1.4.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 259ca8e70..da213333b 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 1.7 1.7 - 5.4.1 + 5.5.0 9.2.15.v20160210