From 93825228731ae38e515aac2660d9b1aa97a6fdf1 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Thu, 16 May 2019 13:02:08 -0700
Subject: [PATCH 1/4] Declare test dependency for protobuf. Stop version
 bumping http/oauth client at release

---
 google-api-client-protobuf/pom.xml |  7 ++++++-
 pom.xml                            | 12 +++++++++---
 versions.txt                       |  3 ---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
index 370bd672c..4e9834bb9 100644
--- a/google-api-client-protobuf/pom.xml
+++ b/google-api-client-protobuf/pom.xml
@@ -58,7 +58,7 @@
         </executions>
         <configuration>
           <instructions>
-            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
             <Bundle-Description>Protobuf extensions to the Google APIs Client Library for Java</Bundle-Description>
             <Bundle-SymbolicName>com.google.api.client.protobuf</Bundle-SymbolicName>
           </instructions>
@@ -107,5 +107,10 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index f6242d92c..08fc86dd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,6 +280,13 @@
         <artifactId>google-play-services</artifactId>
         <version>1</version>
       </dependency>
+
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${project.protobuf-java.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -554,9 +561,8 @@
       - Internally, update the default features.json file
     -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.http.version>1.28.0</project.http.version><!-- {x-version-update:google-http-client:released} -->
-    <project.http-apache.version>2.0.0</project.http-apache.version><!-- {x-version-update:google-http-client-apache:released} -->
-    <project.oauth.version>1.28.0</project.oauth.version><!-- {x-version-update:google-oauth-client:released} -->
+    <project.http.version>1.29.1</project.http.version>
+    <project.oauth.version>1.29.0</project.oauth.version>
     <project.jsr305.version>3.0.2</project.jsr305.version>
     <project.gson.version>2.1</project.gson.version>
     <project.jackson-core-asl.version>1.9.13</project.jackson-core-asl.version>
diff --git a/versions.txt b/versions.txt
index 8b3832b3f..556fb5aa2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -2,6 +2,3 @@
 # module:released-version:current-version
 
 google-api-client:1.28.0:1.28.1-SNAPSHOT
-google-http-client:1.28.0:1.28.1-SNAPSHOT
-google-http-client-apache:2.0.0:2.0.1-SNAPSHOT
-google-oauth-client:1.28.0:1.28.1-SNAPSHOT

From 49eba1a80a5cd460ea77cd4df79a79089fdc0cb0 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Fri, 17 May 2019 10:40:27 -0700
Subject: [PATCH 2/4] Fix dependencies

---
 google-api-client/pom.xml | 4 ----
 pom.xml                   | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index ed8bed950..f1e9c1ee3 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -104,10 +104,6 @@
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson2</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-apache</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-gson</artifactId>
diff --git a/pom.xml b/pom.xml
index 08fc86dd2..ef980e586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,11 +162,6 @@
         <artifactId>google-http-client-android</artifactId>
         <version>${project.http.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-apache</artifactId>
-        <version>${project.http-apache.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-appengine</artifactId>

From dc9a1db6efdc52c8ac5dbe0e0de6d5ac2f5e8c30 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Fri, 17 May 2019 10:49:07 -0700
Subject: [PATCH 3/4] Fix version in OSGI metadata

---
 google-api-client-appengine/pom.xml | 2 +-
 google-api-client-gson/pom.xml      | 2 +-
 google-api-client-jackson2/pom.xml  | 2 +-
 google-api-client-java6/pom.xml     | 2 +-
 google-api-client-servlet/pom.xml   | 2 +-
 google-api-client-xml/pom.xml       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml
index a56ba05b3..677da73d9 100644
--- a/google-api-client-appengine/pom.xml
+++ b/google-api-client-appengine/pom.xml
@@ -53,7 +53,7 @@
         </executions>
         <configuration>
           <instructions>
-            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
             <Bundle-Description>App Engine extensions to the Google APIs Client Library for Java</Bundle-Description>
             <Bundle-SymbolicName>com.google.api.client.appengine</Bundle-SymbolicName>
           </instructions>
diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml
index 227217ef4..8f0c012a0 100644
--- a/google-api-client-gson/pom.xml
+++ b/google-api-client-gson/pom.xml
@@ -51,7 +51,7 @@
         </executions>
         <configuration>
           <instructions>
-            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
             <Bundle-Description>GSON extensions to the Google APIs Client Library for Java</Bundle-Description>
             <Bundle-SymbolicName>com.google.api.client.googleapis.notifications.json.gson</Bundle-SymbolicName>
           </instructions>
diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
index b69a79bc3..04e55cc21 100644
--- a/google-api-client-jackson2/pom.xml
+++ b/google-api-client-jackson2/pom.xml
@@ -51,7 +51,7 @@
         </executions>
         <configuration>
           <instructions>
-            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
             <Bundle-Description>Low-level implementation of the JSON parser library based on the Jackson 2 JSON library.</Bundle-Description>
             <Bundle-SymbolicName>com.google.api.client.jackson2</Bundle-SymbolicName>
           </instructions>
diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml
index f5bca159e..ed4884d23 100644
--- a/google-api-client-java6/pom.xml
+++ b/google-api-client-java6/pom.xml
@@ -51,7 +51,7 @@
         </executions>
         <configuration>
           <instructions>
-            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
             <Bundle-Description>Java 6 extensions to the Google APIs Client Library for Java</Bundle-Description>
             <Bundle-SymbolicName>com.google.api.client.java6</Bundle-SymbolicName>
           </instructions>
diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml
index 4f1d96dcc..068be4c20 100644
--- a/google-api-client-servlet/pom.xml
+++ b/google-api-client-servlet/pom.xml
@@ -52,7 +52,7 @@
         </executions>
         <configuration>
           <instructions>
-            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
             <Bundle-Description>Servlet extensions to the Google APIs Client Library for Java</Bundle-Description>
             <Bundle-SymbolicName>com.google.api.client.servlet</Bundle-SymbolicName>
           </instructions>
diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml
index da5bbdfe5..dc3d905f3 100644
--- a/google-api-client-xml/pom.xml
+++ b/google-api-client-xml/pom.xml
@@ -51,7 +51,7 @@
         </executions>
         <configuration>
           <instructions>
-            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
             <Bundle-Description>XML extensions to the Google APIs Client Library for Java</Bundle-Description>
             <Bundle-SymbolicName>com.google.api.client.xml</Bundle-SymbolicName>
           </instructions>

From 4e4d36379de906b51140301bbf11715bc004f68e Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Fri, 17 May 2019 10:54:16 -0700
Subject: [PATCH 4/4] google-api-client-protobuf needs protobuf-java at compile
 time

---
 google-api-client-protobuf/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
index 4e9834bb9..4ca65ed01 100644
--- a/google-api-client-protobuf/pom.xml
+++ b/google-api-client-protobuf/pom.xml
@@ -110,7 +110,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <scope>test</scope>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 </project>