Revert "[fix] Add google cloud storage and related libs."

This reverts commit f4be51bdae187f5d0e6608923e4a263c30f34778.

Reason for revert: incompatible guava

Change-Id: I77c8f5a2957458d0d79bb3b67d9ba50a3ae25a50

2 files changed, 29 insertions, 22 deletions

diff --git a/common/google-api-java-client/1.23.0/HOWTO.txt b/common/google-api-java-client/1.23.0/HOWTO.txt
index c5b226b5a..b2959f174 100644
--- a/common/google-api-java-client/1.23.0/HOWTO.txt
+++ b/common/google-api-java-client/1.23.0/HOWTO.txt
@@ -2,9 +2,10 @@ How to recreate this JAR
 
 =========================================================
 
-Download the latest jar files from http://central.maven.org/maven2/
+Download the latest google-api-java-client library from 
+https://developers.google.com/api-client-library/java/google-api-java-client/download
 
-Download jarjar from
+Download jarjar from 
 https://code.google.com/p/jarjar/
 
 Install Apache Ant (if not already installed)
@@ -26,37 +27,45 @@ Extract and place the .jar files from the client lib you want in base/jars
 for 1.23.0 we
 
 INCLUDED
-+ api-common-1.5.0.jar
 + commons-logging-1.1.1.jar
-+ gax-1.20.0.jar
-+ gax-httpjson-0.37.0.jar
 + google-api-client-1.23.0.jar
 + google-api-client-jackson2-1.23.0.jar
 + google-api-client-java6-1.23.0.jar
-+ google-api-services-storage-v1-rev114-1.23.0.jar
-+ google-auth-library-credentials-0.9.0.jar
-+ google-auth-library-oauth2-http-0.9.0.jar
-+ google-cloud-core-1.23.0.jar
-+ google-cloud-core-http-1.23.0.jar
-+ google-cloud-storage-1.23.0.jar
 + google-http-client-1.23.0.jar
-+ google-http-client-appengine-1.23.0.jar
-+ google-http-client-jackson-1.23.0.jar
 + google-http-client-jackson2-1.23.0.jar
 + google-oauth-client-1.23.0.jar
 + google-oauth-client-java6-1.23.0.jar
 + google-oauth-client-jetty-1.23.0.jar
-+ guava-20.0.jar
 + httpclient-4.0.1.jar
 + httpcore-4.0.1.jar
 + jackson-core-2.1.3.jar
-+ jackson-core-asl-1.9.11.jar
 + jetty-6.1.26.jar
 + jetty-util-6.1.26.jar
 + jsr305-1.3.9.jar
-+ opencensus-api-0.11.1.jar
-+ opencensus-contrib-http-util-0.11.1.jar
-+ threetenbp-1.3.3.jar
+
+and EXCLUDED
+- google-api-client-android-1.23.0.jar
+- google-api-client-appengine-1.23.0.jar
+- google-api-client-gson-1.23.0.jar
+- google-api-client-protobuf-1.23.0.jar
+- google-api-client-servlet-1.23.0.jar
+- google-api-client-xml-1.23.0.jar
+- google-http-client-android-1.23.0.jar
+- google-http-client-appengine-1.23.0.jar
+- google-http-client-gson-1.23.0.jar
+- google-http-client-jackson-1.23.0.jar
+- google-http-client-jdo-1.23.0.jar
+- google-http-client-protobuf-1.23.0.jar
+- google-http-client-xml-1.23.0.jar
+- google-oauth-client-appengine-1.23.0.jar
+- google-oauth-client-servlet-1.23.0.jar
+- guava-jdk5-17.0.jar
+- gson-2.1.jar
+- jackson-core-asl-1.9.11.jar
+- jdo2-api-2.3-eb.jar
+- protobuf-java-2.6.1.jar
+- transaction-api-1.1.jar
+- xpp3-1.1.4c.jar
 
 =========================================================
 
@@ -65,12 +74,10 @@ create a build.xml
 <project name="gapiRepackage">
     <target name="jar">
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/jarjar-1.4.jar"/>
-        <jarjar jarfile="dist/google-api-java-client-min-repackaged-1.23.0.jar">
+        <jarjar jarfile="dist/google-api-java-client-min-repackaged-1.20.0.jar">
             <zipgroupfileset dir="jars" includes="*.jar"/>
             <rule pattern="org.apache.**" result="com.google.api.client.repackaged.@0"/>
             <rule pattern="com.google.gson.**" result="com.google.api.client.repackaged.@0"/>
-            <rule pattern="com.google.common.**" result="com.google.api.client.repackaged.@0"/>
-            <rule pattern="com.google.thirdparty.publicsuffix.**" result="com.google.api.client.repackaged.@0"/>
             <rule pattern="com.google.protobuf.**" result="com.google.api.client.repackaged.@0"/>
             <rule pattern="com.fasterxml.**" result="com.google.api.client.repackaged.@0"/>
             <rule pattern="org.codehaus.**" result="com.google.api.client.repackaged.@0"/>
@@ -85,4 +92,4 @@ create a build.xml
 =========================================================
 
 run "ant jar" to create a combined, reduced, repackaged jar.
-it will be found as base/dist/google-api-java-client-min-repackaged-1.23.0.jar
+it will be found as base/dist/google-api-java-client-min-repackaged-1.20.0.jar
diff --git a/common/google-api-java-client/1.23.0/google-api-java-client-min-repackaged-1.23.0.jar b/common/google-api-java-client/1.23.0/google-api-java-client-min-repackaged-1.23.0.jar
index 3159f77ae..9ea1c7bea 100644
--- a/common/google-api-java-client/1.23.0/google-api-java-client-min-repackaged-1.23.0.jar
+++ b/common/google-api-java-client/1.23.0/google-api-java-client-min-repackaged-1.23.0.jar