Commit 8bf6a261 authored by Ate Douma's avatar Ate Douma

CMS7-7371: Move to Java 7 and Tomcat 7 CMS 7.9

- bump to latest project pom
- update to latest 7.9 forge plugins and modules in release pom
- fix cargo configuration in gogreen (integration-tests)
- fix and cleanup several javadoc configurations to inherit the default 1.7 javadoc target and source link
parent b9417817
......@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
<version>23</version>
<version>24-SNAPSHOT</version>
</parent>
<name>Hippo Search Service</name>
......@@ -365,26 +365,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.plugin.javadoc.version}</version>
<configuration>
<aggregate>true</aggregate>
<destDir>userapidocs</destDir>
<source>1.6</source>
<sourcepath>${basedir}/api/src/main/java:${basedir}/mock/src/main/java:${basedir}/commons/src/main/java:${basedir}/content-beans/src/main/java:${basedir}/client/src/main/java</sourcepath>
<links>
<link>http://download.oracle.com/javase/6/docs/api</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.plugin.javadoc.version}</version>
<configuration>
<aggregate>true</aggregate>
<source>1.6</source>
<links>
<link>http://download.oracle.com/javase/6/docs/api</link>
</links>
</configuration>
<reportSets>
<reportSet>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment