[java-parent-projects COMMIT] /java-parent-project-v2/trunk/pom.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Tue May  5 13:26:14 2015
New Revision: 329

URL: http://svn.shibboleth.net/view/java-parent-projects?rev=329&view=rev
Log:
JPAR-69 Add profile to disable Java 8 doclint. Use consistent version of maven-javadoc-plugin during site generation.

Modified:
    java-parent-project-v2/trunk/pom.xml

Modified: java-parent-project-v2/trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-parent-projects/java-parent-project-v2/trunk/pom.xml?rev=329&r1=328&r2=329&view=diff
==============================================================================
--- java-parent-project-v2/trunk/pom.xml	(original)
+++ java-parent-project-v2/trunk/pom.xml	Tue May  5 13:26:14 2015
@@ -490,7 +490,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
                 <configuration>
                     <quiet>true</quiet>
                 </configuration>
@@ -688,6 +687,38 @@
                 </pluginRepository>
             </pluginRepositories>
         </profile>
+        <profile>
+            <id>disable-javadoc-doclint</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-site-plugin</artifactId>
+                        <configuration>
+                            <reportPlugins>
+                                <plugin>
+                                    <groupId>org.apache.maven.plugins</groupId>
+                                    <artifactId>maven-javadoc-plugin</artifactId>
+                                    <configuration>
+                                        <additionalparam>-Xdoclint:none</additionalparam>
+                                    </configuration>
+                                </plugin>
+                            </reportPlugins>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>