diff --git a/.classpath b/.classpath index 2cbfa9d44..f8e16246c 100644 --- a/.classpath +++ b/.classpath @@ -1,91 +1,91 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 0e753bf16..731baba6f 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -62,20 +62,20 @@ $JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar $JAVAROOT/lib/jempbox-1.8.6.jar $JAVAROOT/lib/javax.servlet-api-3.1.0.jar - $JAVAROOT/lib/jetty-client-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-continuation-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-deploy-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-http-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-io-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-jmx-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-proxy-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-security-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-server-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-servlet-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-servlets-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-util-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-webapp-9.2.1.v20140609.jar - $JAVAROOT/lib/jetty-xml-9.2.1.v20140609.jar + $JAVAROOT/lib/jetty-client-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-continuation-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-deploy-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-http-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-io-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-jmx-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-proxy-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-security-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-server-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-servlet-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-servlets-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-util-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-webapp-9.2.2.v20140723.jar + $JAVAROOT/lib/jetty-xml-9.2.2.v20140723.jar $JAVAROOT/lib/jsch-0.1.50.jar $JAVAROOT/lib/json-simple-1.1.1.jar $JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar diff --git a/build.xml b/build.xml index 2547a13b3..63ca49fe3 100644 --- a/build.xml +++ b/build.xml @@ -186,20 +186,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lib/jetty-9.2.1.v20140609.License b/lib/jetty-9.2.2.v20140723.License similarity index 100% rename from lib/jetty-9.2.1.v20140609.License rename to lib/jetty-9.2.2.v20140723.License diff --git a/lib/jetty-client-9.2.1.v20140609.jar b/lib/jetty-client-9.2.1.v20140609.jar deleted file mode 100644 index 8f747fd49..000000000 Binary files a/lib/jetty-client-9.2.1.v20140609.jar and /dev/null differ diff --git a/lib/jetty-client-9.2.2.v20140723.jar b/lib/jetty-client-9.2.2.v20140723.jar new file mode 100644 index 000000000..06403363f Binary files /dev/null and b/lib/jetty-client-9.2.2.v20140723.jar differ diff --git a/lib/jetty-continuation-9.2.1.v20140609.jar b/lib/jetty-continuation-9.2.2.v20140723.jar similarity index 76% rename from lib/jetty-continuation-9.2.1.v20140609.jar rename to lib/jetty-continuation-9.2.2.v20140723.jar index b63a783ed..c8aae693c 100644 Binary files a/lib/jetty-continuation-9.2.1.v20140609.jar and b/lib/jetty-continuation-9.2.2.v20140723.jar differ diff --git a/lib/jetty-deploy-9.2.1.v20140609.jar b/lib/jetty-deploy-9.2.2.v20140723.jar similarity index 75% rename from lib/jetty-deploy-9.2.1.v20140609.jar rename to lib/jetty-deploy-9.2.2.v20140723.jar index 928921824..0f61ddc70 100644 Binary files a/lib/jetty-deploy-9.2.1.v20140609.jar and b/lib/jetty-deploy-9.2.2.v20140723.jar differ diff --git a/lib/jetty-http-9.2.1.v20140609.jar b/lib/jetty-http-9.2.2.v20140723.jar similarity index 53% rename from lib/jetty-http-9.2.1.v20140609.jar rename to lib/jetty-http-9.2.2.v20140723.jar index 7d6790f22..53def3b9b 100644 Binary files a/lib/jetty-http-9.2.1.v20140609.jar and b/lib/jetty-http-9.2.2.v20140723.jar differ diff --git a/lib/jetty-io-9.2.1.v20140609.jar b/lib/jetty-io-9.2.1.v20140609.jar deleted file mode 100644 index 7a91204ab..000000000 Binary files a/lib/jetty-io-9.2.1.v20140609.jar and /dev/null differ diff --git a/lib/jetty-io-9.2.2.v20140723.jar b/lib/jetty-io-9.2.2.v20140723.jar new file mode 100644 index 000000000..8876f1d31 Binary files /dev/null and b/lib/jetty-io-9.2.2.v20140723.jar differ diff --git a/lib/jetty-jmx-9.2.1.v20140609.jar b/lib/jetty-jmx-9.2.1.v20140609.jar deleted file mode 100644 index 5ab4c496d..000000000 Binary files a/lib/jetty-jmx-9.2.1.v20140609.jar and /dev/null differ diff --git a/lib/jetty-jmx-9.2.2.v20140723.jar b/lib/jetty-jmx-9.2.2.v20140723.jar new file mode 100644 index 000000000..fb829403c Binary files /dev/null and b/lib/jetty-jmx-9.2.2.v20140723.jar differ diff --git a/lib/jetty-proxy-9.2.1.v20140609.jar b/lib/jetty-proxy-9.2.1.v20140609.jar deleted file mode 100644 index 083c77aee..000000000 Binary files a/lib/jetty-proxy-9.2.1.v20140609.jar and /dev/null differ diff --git a/lib/jetty-proxy-9.2.2.v20140723.jar b/lib/jetty-proxy-9.2.2.v20140723.jar new file mode 100644 index 000000000..ac95f8d86 Binary files /dev/null and b/lib/jetty-proxy-9.2.2.v20140723.jar differ diff --git a/lib/jetty-security-9.2.1.v20140609.jar b/lib/jetty-security-9.2.2.v20140723.jar similarity index 61% rename from lib/jetty-security-9.2.1.v20140609.jar rename to lib/jetty-security-9.2.2.v20140723.jar index 4911fb04d..5facdfc23 100644 Binary files a/lib/jetty-security-9.2.1.v20140609.jar and b/lib/jetty-security-9.2.2.v20140723.jar differ diff --git a/lib/jetty-server-9.2.1.v20140609.jar b/lib/jetty-server-9.2.1.v20140609.jar deleted file mode 100644 index 9c1b16f4d..000000000 Binary files a/lib/jetty-server-9.2.1.v20140609.jar and /dev/null differ diff --git a/lib/jetty-server-9.2.2.v20140723.jar b/lib/jetty-server-9.2.2.v20140723.jar new file mode 100644 index 000000000..655a7a9ce Binary files /dev/null and b/lib/jetty-server-9.2.2.v20140723.jar differ diff --git a/lib/jetty-servlet-9.2.1.v20140609.jar b/lib/jetty-servlet-9.2.1.v20140609.jar deleted file mode 100644 index a7a84b51c..000000000 Binary files a/lib/jetty-servlet-9.2.1.v20140609.jar and /dev/null differ diff --git a/lib/jetty-servlet-9.2.2.v20140723.jar b/lib/jetty-servlet-9.2.2.v20140723.jar new file mode 100644 index 000000000..329612f41 Binary files /dev/null and b/lib/jetty-servlet-9.2.2.v20140723.jar differ diff --git a/lib/jetty-servlets-9.2.1.v20140609.jar b/lib/jetty-servlets-9.2.1.v20140609.jar deleted file mode 100644 index 75a6809a9..000000000 Binary files a/lib/jetty-servlets-9.2.1.v20140609.jar and /dev/null differ diff --git a/lib/jetty-servlets-9.2.2.v20140723.jar b/lib/jetty-servlets-9.2.2.v20140723.jar new file mode 100644 index 000000000..3fc141422 Binary files /dev/null and b/lib/jetty-servlets-9.2.2.v20140723.jar differ diff --git a/lib/jetty-util-9.2.1.v20140609.jar b/lib/jetty-util-9.2.2.v20140723.jar similarity index 50% rename from lib/jetty-util-9.2.1.v20140609.jar rename to lib/jetty-util-9.2.2.v20140723.jar index 49c0639b2..fca415d71 100644 Binary files a/lib/jetty-util-9.2.1.v20140609.jar and b/lib/jetty-util-9.2.2.v20140723.jar differ diff --git a/lib/jetty-webapp-9.2.1.v20140609.jar b/lib/jetty-webapp-9.2.2.v20140723.jar similarity index 70% rename from lib/jetty-webapp-9.2.1.v20140609.jar rename to lib/jetty-webapp-9.2.2.v20140723.jar index 67882f029..287f4141a 100644 Binary files a/lib/jetty-webapp-9.2.1.v20140609.jar and b/lib/jetty-webapp-9.2.2.v20140723.jar differ diff --git a/lib/jetty-xml-9.2.1.v20140609.jar b/lib/jetty-xml-9.2.2.v20140723.jar similarity index 84% rename from lib/jetty-xml-9.2.1.v20140609.jar rename to lib/jetty-xml-9.2.2.v20140723.jar index ea01b89a1..c5824c580 100644 Binary files a/lib/jetty-xml-9.2.1.v20140609.jar and b/lib/jetty-xml-9.2.2.v20140723.jar differ diff --git a/pom.xml b/pom.xml index debe77e83..545bce1fe 100644 --- a/pom.xml +++ b/pom.xml @@ -533,68 +533,68 @@ org.eclipse.jetty jetty-server - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-servlet - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-servlets - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-webapp - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-util - 9.2.1.v20140609 + 9.2.2.v20140723 jar org.eclipse.jetty jetty-xml - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-http - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-security - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-io - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-continuation - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-jmx - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-proxy - 9.2.1.v20140609 + 9.2.2.v20140723 org.eclipse.jetty jetty-deploy - 9.2.1.v20140609 + 9.2.2.v20140723 org.bitlet