From a595f6a0db96e2c9d146a594021ba4d7eda43aff Mon Sep 17 00:00:00 2001
From: Marco Ziccardi <marco.ziccard@gmail.com>
Date: Thu, 10 Mar 2016 16:36:26 +0100
Subject: [PATCH 1/3] Use groups to separate packages in javadoc's index

---
 .../java/com/google/gcloud/package-info.java  | 20 +++++++++++++++++++
 pom.xml                                       | 14 +++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 gcloud-java-core/src/main/java/com/google/gcloud/package-info.java

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java b/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java
new file mode 100644
index 000000000000..215264675dc2
--- /dev/null
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Core classes for the {@code gcloud-java} library.
+ */
+package com.google.gcloud;
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b9d979c4d467..b6e8d3470edb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,6 +389,20 @@
                 <show>protected</show>
                 <nohelp>true</nohelp>
                 <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+                <groups>
+                  <group>
+                    <title>Main packages</title>
+                    <packages>com.google.gcloud*</packages>
+                  </group>
+                  <group>
+                    <title>SPI packages</title>
+                    <packages>com.google.gcloud.spi</packages>
+                  </group>
+                  <group>
+                    <title>Example packages</title>
+                    <packages>com.google.gcloud.examples*</packages>
+                  </group>
+                </groups>
               </configuration>
             </plugin>
             <plugin>

From 90d0917dde9acea5e85781b45b9d8bf210b90645 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi <marco.ziccard@gmail.com>
Date: Thu, 10 Mar 2016 18:50:34 +0100
Subject: [PATCH 2/3] Add group for testing packages

---
 .../src/main/java/com/google/gcloud/package-info.java         | 2 +-
 pom.xml                                                       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java b/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java
index 215264675dc2..d527640c99f9 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Core classes for the {@code gcloud-java} library.
  */
-package com.google.gcloud;
\ No newline at end of file
+package com.google.gcloud;
diff --git a/pom.xml b/pom.xml
index b6e8d3470edb..c0a0e9bfcffe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,6 +394,10 @@
                     <title>Main packages</title>
                     <packages>com.google.gcloud*</packages>
                   </group>
+                  <group>
+                    <title>Test helpers packages</title>
+                    <packages>com.google.gcloud.bigquery.testing:com.google.gcloud.datastore.testing:com.google.gcloud.resourcemanager.testing:com.google.gcloud.storage.testing</packages>
+                  </group>
                   <group>
                     <title>SPI packages</title>
                     <packages>com.google.gcloud.spi</packages>

From 24a712ae2972b428987b8d1d6b74b7968e35dfc8 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi <marco.ziccard@gmail.com>
Date: Thu, 10 Mar 2016 20:14:00 +0100
Subject: [PATCH 3/3] Rename Main packages to API packages, reorder groups, add
 service's SPIs

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index c0a0e9bfcffe..b7766ac0e5c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,21 +391,21 @@
                 <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
                 <groups>
                   <group>
-                    <title>Main packages</title>
+                    <title>API packages</title>
                     <packages>com.google.gcloud*</packages>
                   </group>
                   <group>
                     <title>Test helpers packages</title>
                     <packages>com.google.gcloud.bigquery.testing:com.google.gcloud.datastore.testing:com.google.gcloud.resourcemanager.testing:com.google.gcloud.storage.testing</packages>
                   </group>
-                  <group>
-                    <title>SPI packages</title>
-                    <packages>com.google.gcloud.spi</packages>
-                  </group>
                   <group>
                     <title>Example packages</title>
                     <packages>com.google.gcloud.examples*</packages>
                   </group>
+                  <group>
+                    <title>SPI packages</title>
+                    <packages>com.google.gcloud.spi:com.google.gcloud.bigquery.spi:com.google.gcloud.datastore.spi:com.google.gcloud.resourcemanager.spi:com.google.gcloud.storage.spi</packages>
+                  </group>
                 </groups>
               </configuration>
             </plugin>