Skip to content

Commit 7978818

Browse files
authored
Docs: Fix maven site generation (#4232)
The configuration for aggregate changed from an attribute to a report
1 parent 63a9cb7 commit 7978818

2 files changed

Lines changed: 5 additions & 141 deletions

File tree

google-api-grpc/pom.xml

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -791,57 +791,6 @@
791791
<version>3.4</version>
792792
<configuration>
793793
<skipDeploy>true</skipDeploy>
794-
<reportPlugins>
795-
<plugin>
796-
<groupId>org.apache.maven.plugins</groupId>
797-
<artifactId>maven-project-info-reports-plugin</artifactId>
798-
<version>2.8.1</version>
799-
<reportSets>
800-
<reportSet>
801-
<reports>
802-
<report>index</report>
803-
<report>dependency-info</report>
804-
<report>project-team</report>
805-
<report>cim</report>
806-
<report>issue-tracking</report>
807-
<report>license</report>
808-
<report>scm</report>
809-
<report>dependency-management</report>
810-
<report>distribution-management</report>
811-
<report>summary</report>
812-
<report>modules</report>
813-
</reports>
814-
</reportSet>
815-
</reportSets>
816-
<configuration>
817-
<aggregate>true</aggregate>
818-
<quiet>true</quiet>
819-
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
820-
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
821-
<artifactId>${project.artifactId}</artifactId>
822-
<packaging>jar</packaging>
823-
</configuration>
824-
</plugin>
825-
<plugin>
826-
<groupId>org.apache.maven.plugins</groupId>
827-
<artifactId>maven-javadoc-plugin</artifactId>
828-
<version>3.0.1</version>
829-
<reportSets>
830-
<reportSet>
831-
<id>html</id>
832-
<reports>
833-
<report>javadoc</report>
834-
</reports>
835-
</reportSet>
836-
</reportSets>
837-
<configuration>
838-
<aggregate>true</aggregate>
839-
<show>protected</show>
840-
<nohelp>true</nohelp>
841-
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
842-
</configuration>
843-
</plugin>
844-
</reportPlugins>
845794
</configuration>
846795
</plugin>
847796
<plugin>
@@ -865,12 +814,13 @@
865814
</plugin>
866815
</plugins>
867816
</build>
817+
868818
<reporting>
869819
<plugins>
870820
<plugin>
871821
<groupId>org.apache.maven.plugins</groupId>
872822
<artifactId>maven-project-info-reports-plugin</artifactId>
873-
<version>3.0.0</version>
823+
<version>2.8.1</version>
874824
<reportSets>
875825
<reportSet>
876826
<reports>
@@ -889,8 +839,6 @@
889839
</reportSet>
890840
</reportSets>
891841
<configuration>
892-
<aggregate>true</aggregate>
893-
<quiet>true</quiet>
894842
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
895843
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
896844
<artifactId>${project.artifactId}</artifactId>
@@ -905,6 +853,7 @@
905853
<reportSet>
906854
<id>html</id>
907855
<reports>
856+
<report>aggregate</report>
908857
<report>javadoc</report>
909858
</reports>
910859
</reportSet>

google-cloud-clients/pom.xml

Lines changed: 2 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -700,90 +700,6 @@
700700
<version>3.4</version>
701701
<configuration>
702702
<skipDeploy>true</skipDeploy>
703-
<reportPlugins>
704-
<plugin>
705-
<groupId>org.apache.maven.plugins</groupId>
706-
<artifactId>maven-project-info-reports-plugin</artifactId>
707-
<version>2.8.1</version>
708-
<reportSets>
709-
<reportSet>
710-
<reports>
711-
<report>index</report>
712-
<report>dependency-info</report>
713-
<report>project-team</report>
714-
<report>cim</report>
715-
<report>issue-tracking</report>
716-
<report>license</report>
717-
<report>scm</report>
718-
<report>dependency-management</report>
719-
<report>distribution-management</report>
720-
<report>summary</report>
721-
<report>modules</report>
722-
</reports>
723-
</reportSet>
724-
</reportSets>
725-
<configuration>
726-
<aggregate>true</aggregate>
727-
<quiet>true</quiet>
728-
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
729-
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
730-
<artifactId>${site.installationModule}</artifactId>
731-
<packaging>jar</packaging>
732-
</configuration>
733-
</plugin>
734-
<plugin>
735-
<groupId>org.apache.maven.plugins</groupId>
736-
<artifactId>maven-javadoc-plugin</artifactId>
737-
<version>3.0.1</version>
738-
<reportSets>
739-
<reportSet>
740-
<id>html</id>
741-
<reports>
742-
<report>javadoc</report>
743-
</reports>
744-
</reportSet>
745-
</reportSets>
746-
<configuration>
747-
<doclint>none</doclint>
748-
<aggregate>true</aggregate>
749-
<show>protected</show>
750-
<nohelp>true</nohelp>
751-
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
752-
<groups>
753-
<group>
754-
<title>API packages</title>
755-
<packages>com.google.cloud*</packages>
756-
</group>
757-
<group>
758-
<title>Test helpers packages</title>
759-
<packages>com.google.cloud.bigquery.testing:com.google.cloud.testing:com.google.cloud.datastore.testing:com.google.cloud.dns.testing:com.google.cloud.logging.testing:com.google.cloud.pubsub.testing:com.google.cloud.resourcemanager.testing:com.google.cloud.storage.testing:com.google.cloud.translate.testing:com.google.cloud.spanner.testing:com.google.cloud.storage.contrib.nio.testing</packages>
760-
</group>
761-
<group>
762-
<title>Example packages</title>
763-
<packages>com.google.cloud.examples.*:com.google.cloud.nio.examples</packages>
764-
</group>
765-
<group>
766-
<title>SPI packages</title>
767-
<packages>com.google.cloud.spi*:com.google.cloud.bigquery.spi*:com.google.cloud.datastore.spi*:com.google.cloud.dns.spi*:com.google.cloud.firestore.spi*:com.google.cloud.logging.spi*:com.google.cloud.resourcemanager.spi*:com.google.cloud.spanner.spi*:com.google.cloud.storage.spi*:com.google.cloud.translate.spi*</packages>
768-
</group>
769-
<group>
770-
<title>Stub packages</title>
771-
<packages>com.google.cloud.asset.v1beta1.stub:com.google.cloud.automl.v1beta1.stub:com.google.cloud.bigquerydatatransfer.v1.stub:com.google.cloud.bigquerystorage.v1beta1.stub:com.google.cloud.bigtable-admin.v2.stub:com.google.cloud.bigtable.v2.stub:com.google.cloud.container.v1.stub:com.google.cloud.containeranalysis.v1beta1.stub:com.google.cloud.dataproc.v1.stub:com.google.cloud.dataproc.v1beta2.stub:com.google.cloud.dialogflow.v2.stub:com.google.cloud.dialogflow.v2beta1.stub:com.google.cloud.dlp.v2.stub:com.google.cloud.error-reporting.v1beta1.stub:com.google.cloud.firestore.v1beta1.stub:com.google.cloud.iamcredentials.v1.stub:com.google.cloud.iot.v1.stub:com.google.cloud.kms.v1.stub:com.google.cloud.language.v1.stub:com.google.cloud.language.v1beta2.stub:com.google.cloud.logging.v2.stub:com.google.cloud.monitoring.v3.stub:com.google.cloud.os-login.v1.stub:com.google.cloud.pubsub.v1.stub:com.google.cloud.redis.v1.stub:com.google.cloud.redis.v1beta1.stub:com.google.cloud.scheduler.v1beta1.stub:com.google.cloud.securitycenter.v1beta1.stub:com.google.cloud.spanner-admin-database.v1.stub:com.google.cloud.spanner-admin-instance.v1.stub:com.google.cloud.spanner.v1.stub:com.google.cloud.speech.v1.stub:com.google.cloud.speech.v1beta1.stub:com.google.cloud.speech.v1p1beta1.stub:com.google.cloud.tasks.v2beta2.stub:com.google.cloud.tasks.v2beta3.stub:com.google.cloud.texttospeech.v1.stub:com.google.cloud.texttospeech.v1beta1.stub:com.google.cloud.trace.v1.stub:com.google.cloud.trace.v2.stub:com.google.cloud.video-intelligence.v1.stub:com.google.cloud.video-intelligence.v1beta1.stub:com.google.cloud.video-intelligence.v1beta2.stub:com.google.cloud.video-intelligence.v1p1beta1.stub:com.google.cloud.video-intelligence.v1p2beta1.stub:com.google.cloud.vision.v1.stub:com.google.cloud.vision.v1p1beta1.stub:com.google.cloud.vision.v1p2beta1.stub:com.google.cloud.vision.v1p3beta1.stub:com.google.cloud.websecurityscanner.v1alpha.stub</packages>
772-
</group>
773-
<group>
774-
<title>Deprecated packages</title>
775-
<packages>com.google.cloud.compute.deprecated*</packages>
776-
</group>
777-
</groups>
778-
<links>
779-
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
780-
<link>http://google.github.io/google-auth-library-java/releases/latest/apidocs/</link>
781-
<link>http://googleapis.github.io/gax-java/${gax.version}/apidocs/</link>
782-
<link>https://googleapis.github.io/api-common-java/${api.common.java.version}/apidocs/</link>
783-
</links>
784-
</configuration>
785-
</plugin>
786-
</reportPlugins>
787703
</configuration>
788704
</plugin>
789705
<plugin>
@@ -813,7 +729,7 @@
813729
<plugin>
814730
<groupId>org.apache.maven.plugins</groupId>
815731
<artifactId>maven-project-info-reports-plugin</artifactId>
816-
<version>3.0.0</version>
732+
<version>2.8.1</version>
817733
<reportSets>
818734
<reportSet>
819735
<reports>
@@ -832,8 +748,6 @@
832748
</reportSet>
833749
</reportSets>
834750
<configuration>
835-
<aggregate>true</aggregate>
836-
<quiet>true</quiet>
837751
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
838752
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
839753
<artifactId>${site.installationModule}</artifactId>
@@ -848,6 +762,7 @@
848762
<reportSet>
849763
<id>html</id>
850764
<reports>
765+
<report>aggregate</report>
851766
<report>javadoc</report>
852767
</reports>
853768
</reportSet>

0 commit comments

Comments
 (0)