Skip to content

Commit a66e3b7

Browse files
chingor13chingor13
authored
Revert "Move <reportPlugins> to <reporting><plugins> (googleapis#3524)" (googleapis#3806)
This reverts commit ef2a88b.
1 parent 8548be5 commit a66e3b7

13 files changed

Lines changed: 192 additions & 17 deletions

File tree

‎google-api-grpc/pom.xml‎

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,9 +732,60 @@
732732
<plugin>
733733
<groupId>org.apache.maven.plugins</groupId>
734734
<artifactId>maven-site-plugin</artifactId>
735-
<version>3.6</version>
735+
<version>3.4</version>
736736
<configuration>
737737
<skipDeploy>true</skipDeploy>
738+
<reportPlugins>
739+
<plugin>
740+
<groupId>org.apache.maven.plugins</groupId>
741+
<artifactId>maven-project-info-reports-plugin</artifactId>
742+
<version>2.8.1</version>
743+
<reportSets>
744+
<reportSet>
745+
<reports>
746+
<report>index</report>
747+
<report>dependency-info</report>
748+
<report>project-team</report>
749+
<report>cim</report>
750+
<report>issue-tracking</report>
751+
<report>license</report>
752+
<report>scm</report>
753+
<report>dependency-management</report>
754+
<report>distribution-management</report>
755+
<report>summary</report>
756+
<report>modules</report>
757+
</reports>
758+
</reportSet>
759+
</reportSets>
760+
<configuration>
761+
<aggregate>true</aggregate>
762+
<quiet>true</quiet>
763+
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
764+
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
765+
<artifactId>${project.artifactId}</artifactId>
766+
<packaging>jar</packaging>
767+
</configuration>
768+
</plugin>
769+
<plugin>
770+
<groupId>org.apache.maven.plugins</groupId>
771+
<artifactId>maven-javadoc-plugin</artifactId>
772+
<version>2.10.3</version>
773+
<reportSets>
774+
<reportSet>
775+
<id>html</id>
776+
<reports>
777+
<report>javadoc</report>
778+
</reports>
779+
</reportSet>
780+
</reportSets>
781+
<configuration>
782+
<aggregate>true</aggregate>
783+
<show>protected</show>
784+
<nohelp>true</nohelp>
785+
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
786+
</configuration>
787+
</plugin>
788+
</reportPlugins>
738789
</configuration>
739790
</plugin>
740791
</plugins>
@@ -813,7 +864,7 @@
813864
<plugin>
814865
<groupId>org.apache.maven.plugins</groupId>
815866
<artifactId>maven-javadoc-plugin</artifactId>
816-
<version>3.0.1</version>
867+
<version>2.10.3</version>
817868
<executions>
818869
<execution>
819870
<id>attach-javadocs</id>

‎google-cloud-bom/pom.xml‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,13 +1116,46 @@
11161116
<plugin>
11171117
<groupId>org.apache.maven.plugins</groupId>
11181118
<artifactId>maven-site-plugin</artifactId>
1119-
<version>3.6</version>
1119+
<version>3.4</version>
11201120
<configuration>
11211121
<skipDeploy>true</skipDeploy>
1122+
<reportPlugins>
1123+
<plugin>
1124+
<groupId>org.apache.maven.plugins</groupId>
1125+
<artifactId>maven-project-info-reports-plugin</artifactId>
1126+
<version>2.8.1</version>
1127+
<reportSets>
1128+
<reportSet>
1129+
<reports>
1130+
<report>index</report>
1131+
<report>dependency-info</report>
1132+
<report>project-team</report>
1133+
<report>cim</report>
1134+
<report>issue-tracking</report>
1135+
<report>license</report>
1136+
<report>scm</report>
1137+
<report>dependency-management</report>
1138+
<report>distribution-management</report>
1139+
<report>summary</report>
1140+
<report>modules</report>
1141+
</reports>
1142+
</reportSet>
1143+
</reportSets>
1144+
<configuration>
1145+
<aggregate>true</aggregate>
1146+
<quiet>true</quiet>
1147+
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
1148+
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
1149+
<artifactId>google-cloud-bom</artifactId>
1150+
<packaging>jar</packaging>
1151+
</configuration>
1152+
</plugin>
1153+
</reportPlugins>
11221154
</configuration>
11231155
</plugin>
11241156
</plugins>
11251157
</build>
1158+
11261159
<reporting>
11271160
<plugins>
11281161
<plugin>

‎google-cloud-clients/google-cloud-bigquery/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
<!-- Allow script to run, so we can run benchmarks. -->
8181
<groupId>org.codehaus.mojo</groupId>
8282
<artifactId>exec-maven-plugin</artifactId>
83-
<version>1.6.0</version>
8483
<configuration>
8584
<cleanupDaemonThreads>false</cleanupDaemonThreads>
8685
<skip>false</skip>

‎google-cloud-clients/google-cloud-bigtable/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,18 @@
9797
<scope>test</scope>
9898
</dependency>
9999
</dependencies>
100+
<profiles>
101+
<profile>
102+
<id>doclint-java8-disable</id>
103+
<activation>
104+
<jdk>[1.8,)</jdk>
105+
</activation>
106+
<properties>
107+
<!-- add this to disable checking -->
108+
<javadoc.opts>-Xdoclint:none</javadoc.opts>
109+
</properties>
110+
</profile>
111+
</profiles>
100112
<build>
101113
<plugins>
102114
<plugin>

‎google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<plugin>
2929
<groupId>org.codehaus.mojo</groupId>
3030
<artifactId>exec-maven-plugin</artifactId>
31-
<version>1.6.0</version>
3231
<configuration>
3332
<skip>false</skip>
3433
</configuration>

‎google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<plugin>
7575
<groupId>org.codehaus.mojo</groupId>
7676
<artifactId>exec-maven-plugin</artifactId>
77-
<version>1.6.0</version>
7877
<configuration>
7978
<skip>false</skip>
8079
</configuration>

‎google-cloud-clients/google-cloud-contrib/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<plugin>
3030
<groupId>org.codehaus.mojo</groupId>
3131
<artifactId>exec-maven-plugin</artifactId>
32-
<version>1.6.0</version>
3332
<configuration>
3433
<skip>false</skip>
3534
</configuration>

‎google-cloud-clients/pom.xml‎

Lines changed: 88 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@
483483
<plugin>
484484
<groupId>org.codehaus.mojo</groupId>
485485
<artifactId>exec-maven-plugin</artifactId>
486-
<version>1.6.0</version>
486+
<version>1.4.0</version>
487487
<configuration>
488488
<skip>true</skip>
489489
<executable>java</executable>
@@ -534,7 +534,7 @@
534534
<plugin>
535535
<groupId>org.codehaus.mojo</groupId>
536536
<artifactId>exec-maven-plugin</artifactId>
537-
<version>1.6.0</version>
537+
<version>1.4.0</version>
538538
<executions>
539539
<execution>
540540
<goals>
@@ -677,13 +677,97 @@
677677
<plugin>
678678
<groupId>org.apache.maven.plugins</groupId>
679679
<artifactId>maven-site-plugin</artifactId>
680-
<version>3.6</version>
680+
<version>3.4</version>
681681
<configuration>
682682
<skipDeploy>true</skipDeploy>
683+
<reportPlugins>
684+
<plugin>
685+
<groupId>org.apache.maven.plugins</groupId>
686+
<artifactId>maven-project-info-reports-plugin</artifactId>
687+
<version>2.8.1</version>
688+
<reportSets>
689+
<reportSet>
690+
<reports>
691+
<report>index</report>
692+
<report>dependency-info</report>
693+
<report>project-team</report>
694+
<report>cim</report>
695+
<report>issue-tracking</report>
696+
<report>license</report>
697+
<report>scm</report>
698+
<report>dependency-management</report>
699+
<report>distribution-management</report>
700+
<report>summary</report>
701+
<report>modules</report>
702+
</reports>
703+
</reportSet>
704+
</reportSets>
705+
<configuration>
706+
<aggregate>true</aggregate>
707+
<quiet>true</quiet>
708+
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
709+
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
710+
<artifactId>${site.installationModule}</artifactId>
711+
<packaging>jar</packaging>
712+
</configuration>
713+
</plugin>
714+
<plugin>
715+
<groupId>org.apache.maven.plugins</groupId>
716+
<artifactId>maven-javadoc-plugin</artifactId>
717+
<version>2.10.3</version>
718+
<reportSets>
719+
<reportSet>
720+
<id>html</id>
721+
<reports>
722+
<report>javadoc</report>
723+
</reports>
724+
</reportSet>
725+
</reportSets>
726+
<configuration>
727+
<aggregate>true</aggregate>
728+
<show>protected</show>
729+
<nohelp>true</nohelp>
730+
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
731+
<groups>
732+
<group>
733+
<title>API packages</title>
734+
<packages>com.google.cloud*</packages>
735+
</group>
736+
<group>
737+
<title>Test helpers packages</title>
738+
<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>
739+
</group>
740+
<group>
741+
<title>Example packages</title>
742+
<packages>com.google.cloud.examples.*:com.google.cloud.nio.examples</packages>
743+
</group>
744+
<group>
745+
<title>SPI packages</title>
746+
<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>
747+
</group>
748+
<group>
749+
<title>Stub packages</title>
750+
<packages>com.google.cloud.asset.v1beta1.stub:com.google.cloud.automl.v1beta1.stub:com.google.cloud.bigquery.datatransfer.v1.stub:com.google.cloud.bigtable.admin.v2.stub:com.google.cloud.bigtable.data.v2.stub*:com.google.cloud.compute.v1.stub:com.google.cloud.container.v1.stub:com.google.cloud.devtools.containeranalysis.v1beta1.stub:com.google.cloud.dataproc.v1.stub:com.google.cloud.dataproc.v1beta2.stub:com.google.cloud.dlp.v2beta1.stub:com.google.cloud.dlp.v2.stub:com.google.cloud.dialogflow.v2beta1.stub:com.google.cloud.dialogflow.v2.stub:com.google.cloud.errorreporting.v1beta1.stub:com.google.cloud.firestore.v1beta1.stub:com.google.cloud.iot.v1.stub:com.google.cloud.kms.v1.stub:com.google.cloud.language.v1beta2.stub:com.google.cloud.language.v1.stub:com.google.cloud.logging.v2.stub:com.google.cloud.monitoring.v3.stub:com.google.cloud.oslogin.v1.stub:com.google.cloud.pubsub.v1.stub:com.google.cloud.redis.v1beta1.stub:com.google.cloud.redis.v1.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.v1beta1.stub:com.google.cloud.speech.v1p1beta1.stub:com.google.cloud.speech.v1.stub:com.google.cloud.tasks.v2beta2.stub:com.google.cloud.texttospeech.v1beta1.stub:com.google.cloud.texttospeech.v1.stub:com.google.cloud.trace.v1.stub:com.google.cloud.trace.v2.stub:com.google.cloud.videointelligence.v1beta1.stub:com.google.cloud.videointelligence.v1beta2.stub:com.google.cloud.videointelligence.v1.stub:com.google.cloud.videointelligence.v1p1beta1.stub:com.google.cloud.videointelligence.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>
751+
</group>
752+
<group>
753+
<title>Deprecated packages</title>
754+
<packages>com.google.cloud.compute.deprecated*</packages>
755+
</group>
756+
</groups>
757+
<links>
758+
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
759+
<link>http://google.github.io/google-auth-library-java/releases/latest/apidocs/</link>
760+
<link>http://googleapis.github.io/gax-java/${gax.version}/apidocs/</link>
761+
<link>http://googleapis.github.io/googleapis/java/all/latest/apidocs/</link>
762+
</links>
763+
</configuration>
764+
</plugin>
765+
</reportPlugins>
683766
</configuration>
684767
</plugin>
685768
</plugins>
686769
</build>
770+
687771
<reporting>
688772
<plugins>
689773
<plugin>
@@ -790,7 +874,7 @@
790874
<plugin>
791875
<groupId>org.apache.maven.plugins</groupId>
792876
<artifactId>maven-javadoc-plugin</artifactId>
793-
<version>3.0.1</version>
877+
<version>2.10.3</version>
794878
<executions>
795879
<execution>
796880
<id>attach-javadocs</id>

‎google-cloud-examples/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,14 @@
107107
<plugin>
108108
<groupId>org.apache.maven.plugins</groupId>
109109
<artifactId>maven-site-plugin</artifactId>
110-
<version>3.6</version>
110+
<version>3.4</version>
111111
<configuration>
112112
<skip>true</skip>
113113
</configuration>
114114
</plugin>
115115
<plugin>
116116
<groupId>org.codehaus.mojo</groupId>
117117
<artifactId>exec-maven-plugin</artifactId>
118-
<version>1.6.0</version>
119118
<configuration>
120119
<cleanupDaemonThreads>false</cleanupDaemonThreads>
121120
<skip>false</skip>

‎google-cloud-testing/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<plugin>
9797
<groupId>org.apache.maven.plugins</groupId>
9898
<artifactId>maven-site-plugin</artifactId>
99-
<version>3.6</version>
99+
<version>3.4</version>
100100
<configuration>
101101
<skip>true</skip>
102102
</configuration>

0 commit comments

Comments
 (0)