Revision: 40919
Author: adouma
Date: 2013-09-24 17:55:51 +0200 (Tue, 24 Sep 2013)
Log Message:
-----------
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
Modified Paths:
--------------
hippo-cms7/addons/addon-channel-manager/trunk/pom.xml
hippo-cms7/addons/addon-hst-configuration-editor/trunk/pom.xml
hippo-cms7/addons/addon-search-service/trunk/pom.xml
hippo-cms7/archetypes/trunk/pom.xml
hippo-cms7/cms/trunk/pom.xml
hippo-cms7/packages/trunk/pom.xml
hippo-cms7/project/trunk/pom.xml
hippo-cms7/release/trunk/pom.xml
hippo-cms7/repository/trunk/api/pom.xml
hippo-cms7/repository/trunk/pom.xml
hippo-cms7/services/services-contenttype/trunk/pom.xml
hippo-cms7/services/services-eventbus/trunk/pom.xml
hippo-cms7/site-toolkit/trunk/pom.xml
hippo-cms7/utilities/trunk/pom.xml
hippo-demos/hippo-go-green/trunk/integration-tests/pom.xml
Modified: hippo-cms7/addons/addon-channel-manager/trunk/pom.xml
===================================================================
--- hippo-cms7/addons/addon-channel-manager/trunk/pom.xml 2013-09-24
15:24:28 UTC (rev 40918)
+++ hippo-cms7/addons/addon-channel-manager/trunk/pom.xml 2013-09-24
15:55:51 UTC (rev 40919)
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
- <version>23</version>
+ <version>24-SNAPSHOT</version>
</parent>
Modified: hippo-cms7/addons/addon-hst-configuration-editor/trunk/pom.xml
===================================================================
--- hippo-cms7/addons/addon-hst-configuration-editor/trunk/pom.xml
2013-09-24 15:24:28 UTC (rev 40918)
+++ hippo-cms7/addons/addon-hst-configuration-editor/trunk/pom.xml
2013-09-24 15:55:51 UTC (rev 40919)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
- <version>23</version>
+ <version>24-SNAPSHOT</version>
</parent>
<name>Hippo Addon HST Configuration Editor</name>
@@ -90,7 +90,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven.plugin.javadoc.version}</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
Modified: hippo-cms7/addons/addon-search-service/trunk/pom.xml
===================================================================
--- hippo-cms7/addons/addon-search-service/trunk/pom.xml 2013-09-24
15:24:28 UTC (rev 40918)
+++ hippo-cms7/addons/addon-search-service/trunk/pom.xml 2013-09-24
15:55:51 UTC (rev 40919)
@@ -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,27 +365,11 @@
<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>
<id>default</id>
Modified: hippo-cms7/archetypes/trunk/pom.xml
===================================================================
--- hippo-cms7/archetypes/trunk/pom.xml 2013-09-24 15:24:28 UTC (rev 40918)
+++ hippo-cms7/archetypes/trunk/pom.xml 2013-09-24 15:55:51 UTC (rev 40919)
@@ -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 CMS7 Site Toolkit Maven Archetypes</name>
Modified: hippo-cms7/cms/trunk/pom.xml
===================================================================
--- hippo-cms7/cms/trunk/pom.xml 2013-09-24 15:24:28 UTC (rev 40918)
+++ hippo-cms7/cms/trunk/pom.xml 2013-09-24 15:55:51 UTC (rev 40919)
@@ -222,27 +222,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</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>
<id>default</id>
Modified: hippo-cms7/packages/trunk/pom.xml
===================================================================
--- hippo-cms7/packages/trunk/pom.xml 2013-09-24 15:24:28 UTC (rev 40918)
+++ hippo-cms7/packages/trunk/pom.xml 2013-09-24 15:55:51 UTC (rev 40919)
@@ -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 Product Packages</name>
Modified: hippo-cms7/project/trunk/pom.xml
===================================================================
--- hippo-cms7/project/trunk/pom.xml 2013-09-24 15:24:28 UTC (rev 40918)
+++ hippo-cms7/project/trunk/pom.xml 2013-09-24 15:55:51 UTC (rev 40919)
@@ -607,6 +607,7 @@
<version>${maven.plugin.javadoc.version}</version>
<configuration>
<source>1.7</source>
+ <javadocVersion>1.7</javadocVersion>
<links>
<link>http://download.oracle.com/javase/7/docs/api</link>
</links>
Modified: hippo-cms7/release/trunk/pom.xml
===================================================================
--- hippo-cms7/release/trunk/pom.xml 2013-09-24 15:24:28 UTC (rev 40918)
+++ hippo-cms7/release/trunk/pom.xml 2013-09-24 15:55:51 UTC (rev 40919)
@@ -51,19 +51,19 @@
<hippo.services.version>1.03.03-SNAPSHOT</hippo.services.version>
<hippo.services.eventbus.version>1.03.03-SNAPSHOT</hippo.services.eventbus.version>
<hippo.services.contenttype.version>1.03.01-SNAPSHOT</hippo.services.contenttype.version>
- <hippo.utilities.version>1.01.04</hippo.utilities.version>
+ <hippo.utilities.version>1.02.00-SNAPSHOT</hippo.utilities.version>
<forge.content-blocks.version>1.10.00-SNAPSHOT</forge.content-blocks.version>
<forge.dashboard-document-wizard.version>1.04.00-SNAPSHOT</forge.dashboard-document-wizard.version>
<forge.easy-forms.version>2.13.00-SNAPSHOT</forge.easy-forms.version>
<forge.ecm-tagging.version>4.06.00-SNAPSHOT</forge.ecm-tagging.version>
<forge.gallerypicker.version>1.12.00-SNAPSHOT</forge.gallerypicker.version>
- <forge.poll.version>1.06.01</forge.poll.version>
- <forge.properties.version>2.08.00</forge.properties.version>
+ <forge.poll.version>1.07.00-SNAPSHOT</forge.poll.version>
+ <forge.properties.version>2.09.00-SNAPSHOT</forge.properties.version>
<forge.relateddocs.version>2.09.00-SNAPSHOT</forge.relateddocs.version>
- <forge.robotstxt.version>1.06.00</forge.robotstxt.version>
+ <forge.robotstxt.version>1.07.00-SNAPSHOT</forge.robotstxt.version>
<forge.selection.version>2.07.00-SNAPSHOT</forge.selection.version>
- <forge.sitemap.version>1.04.00</forge.sitemap.version>
+ <forge.sitemap.version>1.05.00-SNAPSHOT</forge.sitemap.version>
<forge.taxonomy.version>1.10.00-SNAPSHOT</forge.taxonomy.version>
<forge.tcmp.version>1.08.00-SNAPSHOT</forge.tcmp.version>
Modified: hippo-cms7/repository/trunk/api/pom.xml
===================================================================
--- hippo-cms7/repository/trunk/api/pom.xml 2013-09-24 15:24:28 UTC (rev
40918)
+++ hippo-cms7/repository/trunk/api/pom.xml 2013-09-24 15:55:51 UTC (rev
40919)
@@ -56,11 +56,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <source>1.6</source>
<sourcepath>${basedir}/src/main/java</sourcepath>
- <links>
- <link>http://download.oracle.com/javase/6/docs/api</link>
- </links>
</configuration>
</plugin>
</plugins>
Modified: hippo-cms7/repository/trunk/pom.xml
===================================================================
--- hippo-cms7/repository/trunk/pom.xml 2013-09-24 15:24:28 UTC (rev 40918)
+++ hippo-cms7/repository/trunk/pom.xml 2013-09-24 15:55:51 UTC (rev 40919)
@@ -101,18 +101,14 @@
<build>
<plugins>
<plugin>
- <inherited>false</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
<author>false</author>
<show>protected</show>
- <source>1.6</source>
- <javadocVersion>1.6</javadocVersion>
<docfilessubdirs>true</docfilessubdirs>
<links>
- <link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://www.day.com/maven/jsr170/javadocs/jcr-2.0/</link>
</links>
</configuration>
Modified: hippo-cms7/services/services-contenttype/trunk/pom.xml
===================================================================
--- hippo-cms7/services/services-contenttype/trunk/pom.xml 2013-09-24
15:24:28 UTC (rev 40918)
+++ hippo-cms7/services/services-contenttype/trunk/pom.xml 2013-09-24
15:55:51 UTC (rev 40919)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
- <version>23</version>
+ <version>24-SNAPSHOT</version>
</parent>
<name>Hippo CMS7 Services - contenttype</name>
Modified: hippo-cms7/services/services-eventbus/trunk/pom.xml
===================================================================
--- hippo-cms7/services/services-eventbus/trunk/pom.xml 2013-09-24 15:24:28 UTC
(rev 40918)
+++ hippo-cms7/services/services-eventbus/trunk/pom.xml 2013-09-24 15:55:51 UTC
(rev 40919)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
- <version>23</version>
+ <version>24-SNAPSHOT</version>
</parent>
<name>Hippo CMS7 Services - eventbus</name>
Modified: hippo-cms7/site-toolkit/trunk/pom.xml
===================================================================
--- hippo-cms7/site-toolkit/trunk/pom.xml 2013-09-24 15:24:28 UTC (rev
40918)
+++ hippo-cms7/site-toolkit/trunk/pom.xml 2013-09-24 15:55:51 UTC (rev
40919)
@@ -712,27 +712,11 @@
<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>
<id>default</id>
Modified: hippo-cms7/utilities/trunk/pom.xml
===================================================================
--- hippo-cms7/utilities/trunk/pom.xml 2013-09-24 15:24:28 UTC (rev 40918)
+++ hippo-cms7/utilities/trunk/pom.xml 2013-09-24 15:55:51 UTC (rev 40919)
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
- <version>19</version>
+ <version>24-SNAPSHOT</version>
</parent>
<name>Hippo CMS7 Utilities</name>
Modified: hippo-demos/hippo-go-green/trunk/integration-tests/pom.xml
===================================================================
--- hippo-demos/hippo-go-green/trunk/integration-tests/pom.xml 2013-09-24
15:24:28 UTC (rev 40918)
+++ hippo-demos/hippo-go-green/trunk/integration-tests/pom.xml 2013-09-24
15:55:51 UTC (rev 40919)
@@ -123,10 +123,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
</plugin>
<plugin>
@@ -150,7 +146,7 @@
</executions>
<configuration>
<configuration>
- <home>${project.build.directory}/tomcat6x</home>
+
<home>${project.build.directory}/tomcat${cargo.tomcat.major.version}x</home>
<properties>
<cargo.remote.username>admin</cargo.remote.username>
<cargo.remote.password />
@@ -180,13 +176,13 @@
</deployables>
</configuration>
<container>
- <containerId>tomcat6x</containerId>
+ <containerId>tomcat${cargo.tomcat.major.version}x</containerId>
<systemProperties>
<repo.path>${project.build.directory}/storage</repo.path>
<log4j.configuration>file:${project.basedir}/../conf/log4j-dev.xml</log4j.configuration>
</systemProperties>
<zipUrlInstaller>
-
<url>http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz</url>
+ <url>${cargo.tomcat.distribution.url}</url>
</zipUrlInstaller>
<timeout>600000</timeout>
<dependencies>
_______________________________________________
Hippocms-svn mailing list
[email protected]
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
