From 7826eb0c23f43c991111a880726b291796ac54a0 Mon Sep 17 00:00:00 2001
From: Emily Ball <emilyball@google.com>
Date: Mon, 8 Nov 2021 14:12:02 -0800
Subject: [PATCH] chore: cleanup cloud RAD generation

Same as https://github.com/googleapis/java-shared-config/pull/344
---
 pom.xml | 70 +++++++++++++++++++++------------------------------------
 1 file changed, 26 insertions(+), 44 deletions(-)

diff --git a/pom.xml b/pom.xml
index 900692ba2..1ffffcf5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -519,62 +519,44 @@
           <name>docFX</name>
         </property>
       </activation>
-      <reporting>
+      <properties>
+        <!-- default config values -->
+        <docletName>java-docfx-doclet-1.3.0</docletName>
+        <outputpath>${project.build.directory}/docfx-yml</outputpath>
+        <projectname>${project.artifactId}</projectname>
+        <excludeclasses></excludeclasses>
+        <excludePackages></excludePackages>
+        <source>7</source>            
+        <sourceFileExclude></sourceFileExclude>
+      </properties>
+      <build>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.2.0</version>
-            <reportSets>
-              <reportSet>
-                <id>docFX</id>
-                <reports>
-                  <report>javadoc</report>
-                  <report>aggregate</report>
-                  <report>aggregate-jar</report>
-                </reports>
-              </reportSet>
-            </reportSets>
+            <version>3.3.1</version>
             <configuration>
               <doclet>com.microsoft.doclet.DocFxDoclet</doclet>
               <useStandardDocletOptions>false</useStandardDocletOptions>
-              <docletPath>${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.3.0.jar</docletPath>
-              <additionalOptions>-outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId}</additionalOptions>
+               <!-- custom config with -Dproperty=value -->
+              <docletPath>${env.KOKORO_GFILE_DIR}/${docletName}.jar</docletPath>
+              <additionalOptions>
+                -outputpath ${outputpath} 
+                -projectname ${projectname} 
+                -excludeclasses ${excludeclasses}: 
+                -excludepackages ${excludePackages}:
+              </additionalOptions>
               <doclint>none</doclint>
               <show>protected</show>
               <nohelp>true</nohelp>
-              <source>7</source>
-              <groups>
-                <group>
-                  <title>google-oauth-client</title>
-                  <packages>com.google.api.client.auth*</packages>
-                </group>
-                <group>
-                  <title>google-oauth-client-appengine</title>
-                  <packages>com.google.api.client.extensions.appengine.*</packages>
-                </group>
-                <group>
-                  <title>google-oauth-client-servlet</title>
-                  <packages>com.google.api.client.extensions.servlet.*:com.google.api.client.extensions.auth.*:com.google.api.client.extensions.jdo.*</packages>
-                </group>
-                <group>
-                  <title>google-oauth-client-java6</title>
-                  <packages>com.google.api.client.extensions.java6.*</packages>
-                </group>
-                <group>
-                  <title>google-oauth-client-jetty</title>
-                  <packages>com.google.api.client.extensions.jetty.*</packages>
-                </group>
-              </groups>
-              <links>
-                <link>https://docs.oracle.com/javase/7/docs/api/</link>
-                <link>https://cloud.google.com/appengine/docs/java/javadoc</link>
-                <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
-              </links>
+              <source>${source}</source>
+              <sourceFileExcludes>
+                <exclude>${sourceFileExclude}</exclude>
+              </sourceFileExcludes>
             </configuration>
-          </plugin>
+          </plugin>  
         </plugins>
-      </reporting>
+      </build>
     </profile>
   </profiles>
 </project>