Repository: wicket Updated Branches: refs/heads/master d0946aaaf -> 92a2d4ae1
WICKET-5705 Disable Javadoc linter in JDK 1.8 because it is too strict Revert m-javadoc-p to 2.9.1. It seems 2.10 has bugs. Add additionalDependencies to hamcrest because otherwise it fails the build with JDK 8 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/92a2d4ae Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/92a2d4ae Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/92a2d4ae Branch: refs/heads/master Commit: 92a2d4ae1d8438003ca5539472847db2d0e8704e Parents: d0946aa Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Sep 22 00:09:44 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Sep 22 00:09:44 2014 +0200 ---------------------------------------------------------------------- pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/92a2d4ae/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0f24c30..a04767b 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.10</maven.javadoc.version> + <maven.javadoc.version>2.9.1</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> @@ -637,6 +637,15 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>${maven.javadoc.version}</version> <inherited>true</inherited> + <configuration> + <additionalDependencies> + <additionalDependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrest.version}</version> + </additionalDependency> + </additionalDependencies> + </configuration> </plugin> </plugins> <pluginManagement>
