Repository: wicket
Updated Branches:
  refs/heads/master 66925ddf9 -> d0946aaaf


WICKET-5705 Disable Javadoc linter in JDK 1.8 because it is too strict


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d0946aaa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d0946aaa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d0946aaa

Branch: refs/heads/master
Commit: d0946aaafc7262b8a562b3327d5fd5d763fa2c68
Parents: 66925dd
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Sun Sep 21 23:48:43 2014 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Sun Sep 21 23:50:42 2014 +0200

----------------------------------------------------------------------
 pom.xml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/d0946aaa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d66eb2..0f24c30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
                <jetty9.version>9.0.7.v20131107</jetty9.version>
                <spring.version>4.1.0.RELEASE</spring.version>
                <servlet-api.version>3.0.1</servlet-api.version>
-               <maven.javadoc.version>2.9.1</maven.javadoc.version>
+               <maven.javadoc.version>2.10</maven.javadoc.version>
                <maven.surefire.version>2.17</maven.surefire.version>
                <mockito.version>1.9.5</mockito.version>
                <slf4j.version>1.7.7</slf4j.version>
@@ -180,7 +180,21 @@
                                </plugins>
                        </build>
                </profile>
-               
+
+               <profile>
+                       <id>Java 8</id>
+                       <activation>
+                               <jdk>1.8</jdk>
+                       </activation>
+                       <properties>
+                               <!-- Disable javadoc linter when building with 
Java 8
+                                
http://mail-archives.apache.org/mod_mbox/maven-users/201403.mbox/%3ccanwgjs5xhwige+lecey+mzvbj9via4juwsabeztqr2aqneb...@mail.gmail.com%3E
+                                
http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
+                                -->
+                               
<additionalparam>-Xdoclint:none</additionalparam>
+                       </properties>
+               </profile>
+
        </profiles>
        <url>http://wicket.apache.org/${project.artifactId}</url>
        <inceptionYear>2006</inceptionYear>

Reply via email to