diff --git a/.classpath b/.classpath index cbea68f7c..40558dc62 100644 --- a/.classpath +++ b/.classpath @@ -49,20 +49,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index d6b82d181..bdb409ca5 100644 --- a/build.xml +++ b/build.xml @@ -192,20 +192,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lib/jetty-9.2.11.v20150529.License b/lib/jetty-9.2.13.v20150730.License similarity index 100% rename from lib/jetty-9.2.11.v20150529.License rename to lib/jetty-9.2.13.v20150730.License diff --git a/lib/jetty-client-9.2.11.v20150529.jar b/lib/jetty-client-9.2.13.v20150730.jar similarity index 70% rename from lib/jetty-client-9.2.11.v20150529.jar rename to lib/jetty-client-9.2.13.v20150730.jar index 50330e9d5..30e2a9287 100644 Binary files a/lib/jetty-client-9.2.11.v20150529.jar and b/lib/jetty-client-9.2.13.v20150730.jar differ diff --git a/lib/jetty-continuation-9.2.11.v20150529.jar b/lib/jetty-continuation-9.2.13.v20150730.jar similarity index 51% rename from lib/jetty-continuation-9.2.11.v20150529.jar rename to lib/jetty-continuation-9.2.13.v20150730.jar index 9c8224f6a..a04051f9f 100644 Binary files a/lib/jetty-continuation-9.2.11.v20150529.jar and b/lib/jetty-continuation-9.2.13.v20150730.jar differ diff --git a/lib/jetty-deploy-9.2.11.v20150529.jar b/lib/jetty-deploy-9.2.13.v20150730.jar similarity index 83% rename from lib/jetty-deploy-9.2.11.v20150529.jar rename to lib/jetty-deploy-9.2.13.v20150730.jar index d69b242dd..a7dac3521 100644 Binary files a/lib/jetty-deploy-9.2.11.v20150529.jar and b/lib/jetty-deploy-9.2.13.v20150730.jar differ diff --git a/lib/jetty-http-9.2.11.v20150529.jar b/lib/jetty-http-9.2.13.v20150730.jar similarity index 58% rename from lib/jetty-http-9.2.11.v20150529.jar rename to lib/jetty-http-9.2.13.v20150730.jar index 683c68c66..e6ca1edb9 100644 Binary files a/lib/jetty-http-9.2.11.v20150529.jar and b/lib/jetty-http-9.2.13.v20150730.jar differ diff --git a/lib/jetty-io-9.2.11.v20150529.jar b/lib/jetty-io-9.2.13.v20150730.jar similarity index 75% rename from lib/jetty-io-9.2.11.v20150529.jar rename to lib/jetty-io-9.2.13.v20150730.jar index a50d87efe..3fd1d182f 100644 Binary files a/lib/jetty-io-9.2.11.v20150529.jar and b/lib/jetty-io-9.2.13.v20150730.jar differ diff --git a/lib/jetty-jmx-9.2.11.v20150529.jar b/lib/jetty-jmx-9.2.13.v20150730.jar similarity index 82% rename from lib/jetty-jmx-9.2.11.v20150529.jar rename to lib/jetty-jmx-9.2.13.v20150730.jar index 8dede633d..c4c9e0bf9 100644 Binary files a/lib/jetty-jmx-9.2.11.v20150529.jar and b/lib/jetty-jmx-9.2.13.v20150730.jar differ diff --git a/lib/jetty-proxy-9.2.11.v20150529.jar b/lib/jetty-proxy-9.2.11.v20150529.jar deleted file mode 100644 index a9e49d3f4..000000000 Binary files a/lib/jetty-proxy-9.2.11.v20150529.jar and /dev/null differ diff --git a/lib/jetty-proxy-9.2.13.v20150730.jar b/lib/jetty-proxy-9.2.13.v20150730.jar new file mode 100644 index 000000000..efbc32cad Binary files /dev/null and b/lib/jetty-proxy-9.2.13.v20150730.jar differ diff --git a/lib/jetty-security-9.2.11.v20150529.jar b/lib/jetty-security-9.2.13.v20150730.jar similarity index 80% rename from lib/jetty-security-9.2.11.v20150529.jar rename to lib/jetty-security-9.2.13.v20150730.jar index 0d2ac23de..92428c3e2 100644 Binary files a/lib/jetty-security-9.2.11.v20150529.jar and b/lib/jetty-security-9.2.13.v20150730.jar differ diff --git a/lib/jetty-server-9.2.11.v20150529.jar b/lib/jetty-server-9.2.13.v20150730.jar similarity index 81% rename from lib/jetty-server-9.2.11.v20150529.jar rename to lib/jetty-server-9.2.13.v20150730.jar index fee6d3a1f..070ef00b7 100644 Binary files a/lib/jetty-server-9.2.11.v20150529.jar and b/lib/jetty-server-9.2.13.v20150730.jar differ diff --git a/lib/jetty-servlet-9.2.11.v20150529.jar b/lib/jetty-servlet-9.2.13.v20150730.jar similarity index 67% rename from lib/jetty-servlet-9.2.11.v20150529.jar rename to lib/jetty-servlet-9.2.13.v20150730.jar index d9fe37830..46604e1e6 100644 Binary files a/lib/jetty-servlet-9.2.11.v20150529.jar and b/lib/jetty-servlet-9.2.13.v20150730.jar differ diff --git a/lib/jetty-servlets-9.2.11.v20150529.jar b/lib/jetty-servlets-9.2.13.v20150730.jar similarity index 79% rename from lib/jetty-servlets-9.2.11.v20150529.jar rename to lib/jetty-servlets-9.2.13.v20150730.jar index 00815e32d..311a6a058 100644 Binary files a/lib/jetty-servlets-9.2.11.v20150529.jar and b/lib/jetty-servlets-9.2.13.v20150730.jar differ diff --git a/lib/jetty-util-9.2.11.v20150529.jar b/lib/jetty-util-9.2.13.v20150730.jar similarity index 76% rename from lib/jetty-util-9.2.11.v20150529.jar rename to lib/jetty-util-9.2.13.v20150730.jar index 11422f0de..93e97ad9a 100644 Binary files a/lib/jetty-util-9.2.11.v20150529.jar and b/lib/jetty-util-9.2.13.v20150730.jar differ diff --git a/lib/jetty-webapp-9.2.11.v20150529.jar b/lib/jetty-webapp-9.2.13.v20150730.jar similarity index 89% rename from lib/jetty-webapp-9.2.11.v20150529.jar rename to lib/jetty-webapp-9.2.13.v20150730.jar index 15ed05691..fd5c76da2 100644 Binary files a/lib/jetty-webapp-9.2.11.v20150529.jar and b/lib/jetty-webapp-9.2.13.v20150730.jar differ diff --git a/lib/jetty-xml-9.2.11.v20150529.jar b/lib/jetty-xml-9.2.13.v20150730.jar similarity index 66% rename from lib/jetty-xml-9.2.11.v20150529.jar rename to lib/jetty-xml-9.2.13.v20150730.jar index 8ec868b69..43b58b520 100644 Binary files a/lib/jetty-xml-9.2.11.v20150529.jar and b/lib/jetty-xml-9.2.13.v20150730.jar differ diff --git a/nbproject/project.xml b/nbproject/project.xml index 7ebeefa70..c6f979e7c 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.1.2.jar;lib/common-io-3.1.2.jar;lib/common-lang-3.1.2.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.10.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.3.jar;lib/httpmime-4.5.1.jar;lib/icu4j-55_1.jar;lib/imageio-core-3.1.2.jar;lib/imageio-metadata-3.1.2.jar;lib/imageio-tiff-3.1.2.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.10.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.3.jar;lib/log4j-over-slf4j-1.7.12.jar;lib/lucene-analyzers-common-5.3.1.jar;lib/lucene-analyzers-phonetic-5.3.1.jar;lib/lucene-backward-codecs-5.3.1.jar;lib/lucene-classification-5.3.1.jar;lib/lucene-codecs-5.3.1.jar;lib/lucene-core-5.3.1.jar;lib/lucene-facet-5.3.1.jar;lib/lucene-grouping-5.3.1.jar;lib/lucene-highlighter-5.3.1.jar;lib/lucene-join-5.3.1.jar;lib/lucene-memory-5.3.1.jar;lib/lucene-misc-5.3.1.jar;lib/lucene-queries-5.3.1.jar;lib/lucene-queryparser-5.3.1.jar;lib/lucene-spatial-5.3.1.jar;lib/lucene-suggest-5.3.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.10.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/servlet-3.1.2.jar;lib/slf4j-api-1.7.12.jar;lib/slf4j-jdk14-1.7.12.jar;lib/solr-core-5.3.1.jar;lib/solr-solrj-5.3.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/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.1.2.jar;lib/common-io-3.1.2.jar;lib/common-lang-3.1.2.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.10.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.1.jar;lib/httpcore-4.4.3.jar;lib/httpmime-4.5.1.jar;lib/icu4j-55_1.jar;lib/imageio-core-3.1.2.jar;lib/imageio-metadata-3.1.2.jar;lib/imageio-tiff-3.1.2.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.10.jar;lib/jetty-client-9.2.13.v20150730.jar;lib/jetty-continuation-9.2.13.v20150730.jar;lib/jetty-deploy-9.2.13.v20150730.jar;lib/jetty-http-9.2.13.v20150730.jar;lib/jetty-io-9.2.13.v20150730.jar;lib/jetty-jmx-9.2.13.v20150730.jar;lib/jetty-proxy-9.2.13.v20150730.jar;lib/jetty-security-9.2.13.v20150730.jar;lib/jetty-server-9.2.13.v20150730.jar;lib/jetty-servlet-9.2.13.v20150730.jar;lib/jetty-servlets-9.2.13.v20150730.jar;lib/jetty-util-9.2.13.v20150730.jar;lib/jetty-webapp-9.2.13.v20150730.jar;lib/jetty-xml-9.2.13.v20150730.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.3.jar;lib/log4j-over-slf4j-1.7.12.jar;lib/lucene-analyzers-common-5.3.1.jar;lib/lucene-analyzers-phonetic-5.3.1.jar;lib/lucene-backward-codecs-5.3.1.jar;lib/lucene-classification-5.3.1.jar;lib/lucene-codecs-5.3.1.jar;lib/lucene-core-5.3.1.jar;lib/lucene-facet-5.3.1.jar;lib/lucene-grouping-5.3.1.jar;lib/lucene-highlighter-5.3.1.jar;lib/lucene-join-5.3.1.jar;lib/lucene-memory-5.3.1.jar;lib/lucene-misc-5.3.1.jar;lib/lucene-queries-5.3.1.jar;lib/lucene-queryparser-5.3.1.jar;lib/lucene-spatial-5.3.1.jar;lib/lucene-suggest-5.3.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.10.jar;lib/poi-3.13-20150929.jar;lib/poi-scratchpad-3.13-20150929.jar;lib/servlet-3.1.2.jar;lib/slf4j-api-1.7.12.jar;lib/slf4j-jdk14-1.7.12.jar;lib/solr-core-5.3.1.jar;lib/solr-solrj-5.3.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/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 1f22c197d..e0505bbaa 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 5.3.1 - 9.2.11.v20150529 + 9.2.13.v20150730 ${DSTAMP}