aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcgdecker <cgdecker@google.com>2015-01-05 12:32:50 -0800
committerSam Berlin <sameb@google.com>2015-01-24 18:05:52 -0500
commitd0e92a7f8cca7b879bfb604e066a4c227dbaa754 (patch)
tree1270cdbae6875f462b294aa6b6be81a43c294d6e
parent1bf1e9e0ddef515aaa41a70aa34821ff5564a71d (diff)
downloadguice-d0e92a7f8cca7b879bfb604e066a4c227dbaa754.tar.gz
Change jdk8 profile in pom.xml to use the <reporting> element rather than <reportPlugins>.
This is apparently the preferred way to do this... the previous way shows errors in my IDE. ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=83279354
-rw-r--r--pom.xml25
1 files changed, 10 insertions, 15 deletions
diff --git a/pom.xml b/pom.xml
index fb9040df..b5c94aff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,17 +433,17 @@ See the Apache License Version 2.0 for the specific language governing permissio
<profiles>
<profile>
- <id>java8</id>
+ <id>jdk8</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
+ <!-- Activate jdk8-tests module only under JDK 8 -->
<modules>
- <!-- Activate jdk8-tests module only under JDK 8 -->
<module>jdk8-tests</module>
</modules>
- <build>
+ <!-- Disable doclint under JDK 8 -->
+ <reporting>
<plugins>
- <!-- Disable doclint under JDK 8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -451,20 +451,15 @@ See the Apache License Version 2.0 for the specific language governing permissio
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
+ </plugins>
+ </reporting>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <reportPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </reportPlugins>
+ <additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>