update to guava.18.0.jar and jsch.0.1.51.jar

9 files changed, 9 insertions, 9 deletions

diff --git a/.classpath b/.classpath
index c4e7a3f79..942ab82dc 100644
--- a/.classpath
+++ b/.classpath
@@ -16,7 +16,7 @@
 	<classpathentry kind="lib" path="lib/J7Zip-modified.jar"/>

 	<classpathentry kind="lib" path="lib/webcat-0.1-swf.jar"/>

 	<classpathentry kind="lib" path="lib/commons-jxpath-1.3.jar"/>

-	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>

+	<classpathentry kind="lib" path="lib/jsch-0.1.51.jar"/>

 	<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>

 	<classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/>

 	<classpathentry kind="lib" path="lib/commons-fileupload-1.2.2.jar"/>

@@ -38,7 +38,7 @@
 	<classpathentry kind="lib" path="lib/noggit-0.5.jar"/>

 	<classpathentry kind="lib" path="lib/metadata-extractor-2.6.2.jar"/>

 	<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>

-	<classpathentry kind="lib" path="lib/guava-16.0.1.jar"/>

+	<classpathentry kind="lib" path="lib/guava-18.0.jar"/>

 	<classpathentry kind="lib" path="lib/spatial4j-0.4.1.jar"/>

 	<classpathentry kind="lib" path="lib/zookeeper-3.4.6.jar"/>

 	<classpathentry kind="lib" path="lib/org.restlet.jar"/>

diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
index a329d7597..1da835983 100644
--- a/addon/YaCy.app/Contents/Info.plist
+++ b/addon/YaCy.app/Contents/Info.plist
@@ -49,7 +49,7 @@
 			<string>$JAVAROOT/lib/commons-logging-1.1.3.jar</string>
 			<string>$JAVAROOT/lib/fontbox-1.8.7.jar</string>
 			<string>$JAVAROOT/lib/geronimo-stax-api_1.0_spec-1.0.1.jar</string>
-			<string>$JAVAROOT/lib/guava-16.0.1.jar</string>
+			<string>$JAVAROOT/lib/guava-18.0.jar</string>
 			<string>$JAVAROOT/lib/htmllexer.jar</string>
 			<string>$JAVAROOT/lib/httpclient-4.3.6.jar</string>
 			<string>$JAVAROOT/lib/httpcore-4.3.3.jar</string>
@@ -76,7 +76,7 @@
 			<string>$JAVAROOT/lib/jetty-util-9.2.4.v20141103.jar</string>
 			<string>$JAVAROOT/lib/jetty-webapp-9.2.4.v20141103.jar</string>
 			<string>$JAVAROOT/lib/jetty-xml-9.2.4.v20141103.jar</string>			                      
-			<string>$JAVAROOT/lib/jsch-0.1.50.jar</string>
+			<string>$JAVAROOT/lib/jsch-0.1.51.jar</string>
 			<string>$JAVAROOT/lib/json-simple-1.1.1.jar</string>
 			<string>$JAVAROOT/lib/jsoup-1.8.1.jar</string>
 			<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
diff --git a/build.xml b/build.xml
index 6c3689b50..76f983c3d 100644
--- a/build.xml
+++ b/build.xml
@@ -173,7 +173,7 @@
     	<pathelement location="${lib}/commons-logging-1.1.3.jar" />
     	<pathelement location="${lib}/fontbox-1.8.7.jar" />
         <pathelement location="${lib}/geronimo-stax-api_1.0_spec-1.0.1.jar" />
-        <pathelement location="${lib}/guava-16.0.1.jar" />
+        <pathelement location="${lib}/guava-18.0.jar" />
         <pathelement location="${lib}/htmllexer.jar" />
         <pathelement location="${lib}/httpclient-4.3.6.jar" />
         <pathelement location="${lib}/httpcore-4.3.3.jar" />
@@ -200,7 +200,7 @@
         <pathelement location="${lib}/jetty-util-9.2.4.v20141103.jar" />
         <pathelement location="${lib}/jetty-webapp-9.2.4.v20141103.jar" />
         <pathelement location="${lib}/jetty-xml-9.2.4.v20141103.jar" />
-    	<pathelement location="${lib}/jsch-0.1.50.jar" />
+    	<pathelement location="${lib}/jsch-0.1.51.jar" />
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.8.1.jar" />
     	<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
diff --git a/lib/guava-16.0.1.jar b/lib/guava-18.0.jar
index 2c8127d16..8f89e4901 100644
--- a/lib/guava-16.0.1.jar
+++ b/lib/guava-18.0.jar
diff --git a/lib/jsch-0.1.50.jar b/lib/jsch-0.1.50.jar
deleted file mode 100644
index 85c044f21..000000000
--- a/lib/jsch-0.1.50.jar
+++ /dev/null
diff --git a/lib/jsch-0.1.50.License b/lib/jsch-0.1.51.License
index 2cf7a501a..2cf7a501a 100644
--- a/lib/jsch-0.1.50.License
+++ b/lib/jsch-0.1.51.License
diff --git a/lib/jsch-0.1.51.jar b/lib/jsch-0.1.51.jar
new file mode 100644
index 000000000..20d2c00e9
--- /dev/null
+++ b/lib/jsch-0.1.51.jar
diff --git a/nbproject/project.xml b/nbproject/project.xml
index bf527f199..fafb46d88 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -83,7 +83,7 @@
             <compilation-unit>

                 <package-root>source</package-root>

                 <package-root>htroot</package-root>

-                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.8.7.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-16.0.1.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.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.2.jar;lib/jempbox-1.8.7.jar;lib/jetty-client-9.2.4.v20141103.jar;lib/jetty-continuation-9.2.4.v20141103.jar;lib/jetty-deploy-9.2.4.v20141103.jar;lib/jetty-http-9.2.4.v20141103.jar;lib/jetty-io-9.2.4.v20141103.jar;lib/jetty-jmx-9.2.4.v20141103.jar;lib/jetty-proxy-9.2.4.v20141103.jar;lib/jetty-security-9.2.4.v20141103.jar;lib/jetty-server-9.2.4.v20141103.jar;lib/jetty-servlet-9.2.4.v20141103.jar;lib/jetty-servlets-9.2.4.v20141103.jar;lib/jetty-util-9.2.4.v20141103.jar;lib/jetty-webapp-9.2.4.v20141103.jar;lib/jetty-xml-9.2.4.v20141103.jar;lib/jsch-0.1.50.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.6.2.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.7.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.6.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.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/zookeeper-3.4.6.jar</classpath>

+                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.8.7.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.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.2.jar;lib/jempbox-1.8.7.jar;lib/jetty-client-9.2.4.v20141103.jar;lib/jetty-continuation-9.2.4.v20141103.jar;lib/jetty-deploy-9.2.4.v20141103.jar;lib/jetty-http-9.2.4.v20141103.jar;lib/jetty-io-9.2.4.v20141103.jar;lib/jetty-jmx-9.2.4.v20141103.jar;lib/jetty-proxy-9.2.4.v20141103.jar;lib/jetty-security-9.2.4.v20141103.jar;lib/jetty-server-9.2.4.v20141103.jar;lib/jetty-servlet-9.2.4.v20141103.jar;lib/jetty-servlets-9.2.4.v20141103.jar;lib/jetty-util-9.2.4.v20141103.jar;lib/jetty-webapp-9.2.4.v20141103.jar;lib/jetty-xml-9.2.4.v20141103.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.2.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.6.2.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.7.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.6.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.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/zookeeper-3.4.6.jar</classpath>

                 <built-to>lib/yacycore.jar</built-to>

                 <source-level>1.7</source-level>

             </compilation-unit>

diff --git a/pom.xml b/pom.xml
index 1bbf5776c..87cec157a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -348,7 +348,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>16.0.1</version>
+            <version>18.0</version>
         </dependency>
         <dependency>
             <groupId>org.htmlparser</groupId>
@@ -398,7 +398,7 @@
         <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
-            <version>0.1.50</version>
+            <version>0.1.51</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>