Skip to content

Commit

Permalink
Move <reportPlugins> to <reporting><plugins> (#3524)
Browse files Browse the repository at this point in the history 
* move <reportPlugins> to <reporting><plugins>

* update some maven plugins to latest

* remove anchor_build from javadoc_test

* add versions

* comment out javadoc task in bigtable pom

* add build step back to javadoc in circleci

* entirely remove doclint disable in bigtable
  • Loading branch information
@andreamlin @chingor13
andreamlin authored and chingor13 committed Oct 9, 2018
1 parent a5628af commit ef2a88b
Show file tree
Hide file tree
Showing 13 changed files with 188 additions and 190 deletions.
108 changes: 55 additions & 53 deletions google-api-grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -738,64 +738,66 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
<version>3.6</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>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</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>3.0.1</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>
</plugins>
</reporting>
<profiles>
<profile>
<id>release</id>
Expand All @@ -817,7 +819,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down
68 changes: 35 additions & 33 deletions google-cloud-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1130,45 +1130,47 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
<version>3.6</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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</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>
</plugins>
</reporting>
<profiles>
<profile>
<id>release</id>
Expand Down
1 change: 1 addition & 0 deletions google-cloud-clients/google-cloud-bigquery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<!-- 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: 0 additions & 12 deletions google-cloud-clients/google-cloud-bigtable/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,6 @@
<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: 1 addition & 0 deletions 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,6 +28,7 @@
<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: 1 addition & 0 deletions 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,6 +74,7 @@
<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: 1 addition & 0 deletions google-cloud-clients/google-cloud-contrib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<skip>false</skip>
</configuration>
Expand Down
Loading

0 comments on commit ef2a88b

Please sign in to comment.