From d382ab36efe98dc26dcd008e5b5da77cbd056679 Mon Sep 17 00:00:00 2001
From: Emily Ball <eaball35@gmail.com>
Date: Wed, 20 Jan 2021 17:03:10 -0800
Subject: [PATCH 1/3] feat: adding pom profile to generate docfx yml from
 javadoc

---
 .kokoro/release/common.cfg |  3 ++
 pom.xml                    | 63 +++++++++++++++++++++++---------------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg
index 5cf31b78..88437328 100644
--- a/.kokoro/release/common.cfg
+++ b/.kokoro/release/common.cfg
@@ -47,3 +47,6 @@ before_action {
     }
   }
 }
+
+# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-143274.jar
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-143274.jar"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fdcc82a5..fb1f6820 100644
--- a/pom.xml
+++ b/pom.xml
@@ -653,48 +653,61 @@
     </profile>
 
     <profile>
-      <!-- NOTE - this profile is still in progress and needs work -->
       <id>docFX</id>
       <activation>
         <property>
+          <!-- Activate with -P docFX -->
           <name>docFX</name>
         </property>
       </activation>
-      <build>
+      <reporting>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>3.2.0</version>
-            <executions>
-              <execution>
-                <phase>site</phase>
-                <goals>
-                  <goal>aggregate</goal>
-                </goals>
-              </execution>
-            </executions>
+            <reportSets>
+              <reportSet>
+                <id>docFX</id>
+                <reports>
+                  <report>javadoc</report>
+                  <report>aggregate</report>
+                  <report>aggregate-jar</report>
+                </reports>
+              </reportSet>
+            </reportSets>
             <configuration>
               <doclet>com.microsoft.doclet.DocFxDoclet</doclet>
-              <docletArtifact>
-                <groupId>com.microsoft</groupId>
-                <artifactId>docfx-doclet</artifactId>
-                <version>1.0-SNAPSHOT</version><!-- this is temporary - NO PRODUCTION USE -->
-              </docletArtifact>
-              <additionalDependencies>
-                <additionalDependency>
-                  <groupId>com.google.j2objc</groupId>
-                  <artifactId>j2objc-annotations</artifactId>
-                  <version>1.3</version>
-                </additionalDependency>
-              </additionalDependencies>
               <useStandardDocletOptions>false</useStandardDocletOptions>
-              <additionalOptions>-outputpath ${project.build.directory}/docfx/</additionalOptions>
-              <!-- Add additional options here when needed -->
+              <docletPath>${KOKORO_GFILE_DIR}/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-143274.jar</docletPath>
+              <additionalOptions>-outputpath ${project.build.directory}/docfx-yml</additionalOptions>
+              <doclint>none</doclint>
+              <show>protected</show>
+              <nohelp>true</nohelp>
+              <groups>
+                <group>
+                  <title>Test helpers packages</title>
+                  <packages>com.google.cloud.testing</packages>
+                </group>
+                <group>
+                  <title>SPI packages</title>
+                  <packages>com.google.cloud.spi*</packages>
+                </group>
+              </groups>
+              <links>
+                <link>https://googleapis.dev/java/api-common/</link>
+                <link>https://googleapis.dev/java/gax/</link>
+                <link>https://googleapis.dev/java/google-auth-library/</link>
+
+                <link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
+                <link>https://googleapis.github.io/common-protos-java/apidocs/</link>
+                <link>https://grpc.io/grpc-java/javadoc/</link>
+              </links>
             </configuration>
+
           </plugin>
         </plugins>
-      </build>
+      </reporting>
     </profile>
 
     <profile>

From 46284b76cd03e5e3d8f2bd4536eeb59cef6029cc Mon Sep 17 00:00:00 2001
From: Emily Ball <eaball35@gmail.com>
Date: Thu, 21 Jan 2021 11:39:00 -0800
Subject: [PATCH 2/3] fix: update pom path

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

diff --git a/pom.xml b/pom.xml
index fb1f6820..948c97d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -679,7 +679,7 @@
             <configuration>
               <doclet>com.microsoft.doclet.DocFxDoclet</doclet>
               <useStandardDocletOptions>false</useStandardDocletOptions>
-              <docletPath>${KOKORO_GFILE_DIR}/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-143274.jar</docletPath>
+              <docletPath>${env.KOKORO_GFILE_DIR}/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-143274.jar</docletPath>
               <additionalOptions>-outputpath ${project.build.directory}/docfx-yml</additionalOptions>
               <doclint>none</doclint>
               <show>protected</show>

From c575d9cbe4521c7ba5f662cf0042dff57e71dd74 Mon Sep 17 00:00:00 2001
From: Emily Ball <eaball35@gmail.com>
Date: Thu, 21 Jan 2021 12:54:43 -0800
Subject: [PATCH 3/3] fix: update path to be less explicit

---
 .kokoro/release/common.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg
index 88437328..df39efef 100644
--- a/.kokoro/release/common.cfg
+++ b/.kokoro/release/common.cfg
@@ -48,5 +48,5 @@ before_action {
   }
 }
 
-# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-143274.jar
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-143274.jar"
\ No newline at end of file
+# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/<doclet name>
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
\ No newline at end of file