diff --git a/.classpath b/.classpath index f0f40f05d..564e71e4b 100644 --- a/.classpath +++ b/.classpath @@ -1,94 +1,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index 009f2e014..6353d4da2 100644 --- a/build.xml +++ b/build.xml @@ -187,20 +187,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lib/jetty-9.2.9.v20150224.License b/lib/jetty-9.2.10.v20150310.License similarity index 100% rename from lib/jetty-9.2.9.v20150224.License rename to lib/jetty-9.2.10.v20150310.License diff --git a/lib/jetty-client-9.2.9.v20150224.jar b/lib/jetty-client-9.2.10.v20150310.jar similarity index 54% rename from lib/jetty-client-9.2.9.v20150224.jar rename to lib/jetty-client-9.2.10.v20150310.jar index 43b3d9327..bbdeeb204 100644 Binary files a/lib/jetty-client-9.2.9.v20150224.jar and b/lib/jetty-client-9.2.10.v20150310.jar differ diff --git a/lib/jetty-continuation-9.2.9.v20150224.jar b/lib/jetty-continuation-9.2.10.v20150310.jar similarity index 76% rename from lib/jetty-continuation-9.2.9.v20150224.jar rename to lib/jetty-continuation-9.2.10.v20150310.jar index 7b68ac3a1..ff07cf2cc 100644 Binary files a/lib/jetty-continuation-9.2.9.v20150224.jar and b/lib/jetty-continuation-9.2.10.v20150310.jar differ diff --git a/lib/jetty-deploy-9.2.9.v20150224.jar b/lib/jetty-deploy-9.2.10.v20150310.jar similarity index 85% rename from lib/jetty-deploy-9.2.9.v20150224.jar rename to lib/jetty-deploy-9.2.10.v20150310.jar index 8f26cdeed..7fbcbb046 100644 Binary files a/lib/jetty-deploy-9.2.9.v20150224.jar and b/lib/jetty-deploy-9.2.10.v20150310.jar differ diff --git a/lib/jetty-http-9.2.9.v20150224.jar b/lib/jetty-http-9.2.10.v20150310.jar similarity index 76% rename from lib/jetty-http-9.2.9.v20150224.jar rename to lib/jetty-http-9.2.10.v20150310.jar index 817e5bfca..15aff5105 100644 Binary files a/lib/jetty-http-9.2.9.v20150224.jar and b/lib/jetty-http-9.2.10.v20150310.jar differ diff --git a/lib/jetty-io-9.2.9.v20150224.jar b/lib/jetty-io-9.2.10.v20150310.jar similarity index 83% rename from lib/jetty-io-9.2.9.v20150224.jar rename to lib/jetty-io-9.2.10.v20150310.jar index fdf7a9780..56cee2c30 100644 Binary files a/lib/jetty-io-9.2.9.v20150224.jar and b/lib/jetty-io-9.2.10.v20150310.jar differ diff --git a/lib/jetty-jmx-9.2.9.v20150224.jar b/lib/jetty-jmx-9.2.10.v20150310.jar similarity index 83% rename from lib/jetty-jmx-9.2.9.v20150224.jar rename to lib/jetty-jmx-9.2.10.v20150310.jar index 5b0e8eef0..83bb57088 100644 Binary files a/lib/jetty-jmx-9.2.9.v20150224.jar and b/lib/jetty-jmx-9.2.10.v20150310.jar differ diff --git a/lib/jetty-proxy-9.2.10.v20150310.jar b/lib/jetty-proxy-9.2.10.v20150310.jar new file mode 100644 index 000000000..e227bd7fe Binary files /dev/null and b/lib/jetty-proxy-9.2.10.v20150310.jar differ diff --git a/lib/jetty-proxy-9.2.9.v20150224.jar b/lib/jetty-proxy-9.2.9.v20150224.jar deleted file mode 100644 index fc5e021cc..000000000 Binary files a/lib/jetty-proxy-9.2.9.v20150224.jar and /dev/null differ diff --git a/lib/jetty-security-9.2.9.v20150224.jar b/lib/jetty-security-9.2.10.v20150310.jar similarity index 89% rename from lib/jetty-security-9.2.9.v20150224.jar rename to lib/jetty-security-9.2.10.v20150310.jar index be46375a1..759f88436 100644 Binary files a/lib/jetty-security-9.2.9.v20150224.jar and b/lib/jetty-security-9.2.10.v20150310.jar differ diff --git a/lib/jetty-server-9.2.9.v20150224.jar b/lib/jetty-server-9.2.10.v20150310.jar similarity index 89% rename from lib/jetty-server-9.2.9.v20150224.jar rename to lib/jetty-server-9.2.10.v20150310.jar index b22dcdfde..815cb081c 100644 Binary files a/lib/jetty-server-9.2.9.v20150224.jar and b/lib/jetty-server-9.2.10.v20150310.jar differ diff --git a/lib/jetty-servlet-9.2.9.v20150224.jar b/lib/jetty-servlet-9.2.10.v20150310.jar similarity index 92% rename from lib/jetty-servlet-9.2.9.v20150224.jar rename to lib/jetty-servlet-9.2.10.v20150310.jar index 23c5dcd29..9dc95236e 100644 Binary files a/lib/jetty-servlet-9.2.9.v20150224.jar and b/lib/jetty-servlet-9.2.10.v20150310.jar differ diff --git a/lib/jetty-servlets-9.2.9.v20150224.jar b/lib/jetty-servlets-9.2.10.v20150310.jar similarity index 91% rename from lib/jetty-servlets-9.2.9.v20150224.jar rename to lib/jetty-servlets-9.2.10.v20150310.jar index b31e08948..885930b76 100644 Binary files a/lib/jetty-servlets-9.2.9.v20150224.jar and b/lib/jetty-servlets-9.2.10.v20150310.jar differ diff --git a/lib/jetty-util-9.2.9.v20150224.jar b/lib/jetty-util-9.2.10.v20150310.jar similarity index 88% rename from lib/jetty-util-9.2.9.v20150224.jar rename to lib/jetty-util-9.2.10.v20150310.jar index 551fe6d95..fe2775878 100644 Binary files a/lib/jetty-util-9.2.9.v20150224.jar and b/lib/jetty-util-9.2.10.v20150310.jar differ diff --git a/lib/jetty-webapp-9.2.9.v20150224.jar b/lib/jetty-webapp-9.2.10.v20150310.jar similarity index 92% rename from lib/jetty-webapp-9.2.9.v20150224.jar rename to lib/jetty-webapp-9.2.10.v20150310.jar index 4b09ba3fe..ede7d4a64 100644 Binary files a/lib/jetty-webapp-9.2.9.v20150224.jar and b/lib/jetty-webapp-9.2.10.v20150310.jar differ diff --git a/lib/jetty-xml-9.2.9.v20150224.jar b/lib/jetty-xml-9.2.10.v20150310.jar similarity index 90% rename from lib/jetty-xml-9.2.9.v20150224.jar rename to lib/jetty-xml-9.2.10.v20150310.jar index 6555572f5..fb3526994 100644 Binary files a/lib/jetty-xml-9.2.9.v20150224.jar and b/lib/jetty-xml-9.2.10.v20150310.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index 5396d7b0e..91b62546b 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.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.4.jar;lib/httpcore-4.4.jar;lib/httpmime-4.4.jar;lib/icu4j-core.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.9.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.9.v20150224.jar;lib/jetty-continuation-9.2.9.v20150224.jar;lib/jetty-deploy-9.2.9.v20150224.jar;lib/jetty-http-9.2.9.v20150224.jar;lib/jetty-io-9.2.9.v20150224.jar;lib/jetty-jmx-9.2.9.v20150224.jar;lib/jetty-proxy-9.2.9.v20150224.jar;lib/jetty-security-9.2.9.v20150224.jar;lib/jetty-server-9.2.9.v20150224.jar;lib/jetty-servlet-9.2.9.v20150224.jar;lib/jetty-servlets-9.2.9.v20150224.jar;lib/jetty-util-9.2.9.v20150224.jar;lib/jetty-webapp-9.2.9.v20150224.jar;lib/jetty-xml-9.2.9.v20150224.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.3.jar;lib/lucene-analyzers-phonetic-4.10.3.jar;lib/lucene-classification-4.10.3.jar;lib/lucene-codecs-4.10.3.jar;lib/lucene-core-4.10.3.jar;lib/lucene-facet-4.10.3.jar;lib/lucene-grouping-4.10.3.jar;lib/lucene-highlighter-4.10.3.jar;lib/lucene-join-4.10.3.jar;lib/lucene-memory-4.10.3.jar;lib/lucene-misc-4.10.3.jar;lib/lucene-queries-4.10.3.jar;lib/lucene-queryparser-4.10.3.jar;lib/lucene-spatial-4.10.3.jar;lib/lucene-suggest-4.10.3.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.3.jar;lib/solr-solrj-4.10.3.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.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.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.4.jar;lib/httpcore-4.4.jar;lib/httpmime-4.4.jar;lib/icu4j-core.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.9.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.10.v20150310.jar;lib/jetty-continuation-9.2.10.v20150310.jar;lib/jetty-deploy-9.2.10.v20150310.jar;lib/jetty-http-9.2.10.v20150310.jar;lib/jetty-io-9.2.10.v20150310.jar;lib/jetty-jmx-9.2.10.v20150310.jar;lib/jetty-proxy-9.2.10.v20150310.jar;lib/jetty-security-9.2.10.v20150310.jar;lib/jetty-server-9.2.10.v20150310.jar;lib/jetty-servlet-9.2.10.v20150310.jar;lib/jetty-servlets-9.2.10.v20150310.jar;lib/jetty-util-9.2.10.v20150310.jar;lib/jetty-webapp-9.2.10.v20150310.jar;lib/jetty-xml-9.2.10.v20150310.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.3.jar;lib/lucene-analyzers-phonetic-4.10.3.jar;lib/lucene-classification-4.10.3.jar;lib/lucene-codecs-4.10.3.jar;lib/lucene-core-4.10.3.jar;lib/lucene-facet-4.10.3.jar;lib/lucene-grouping-4.10.3.jar;lib/lucene-highlighter-4.10.3.jar;lib/lucene-join-4.10.3.jar;lib/lucene-memory-4.10.3.jar;lib/lucene-misc-4.10.3.jar;lib/lucene-queries-4.10.3.jar;lib/lucene-queryparser-4.10.3.jar;lib/lucene-spatial-4.10.3.jar;lib/lucene-suggest-4.10.3.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.3.jar;lib/solr-solrj-4.10.3.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.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 619d9715c..a2ee79535 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 4.10.3 - 9.2.9.v20150224 + 9.2.10.v20150310 ${DSTAMP}