Skip to content

Commit

Permalink
Revert "Move <reportPlugins> to <reporting><plugins> (#3524)" (#3806)
Browse files Browse the repository at this point in the history 
This reverts commit ef2a88b.
  • Loading branch information
@chingor13
chingor13 authored Oct 10, 2018
1 parent 8548be5 commit a66e3b7
Show file tree
Hide file tree
Showing 13 changed files with 192 additions and 17 deletions.
55 changes: 53 additions & 2 deletions google-api-grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -732,9 +732,60 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<version>3.4</version>
<configuration>
<skipDeploy>true</skipDeploy>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.8.1</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>dependency-info</report>
<report>project-team</report>
<report>cim</report>
<report>issue-tracking</report>
<report>license</report>
<report>scm</report>
<report>dependency-management</report>
<report>distribution-management</report>
<report>summary</report>
<report>modules</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<aggregate>true</aggregate>
<quiet>true</quiet>
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
<artifactId>${project.artifactId}</artifactId>
<packaging>jar</packaging>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<reportSets>
<reportSet>
<id>html</id>
<reports>
<report>javadoc</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<aggregate>true</aggregate>
<show>protected</show>
<nohelp>true</nohelp>
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
</configuration>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugins>
Expand Down Expand Up @@ -813,7 +864,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down
35 changes: 34 additions & 1 deletion google-cloud-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1116,13 +1116,46 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<version>3.4</version>
<configuration>
<skipDeploy>true</skipDeploy>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.8.1</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>dependency-info</report>
<report>project-team</report>
<report>cim</report>
<report>issue-tracking</report>
<report>license</report>
<report>scm</report>
<report>dependency-management</report>
<report>distribution-management</report>
<report>summary</report>
<report>modules</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<aggregate>true</aggregate>
<quiet>true</quiet>
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
<artifactId>google-cloud-bom</artifactId>
<packaging>jar</packaging>
</configuration>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
Expand Down
1 change: 0 additions & 1 deletion google-cloud-clients/google-cloud-bigquery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
<!-- Allow script to run, so we can run benchmarks. -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
<skip>false</skip>
Expand Down
12 changes: 12 additions & 0 deletions google-cloud-clients/google-cloud-bigtable/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,18 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<!-- add this to disable checking -->
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
</profiles>
<build>
<plugins>
<plugin>
Expand Down
1 change: 0 additions & 1 deletion google-cloud-clients/google-cloud-contrib/google-cloud-nio-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<skip>false</skip>
</configuration>
Expand Down
1 change: 0 additions & 1 deletion google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<skip>false</skip>
</configuration>
Expand Down
1 change: 0 additions & 1 deletion google-cloud-clients/google-cloud-contrib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<skip>false</skip>
</configuration>
Expand Down
92 changes: 88 additions & 4 deletions google-cloud-clients/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<version>1.4.0</version>
<configuration>
<skip>true</skip>
<executable>java</executable>
Expand Down Expand Up @@ -534,7 +534,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<version>1.4.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -677,13 +677,97 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<version>3.4</version>
<configuration>
<skipDeploy>true</skipDeploy>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.8.1</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>dependency-info</report>
<report>project-team</report>
<report>cim</report>
<report>issue-tracking</report>
<report>license</report>
<report>scm</report>
<report>dependency-management</report>
<report>distribution-management</report>
<report>summary</report>
<report>modules</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<aggregate>true</aggregate>
<quiet>true</quiet>
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
<artifactId>${site.installationModule}</artifactId>
<packaging>jar</packaging>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<reportSets>
<reportSet>
<id>html</id>
<reports>
<report>javadoc</report>
</reports>
</reportSet>
</reportSets>
<configuration>
<aggregate>true</aggregate>
<show>protected</show>
<nohelp>true</nohelp>
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
<groups>
<group>
<title>API packages</title>
<packages>com.google.cloud*</packages>
</group>
<group>
<title>Test helpers packages</title>
<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>
</group>
<group>
<title>Example packages</title>
<packages>com.google.cloud.examples.*:com.google.cloud.nio.examples</packages>
</group>
<group>
<title>SPI packages</title>
<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>
</group>
<group>
<title>Stub packages</title>
<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>
</group>
<group>
<title>Deprecated packages</title>
<packages>com.google.cloud.compute.deprecated*</packages>
</group>
</groups>
<links>
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
<link>http://google.github.io/google-auth-library-java/releases/latest/apidocs/</link>
<link>http://googleapis.github.io/gax-java/${gax.version}/apidocs/</link>
<link>http://googleapis.github.io/googleapis/java/all/latest/apidocs/</link>
</links>
</configuration>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
Expand Down Expand Up @@ -790,7 +874,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down
3 changes: 1 addition & 2 deletions google-cloud-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<version>3.4</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
<skip>false</skip>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-testing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<version>3.4</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-util/google-cloud-compat-checker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<version>3.4</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<version>3.4</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<version>3.4</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down

0 comments on commit a66e3b7

Please sign in to comment.