diff --git a/.classpath b/.classpath index f4d776bec..8d6282c34 100644 --- a/.classpath +++ b/.classpath @@ -29,9 +29,9 @@ - - - + + + @@ -48,7 +48,7 @@ - + diff --git a/build.xml b/build.xml index c5bfefe4c..b26869d76 100644 --- a/build.xml +++ b/build.xml @@ -191,7 +191,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -235,8 +235,8 @@ - - + + diff --git a/lib/jcl-over-slf4j-1.7.13.jar b/lib/jcl-over-slf4j-1.7.16.jar similarity index 53% rename from lib/jcl-over-slf4j-1.7.13.jar rename to lib/jcl-over-slf4j-1.7.16.jar index 496994649..28dff62a1 100644 Binary files a/lib/jcl-over-slf4j-1.7.13.jar and b/lib/jcl-over-slf4j-1.7.16.jar differ diff --git a/lib/log4j-over-slf4j-1.7.13.jar b/lib/log4j-over-slf4j-1.7.16.jar similarity index 69% rename from lib/log4j-over-slf4j-1.7.13.jar rename to lib/log4j-over-slf4j-1.7.16.jar index d1346910b..675197119 100644 Binary files a/lib/log4j-over-slf4j-1.7.13.jar and b/lib/log4j-over-slf4j-1.7.16.jar differ diff --git a/lib/slf4j-api-1.7.13.jar b/lib/slf4j-api-1.7.13.jar deleted file mode 100644 index 4dfaaa8ce..000000000 Binary files a/lib/slf4j-api-1.7.13.jar and /dev/null differ diff --git a/lib/slf4j-api-1.7.16.jar b/lib/slf4j-api-1.7.16.jar new file mode 100644 index 000000000..35c94e0c3 Binary files /dev/null and b/lib/slf4j-api-1.7.16.jar differ diff --git a/lib/slf4j-jdk14-1.7.13.jar b/lib/slf4j-jdk14-1.7.13.jar deleted file mode 100644 index b31b2008b..000000000 Binary files a/lib/slf4j-jdk14-1.7.13.jar and /dev/null differ diff --git a/lib/slf4j-jdk14-1.7.16.jar b/lib/slf4j-jdk14-1.7.16.jar new file mode 100644 index 000000000..77c8704b3 Binary files /dev/null and b/lib/slf4j-jdk14-1.7.16.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index 483be3518..ee4d534fd 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.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.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.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.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.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/yacycore.jar 1.7 diff --git a/pom.xml b/pom.xml index 3159cf215..5f5de3704 100644 --- a/pom.xml +++ b/pom.xml @@ -446,7 +446,7 @@ org.slf4j jcl-over-slf4j - 1.7.13 + 1.7.16 org.apache.pdfbox @@ -476,7 +476,7 @@ org.slf4j log4j-over-slf4j - 1.7.13 + 1.7.16 org.apache.lucene @@ -516,12 +516,12 @@ org.slf4j slf4j-api - 1.7.13 + 1.7.16 org.slf4j slf4j-jdk14 - 1.7.13 + 1.7.16 org.apache.solr