From 1bbe4fe3c0f0dbfd376ff1d340eac9a24a81850d Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Fri, 6 Dec 2019 14:32:30 -0500
Subject: [PATCH 1/6] remove no longer supported option (#1444)

---
 google-api-client-protobuf/src/test/proto/simple_proto.proto | 1 -
 google-api-client/src/test/proto/error_output.proto          | 1 -
 google-api-client/src/test/proto/mock_data.proto             | 1 -
 3 files changed, 3 deletions(-)

diff --git a/google-api-client-protobuf/src/test/proto/simple_proto.proto b/google-api-client-protobuf/src/test/proto/simple_proto.proto
index e98120fdd..5983832d7 100644
--- a/google-api-client-protobuf/src/test/proto/simple_proto.proto
+++ b/google-api-client-protobuf/src/test/proto/simple_proto.proto
@@ -13,7 +13,6 @@
  */
  
 syntax = "proto2";
-option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.api.client.googleapis.services.protobuf";
 
 message TestMessage {
diff --git a/google-api-client/src/test/proto/error_output.proto b/google-api-client/src/test/proto/error_output.proto
index 7bd21393c..5a1de90fd 100644
--- a/google-api-client/src/test/proto/error_output.proto
+++ b/google-api-client/src/test/proto/error_output.proto
@@ -2,7 +2,6 @@
 
 syntax = "proto2";
 package api.client.googleapis.batch;
-option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.api.client.googleapis.batch";
 
 // These messages are the protobuf version of the
diff --git a/google-api-client/src/test/proto/mock_data.proto b/google-api-client/src/test/proto/mock_data.proto
index 0b2b717f0..40b3fb472 100644
--- a/google-api-client/src/test/proto/mock_data.proto
+++ b/google-api-client/src/test/proto/mock_data.proto
@@ -1,6 +1,5 @@
 syntax = "proto2";
 package api.client.googleapis.batch;
-option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.api.client.googleapis.batch";
 
 message Class1 {

From 40d9befa87ecc8767543c04baf31fe97ab4b29f0 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Fri, 6 Dec 2019 20:03:35 -0500
Subject: [PATCH 2/6] update apache http client (#1446)

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b74f4d760..47f74e77c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -486,13 +486,13 @@
     <project.http.version>1.32.1</project.http.version>
     <project.oauth.version>1.30.4</project.oauth.version>
     <project.jsr305.version>3.0.2</project.jsr305.version>
-    <project.gson.version>2.8.5</project.gson.version>
+    <project.gson.version>2.8.6</project.gson.version>
     <project.protobuf-java.version>3.11.1</project.protobuf-java.version>
     <project.guava.version>28.1-android</project.guava.version>
     <project.appengine.version>1.9.77</project.appengine.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>
-    <project.httpclient.version>4.5.9</project.httpclient.version>
-    <project.httpcore.version>4.4.11</project.httpcore.version>
+    <project.httpclient.version>4.5.10</project.httpclient.version>
+    <project.httpcore.version>4.4.12</project.httpcore.version>
     <project.jdo2-api.version>2.3-eb</project.jdo2-api.version>
     <project.datanucleus-core.version>3.2.2</project.datanucleus-core.version>
     <project.datanucleus-api-jdo.version>3.2.1</project.datanucleus-api-jdo.version>

From e834fe869ff268c9ff3b68a06424b860949c6df8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2019 08:49:24 -0800
Subject: [PATCH 3/6] chore: release 1.30.7-SNAPSHOT (#1443)

* updated versions.txt [ci skip]

* updated google-api-client-android/pom.xml [ci skip]

* updated google-api-client-appengine/pom.xml [ci skip]

* updated google-api-client-assembly/pom.xml [ci skip]

* updated google-api-client-bom/pom.xml [ci skip]

* updated google-api-client-gson/pom.xml [ci skip]

* updated google-api-client-jackson2/pom.xml [ci skip]

* updated google-api-client-java6/pom.xml [ci skip]

* updated google-api-client-protobuf/pom.xml [ci skip]

* updated google-api-client-servlet/pom.xml [ci skip]

* updated google-api-client-xml/pom.xml [ci skip]

* updated google-api-client/pom.xml [ci skip]

* updated pom.xml [ci skip]
---
 google-api-client-android/pom.xml   |  2 +-
 google-api-client-appengine/pom.xml |  2 +-
 google-api-client-assembly/pom.xml  |  2 +-
 google-api-client-bom/pom.xml       | 22 +++++++++++-----------
 google-api-client-gson/pom.xml      |  2 +-
 google-api-client-jackson2/pom.xml  |  2 +-
 google-api-client-java6/pom.xml     |  2 +-
 google-api-client-protobuf/pom.xml  |  2 +-
 google-api-client-servlet/pom.xml   |  2 +-
 google-api-client-xml/pom.xml       |  2 +-
 google-api-client/pom.xml           |  2 +-
 pom.xml                             |  2 +-
 versions.txt                        |  2 +-
 13 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml
index 7e2e778c0..b57954f93 100644
--- a/google-api-client-android/pom.xml
+++ b/google-api-client-android/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-android</artifactId>
diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml
index 67c83b954..46f4eb0d1 100644
--- a/google-api-client-appengine/pom.xml
+++ b/google-api-client-appengine/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-appengine</artifactId>
diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml
index b7d5db97f..fbcecd5ec 100644
--- a/google-api-client-assembly/pom.xml
+++ b/google-api-client-assembly/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.google.api-client</groupId>
diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml
index a948e419f..777128332 100644
--- a/google-api-client-bom/pom.xml
+++ b/google-api-client-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api-client</groupId>
   <artifactId>google-api-client-bom</artifactId>
-  <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+  <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
   <packaging>pom</packaging>
 
   <name>Google API Client Library for Java BOM</name>
@@ -63,52 +63,52 @@
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-android</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-appengine</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-assembly</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-gson</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-jackson2</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-java6</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-protobuf</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-servlet</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-xml</artifactId>
-        <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml
index 74dfd30a5..23dea7fae 100644
--- a/google-api-client-gson/pom.xml
+++ b/google-api-client-gson/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-gson</artifactId>
diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
index 85d7b12dd..b2252bade 100644
--- a/google-api-client-jackson2/pom.xml
+++ b/google-api-client-jackson2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-jackson2</artifactId>
diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml
index 4dc93c32d..d09a5b003 100644
--- a/google-api-client-java6/pom.xml
+++ b/google-api-client-java6/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-java6</artifactId>
diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
index 64bbff8d2..3589513de 100644
--- a/google-api-client-protobuf/pom.xml
+++ b/google-api-client-protobuf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-protobuf</artifactId>
diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml
index 7cf042316..a009b6260 100644
--- a/google-api-client-servlet/pom.xml
+++ b/google-api-client-servlet/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-servlet</artifactId>
diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml
index 22dce0bbb..43f7516ca 100644
--- a/google-api-client-xml/pom.xml
+++ b/google-api-client-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-xml</artifactId>
diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index b9e8e4edc..cd71d9aeb 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client</artifactId>
diff --git a/pom.xml b/pom.xml
index 47f74e77c..e746d4b5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>com.google.api-client</groupId>
   <artifactId>google-api-client-parent</artifactId>
-  <version>1.30.6</version><!-- {x-version-update:google-api-client:current} -->
+  <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
   <packaging>pom</packaging>
   <name>Parent for the Google API Client Library for Java</name>
 
diff --git a/versions.txt b/versions.txt
index 19eebaf55..9c1158a84 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-google-api-client:1.30.6:1.30.6
+google-api-client:1.30.6:1.30.7-SNAPSHOT

From b32a7d95801e1e2e5617818a4f11853eca272c72 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 17 Dec 2019 22:38:11 +0200
Subject: [PATCH 4/6] deps: update dependency
 com.google.oauth-client:google-oauth-client-bom to v1.30.5 (#1453)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e746d4b5f..2c78c3144 100644
--- a/pom.xml
+++ b/pom.xml
@@ -484,7 +484,7 @@
     -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.http.version>1.32.1</project.http.version>
-    <project.oauth.version>1.30.4</project.oauth.version>
+    <project.oauth.version>1.30.5</project.oauth.version>
     <project.jsr305.version>3.0.2</project.jsr305.version>
     <project.gson.version>2.8.6</project.gson.version>
     <project.protobuf-java.version>3.11.1</project.protobuf-java.version>

From 744839f51a01301390297b4a5cb037547eefc4c0 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 17 Dec 2019 17:28:00 -0600
Subject: [PATCH 5/6] fix: update GoogleUtils#getVersion() to use stable logic
 (#1452)

* fix: update GoogleUtils#getVersion() to use stable logic

* fix: fix property name

* fix: handle case where property is not found
---
 .../api/client/googleapis/GoogleUtils.java    | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java
index 9bb2fc74c..b4eca557f 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java
@@ -89,22 +89,20 @@ public static synchronized KeyStore getCertificateTrustStore()
   }
 
   private static String getVersion() {
-    String version = GoogleUtils.class.getPackage().getImplementationVersion();
-    // in a non-packaged environment (local), there's no implementation version to read
-    if (version == null) {
-      // fall back to reading from a properties file - note this value is expected to be cached
-      try (InputStream inputStream =
-          GoogleUtils.class.getResourceAsStream("google-api-client.properties")) {
-        if (inputStream != null) {
-          Properties properties = new Properties();
-          properties.load(inputStream);
-          version = properties.getProperty("google-api-client.version");
-        }
-      } catch (IOException e) {
-        // ignore
+    // attempt to read the library's version from a properties file generated during the build
+    // this value should be read and cached for later use
+    String version = null;
+    try (InputStream inputStream =
+        GoogleUtils.class.getResourceAsStream("google-api-client.properties")) {
+      if (inputStream != null) {
+        Properties properties = new Properties();
+        properties.load(inputStream);
+        version = properties.getProperty("google-api-client.version");
       }
+    } catch (IOException e) {
+      // ignore
     }
-    return version;
+    return version == null ? "unknown-version" : version;
   }
 
   private GoogleUtils() {}

From 66889bdcc10a3037c8a6d646a66c5f31663f64aa Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2019 08:58:28 -0700
Subject: [PATCH 6/6] chore: release 1.30.7 (#1454)

---
 CHANGELOG.md                        | 12 ++++++++++++
 README.md                           |  4 ++--
 google-api-client-android/pom.xml   |  2 +-
 google-api-client-appengine/pom.xml |  2 +-
 google-api-client-assembly/pom.xml  |  2 +-
 google-api-client-bom/pom.xml       | 22 +++++++++++-----------
 google-api-client-gson/pom.xml      |  2 +-
 google-api-client-jackson2/pom.xml  |  2 +-
 google-api-client-java6/pom.xml     |  2 +-
 google-api-client-protobuf/pom.xml  |  2 +-
 google-api-client-servlet/pom.xml   |  2 +-
 google-api-client-xml/pom.xml       |  2 +-
 google-api-client/pom.xml           |  2 +-
 pom.xml                             |  2 +-
 versions.txt                        |  2 +-
 15 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d24220a1..727fabce6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### [1.30.7](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.6...v1.30.7) (2019-12-17)
+
+
+### Bug Fixes
+
+* update GoogleUtils#getVersion() to use stable logic ([#1452](https://www.github.com/googleapis/google-api-java-client/issues/1452)) ([744839f](https://www.github.com/googleapis/google-api-java-client/commit/744839f51a01301390297b4a5cb037547eefc4c0))
+
+
+### Dependencies
+
+* update dependency com.google.oauth-client:google-oauth-client-bom to v1.30.5 ([#1453](https://www.github.com/googleapis/google-api-java-client/issues/1453)) ([b32a7d9](https://www.github.com/googleapis/google-api-java-client/commit/b32a7d95801e1e2e5617818a4f11853eca272c72))
+
 ### [1.30.6](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.5...v1.30.6) (2019-12-03)
 
 
diff --git a/README.md b/README.md
index 6739b0507..50e6991b0 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ To use Maven, add the following lines to your pom.xml file:
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client</artifactId>
-        <version>1.30.6</version>
+        <version>1.30.7</version>
       </dependency>
     </dependencies>
   </project>
@@ -47,7 +47,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile 'com.google.api-client:google-api-client:1.30.6'
+    compile 'com.google.api-client:google-api-client:1.30.7'
 }
 ```
 [//]: # ({x-version-update-end})
diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml
index b57954f93..433ced561 100644
--- a/google-api-client-android/pom.xml
+++ b/google-api-client-android/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-android</artifactId>
diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml
index 46f4eb0d1..65ae615f6 100644
--- a/google-api-client-appengine/pom.xml
+++ b/google-api-client-appengine/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-appengine</artifactId>
diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml
index fbcecd5ec..c9cd1f41f 100644
--- a/google-api-client-assembly/pom.xml
+++ b/google-api-client-assembly/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.google.api-client</groupId>
diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml
index 777128332..5ccadfd0c 100644
--- a/google-api-client-bom/pom.xml
+++ b/google-api-client-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api-client</groupId>
   <artifactId>google-api-client-bom</artifactId>
-  <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+  <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
   <packaging>pom</packaging>
 
   <name>Google API Client Library for Java BOM</name>
@@ -63,52 +63,52 @@
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-android</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-appengine</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-assembly</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-gson</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-jackson2</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-java6</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-protobuf</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-servlet</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-xml</artifactId>
-        <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+        <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml
index 23dea7fae..22c6c0ab4 100644
--- a/google-api-client-gson/pom.xml
+++ b/google-api-client-gson/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-gson</artifactId>
diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
index b2252bade..65e718a42 100644
--- a/google-api-client-jackson2/pom.xml
+++ b/google-api-client-jackson2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-jackson2</artifactId>
diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml
index d09a5b003..3f42d0468 100644
--- a/google-api-client-java6/pom.xml
+++ b/google-api-client-java6/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-java6</artifactId>
diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
index 3589513de..f32b215b8 100644
--- a/google-api-client-protobuf/pom.xml
+++ b/google-api-client-protobuf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-protobuf</artifactId>
diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml
index a009b6260..f99a9b324 100644
--- a/google-api-client-servlet/pom.xml
+++ b/google-api-client-servlet/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-servlet</artifactId>
diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml
index 43f7516ca..bee91b204 100644
--- a/google-api-client-xml/pom.xml
+++ b/google-api-client-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-xml</artifactId>
diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index cd71d9aeb..003b182f4 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+    <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client</artifactId>
diff --git a/pom.xml b/pom.xml
index 2c78c3144..71a17c0a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>com.google.api-client</groupId>
   <artifactId>google-api-client-parent</artifactId>
-  <version>1.30.7-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+  <version>1.30.7</version><!-- {x-version-update:google-api-client:current} -->
   <packaging>pom</packaging>
   <name>Parent for the Google API Client Library for Java</name>
 
diff --git a/versions.txt b/versions.txt
index 9c1158a84..3d8820b31 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-google-api-client:1.30.6:1.30.7-SNAPSHOT
+google-api-client:1.30.7:1.30.7