Repository: camel Updated Branches: refs/heads/master cf6959e72 -> bf7df43fd
CAMEL-7987 Removed the custom javadoc stylesheet.css which is not work with JDK7 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/31f656cb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/31f656cb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/31f656cb Branch: refs/heads/master Commit: 31f656cbafca2577b2907840d498a81a595a1a31 Parents: e9bac0e Author: Willem Jiang <willem.ji...@gmail.com> Authored: Mon Nov 3 15:45:31 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon Nov 3 22:19:49 2014 +0800 ---------------------------------------------------------------------- camel-core/pom.xml | 10 ++++------ components/camel-spring/pom.xml | 16 +++++++--------- 2 files changed, 11 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/31f656cb/camel-core/pom.xml ---------------------------------------------------------------------- diff --git a/camel-core/pom.xml b/camel-core/pom.xml index da6f3f5..aaea6a7 100644 --- a/camel-core/pom.xml +++ b/camel-core/pom.xml @@ -290,10 +290,9 @@ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <links> - <link>http://download.oracle.com/javase/6/docs/api/</link> - <link>http://download.oracle.com/javaee/6/api/</link> + <link>http://download.oracle.com/javase/7/docs/api/</link> + <link>http://download.oracle.com/javaee/7/api/</link> </links> - <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile> <linksource>true</linksource> <maxmemory>256m</maxmemory> @@ -372,10 +371,9 @@ </executions> <configuration> <links> - <link>http://download.oracle.com/javase/6/docs/api/</link> - <link>http://download.oracle.com/javaee/6/api/</link> + <link>http://download.oracle.com/javase/7/docs/api/</link> + <link>http://download.oracle.com/javaee/7/api/</link> </links> - <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile> <linksource>true</linksource> <maxmemory>256m</maxmemory> <groups> http://git-wip-us.apache.org/repos/asf/camel/blob/31f656cb/components/camel-spring/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml index d793ff8..fdfc1d2 100644 --- a/components/camel-spring/pom.xml +++ b/components/camel-spring/pom.xml @@ -132,7 +132,7 @@ <!-- for testing --> <dependency> <groupId>junit</groupId> - <artifactId>junit</artifactId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> @@ -318,7 +318,7 @@ <goal>run</goal> </goals> </execution> - </executions> + </executions> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -359,7 +359,7 @@ </execution> </executions> </plugin> - + </plugins> <pluginManagement> @@ -422,7 +422,7 @@ </plugins> </pluginManagement> </build> - + <profiles> <profile> <id>release</id> @@ -483,7 +483,7 @@ </dependencies> </profile> </profiles> - + <reporting> <plugins> <plugin> @@ -491,15 +491,13 @@ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <links> - <link>http://download.oracle.com/javase/6/docs/api/</link> - <link>http://download.oracle.com/javaee/6/api/</link> + <link>http://download.oracle.com/javase/7/docs/api/</link> + <link>http://download.oracle.com/javaee/7/api/</link> <link>http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/</link> <link>http://camel.apache.org/maven/current/camel-core/apidocs/</link> </links> - <stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile> <linksource>true</linksource> <maxmemory>256m</maxmemory> - <source>${jdk.version}</source> <groups> <group>
