From 770f1a21726d992b197265fc5b317aa40c30690b Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 6 Nov 2018 15:07:21 -0800
Subject: [PATCH 1/2] Add google-api-client-bom artifact

---
 google-api-client-bom/README.md |  28 +++++++++
 google-api-client-bom/pom.xml   | 103 ++++++++++++++++++++++++++++++++
 pom.xml                         |   1 +
 3 files changed, 132 insertions(+)
 create mode 100644 google-api-client-bom/README.md
 create mode 100644 google-api-client-bom/pom.xml

diff --git a/google-api-client-bom/README.md b/google-api-client-bom/README.md
new file mode 100644
index 000000000..bd7dd87c5
--- /dev/null
+++ b/google-api-client-bom/README.md
@@ -0,0 +1,28 @@
+# Google API Client Library Bill of Materials
+
+The `google-api-client-bom` modules is a pom that can be used to import consistent 
+versions of `google-api-client` components plus its dependencies.
+
+To use it in Maven, add the following to your `pom.xml`:
+
+[//]: # ({x-version-update-start:google-api-client-bom:released})
+```xml
+<dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.api-client</groupId>
+      <artifactId>google-api-client-bom</artifactId>
+      <version>1.26.0</version>
+      <type>pom</type>
+      <scope>import</scope>
+    </dependency>
+  </dependencies>
+</dependencyManagement>
+```
+[//]: # ({x-version-update-end})
+
+## License
+
+Apache 2.0 - See [LICENSE] for more information.
+
+[LICENSE]: https://github.com/googleapis/google-api-java-client/blob/master/LICENSE
diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml
new file mode 100644
index 000000000..9d35b26f1
--- /dev/null
+++ b/google-api-client-bom/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.api-client</groupId>
+  <artifactId>google-api-client-bom</artifactId>
+  <version>1.26.1-SNAPSHOT</version><!-- {x-version-update:google-api-client-bom:current} -->
+  <packaging>pom</packaging>
+
+  <name>Google API Client Library for Java BOM</name>
+  <url>https://github.com/googleapis/google-api-java-client/tree/master/google-api-client-bom</url>
+  <description>
+    BOM for Google API Client Library for Java
+  </description>
+
+  <organization>
+    <name>Google LLC</name>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/googleapis/google-api-java-client.git</connection>
+    <developerConnection>scm:git:git@github.com:googleapis/google-api-java-client.git</developerConnection>
+    <url>https://github.com/googleapis/google-api-java-client</url>
+  </scm>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>sonatype-nexus-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+    <repository>
+      <id>sonatype-nexus-staging</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+    <site>
+      <id>github-pages-site</id>
+      <name>Deployment through GitHub's site deployment plugin</name>
+      <url>site/google-cloud-bom</url>
+    </site>
+  </distributionManagement>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client</artifactId>
+        <version>1.26.1-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.26.1-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.26.1-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.26.1-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.26.1-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.26.1-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.26.1-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.26.1-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.26.1-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.26.1-SNAPSHOT</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>
diff --git a/pom.xml b/pom.xml
index 39bedcde2..5c5877839 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,7 @@
     <module>google-api-client-android</module>
     <module>google-api-client-appengine</module>
     <module>google-api-client-assembly</module>
+    <module>google-api-client-bom</module>
     <module>google-api-client-gson</module>
     <module>google-api-client-jackson2</module>
     <module>google-api-client-java6</module>

From 47c51549cc3b5e2890908ebcb5c62ec733f1ed7d Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 6 Nov 2018 17:30:04 -0800
Subject: [PATCH 2/2] Apply README.md suggestions

---
 google-api-client-bom/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-api-client-bom/README.md b/google-api-client-bom/README.md
index bd7dd87c5..85e08c69d 100644
--- a/google-api-client-bom/README.md
+++ b/google-api-client-bom/README.md
@@ -1,7 +1,7 @@
 # Google API Client Library Bill of Materials
 
-The `google-api-client-bom` modules is a pom that can be used to import consistent 
-versions of `google-api-client` components plus its dependencies.
+The `google-api-client-bom` module is a pom that can be used to import consistent 
+versions of `google-api-client` components.
 
 To use it in Maven, add the following to your `pom.xml`: