You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@portals.apache.org by at...@apache.org on 2011/09/29 10:54:17 UTC
svn commit: r1177224 - in /portals/site: applications/pom.xml
bridges/pom.xml jetspeed/pom.xml parent/ parent/pom.xml pluto/pom.xml pom.xml
Author: ate
Date: Thu Sep 29 08:54:16 2011
New Revision: 1177224
URL: http://svn.apache.org/viewvc?rev=1177224&view=rev
Log:
With the upgrade of the main site being now based on maven-2, site inheritance "kicks in" for sub projects having the portals-site pom as parent.
This results in (at least) breadcrumb links being inherited and I see no way to turn this off!
To fix this, I've introduces a new portals-site-parent pom and moving all the primary meta-data like developers info into it.
All "site" poms now inherit from this new portals-site-parent pom instead, so the site inheritance doesn't interfer anymore.
Added:
portals/site/parent/
portals/site/parent/pom.xml (with props)
Modified:
portals/site/applications/pom.xml
portals/site/bridges/pom.xml
portals/site/jetspeed/pom.xml
portals/site/pluto/pom.xml
portals/site/pom.xml
Modified: portals/site/applications/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/applications/pom.xml?rev=1177224&r1=1177223&r2=1177224&view=diff
==============================================================================
--- portals/site/applications/pom.xml (original)
+++ portals/site/applications/pom.xml Thu Sep 29 08:54:16 2011
@@ -29,11 +29,14 @@
<name>Portals Applications Documentation</name>
<description>Apache Portals Applications Site Documentation</description>
+
<parent>
- <groupId>org.apache.portals.site</groupId>
- <artifactId>portals-site</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.portals.site</groupId>
+ <artifactId>portals-site-parent</artifactId>
+ <relativePath>../parent/pom.xml</relativePath>
+ <version>1.0</version>
</parent>
+
<packaging>pom</packaging>
<!-- Copied following sections below from applications-pom to be able to generate the Project reports -->
Modified: portals/site/bridges/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/bridges/pom.xml?rev=1177224&r1=1177223&r2=1177224&view=diff
==============================================================================
--- portals/site/bridges/pom.xml (original)
+++ portals/site/bridges/pom.xml Thu Sep 29 08:54:16 2011
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<prerequisites>
- <maven>2.0.9</maven>
+ <maven>2.2.1</maven>
</prerequisites>
<artifactId>bridges-site</artifactId>
@@ -30,9 +30,10 @@
<name>Portals Bridges Documentation</name>
<description>Apache Portals Bridges Site Documentation</description>
<parent>
- <groupId>org.apache.portals.site</groupId>
- <artifactId>portals-site</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.portals.site</groupId>
+ <artifactId>portals-site-parent</artifactId>
+ <relativePath>../parent/pom.xml</relativePath>
+ <version>1.0</version>
</parent>
<packaging>pom</packaging>
Modified: portals/site/jetspeed/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/pom.xml?rev=1177224&r1=1177223&r2=1177224&view=diff
==============================================================================
--- portals/site/jetspeed/pom.xml (original)
+++ portals/site/jetspeed/pom.xml Thu Sep 29 08:54:16 2011
@@ -30,9 +30,10 @@
<name>Jetspeed Documentation</name>
<description>Jetspeed Site Documentation</description>
<parent>
- <groupId>org.apache.portals.site</groupId>
- <artifactId>portals-site</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.portals.site</groupId>
+ <artifactId>portals-site-parent</artifactId>
+ <relativePath>../parent/pom.xml</relativePath>
+ <version>1.0</version>
</parent>
<packaging>pom</packaging>
@@ -48,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0</version>
+ <version>3.0</version>
</plugin>
</plugins>
</build>
Added: portals/site/parent/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/parent/pom.xml?rev=1177224&view=auto
==============================================================================
--- portals/site/parent/pom.xml (added)
+++ portals/site/parent/pom.xml Thu Sep 29 08:54:16 2011
@@ -0,0 +1,292 @@
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.2.1</maven>
+ </prerequisites>
+ <groupId>org.apache.portals.site</groupId>
+ <artifactId>portals-site-parent</artifactId>
+ <version>1.0</version>
+ <name>Apache Portals</name>
+ <packaging>pom</packaging>
+ <description>
+ Apache Portals Site parent pom
+ </description>
+ <!-- Comment out for site-plugin not to change the absolute urls starting with the following url to a relative urls.
+ <url>http://portals.apache.org</url>
+ -->
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <inceptionYear>2004</inceptionYear>
+ <developers>
+ <developer>
+ <name>David Sean Taylor</name>
+ <id>taylor</id>
+ <email>taylor@apache.org</email>
+ <roles>
+ <role>PMC Chair</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Ate Douma</name>
+ <id>ate</id>
+ <email>ate@apache.org</email>
+ <timezone>+2</timezone>
+ <organization>Hippo</organization>
+ <organizationUrl>http://www.onehippo.com</organizationUrl>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Shinsuke Sugaya</name>
+ <id>shinsuke</id>
+ <email>shinsuke@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+
+ <developer>
+ <name>Michael Blum</name>
+ <id>blumm</id>
+ <email>blumm#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Carsten Ziegeler</name>
+ <id>cziegeler</id>
+ <email>cziegeler#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Jeremy Ford</name>
+ <id>jford</id>
+ <email>jford@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>David Le Strat</name>
+ <id>dls</id>
+ <email>dlestrat@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Randy Watler</name>
+ <id>rwatler</id>
+ <email>rwatler@apache.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Scott Weaver</name>
+ <id>weaver</id>
+ <email>Sweaver@rippe.com</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Vivek Kumar</name>
+ <id>vkumar</id>
+ <email>vkumar#a@T#apache.d0t.org</email>
+ <timezone>+5.5</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Dennis Dam</name>
+ <id>ddam</id>
+ <email>ddam@apache.org</email>
+ <timezone>+2</timezone>
+ <organization>Hippo</organization>
+ <organizationUrl>http://www.onehippo.com</organizationUrl>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>David DeWolf</name>
+ <id>ddewolf</id>
+ <email>ddewolf@apache.org</email>
+ <timezone>-4</timezone>
+ <url>http://www.daviddewolf.com</url>
+ <organization>Three Pillar Software, Inc.</organization>
+ <organizationUrl>http://www.threepillarsoftware.com</organizationUrl>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Nick Lothian</name>
+ <id>nlothian</id>
+ <email>nlothian#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Craig Doremus</name>
+ <id>cdoremus</id>
+ <email>cdoremus#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Zhong Zheng</name>
+ <id>zheng</id>
+ <email>zheng#a@T#apache.d0t.org</email>
+ <timezone>+1</timezone>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+
+ <developer>
+ <name>Mark Orciuch</name>
+ <id>mark</id>
+ <email>mark_oriuch at nqsltd.com</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+
+ <developer>
+ <name>Santiago Gala</name>
+ <id>sgala</id>
+ <email>sgala#a@T#hisitech.d0t.com</email>
+ <organization />
+ </developer>
+
+ <developer>
+ <name>Raphael Luta</name>
+ <id>raphael</id>
+ <email>raphael#a@T#apache.d0t.org</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Scott T. Weaver</name>
+ <id>weaver</id>
+ <email>weaver#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Stefan Hepper</name>
+ <id>sthepper</id>
+ <email>sthepper#a@T#apache.d0t.org</email>
+ </developer>
+
+ <developer>
+ <name>Elliot Metsger</name>
+ <id>esm</id>
+ <email>esm#a@T#apache.d0t.org</email>
+ <timezone>-4</timezone>
+ <url>http://uppertank.net/blog</url>
+ <organization>Johns Hopkins University, Sheridan Libraries
+ </organization>
+ <organizationUrl>http://www.library.jhu.edu</organizationUrl>
+ </developer>
+ <developer>
+ <name>Woonsan Ko</name>
+ <id>woonsan</id>
+ <email>woonsan@apache.org</email>
+ <timezone>+9</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jeffrey D. Brekke</name>
+ <id>jeffry</id>
+ <email>ekkerbj#a@T#netscape.d0t.net</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Neeme Praks</name>
+ <id>neeme</id>
+ <email>neeme#a@T#one.d0t.v</email>
+ <organization />
+ </developer>
+
+ <developer>
+ <name>Jeff Prickett</name>
+ <id>prickett</id>
+ <email>jeffprickett#a@T#mindspring.d0t.com</email>
+ <organization />
+ </developer>
+
+ <developer>
+ <name>Ingo Schuster</name>
+ <id>ingo</id>
+ <email>ingo#a@T#raleigh.d0t.ibm.d0t.com</email>
+ <organization />
+ </developer>
+
+ <developer>
+ <name>Paul Spencer</name>
+ <id>paulsp</id>
+ <email>paulsp#a@T#apache.d0t.org</email>
+ <organization />
+ </developer>
+ <developer>
+ <name>Roger Ruttimann</name>
+ <id>roger</id>
+ <email>roger.ruttimann#a@T#earthlink.d0t.net</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jun Yang</name>
+ <id>jyang</id>
+ <email>jyang#a@T#apache.d0t.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>David Jencks</name>
+ <id>djencks</id>
+ <email>djencks#a@T#apache.d0t.org</email>
+ <roles>
+ <role>Occasional Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Michael Westbay</name>
+ <email>westbay#a@T#users.d0t.sourceforge.d0t.net</email>
+ </contributor>
+ <contributor>
+ <name>Ken Weiner</name>
+ <email>kweiner#a@T#unicon.d0t.net</email>
+ </contributor>
+ <contributor>
+ <name>Ken Atherton</name>
+ <email>katherto#a@T#visa.d0t.com</email>
+ </contributor>
+ <contributor>
+ <name>David Hay</name>
+ </contributor>
+ </contributors>
+
+</project>
\ No newline at end of file
Propchange: portals/site/parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/site/parent/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/site/parent/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/site/pluto/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/pluto/pom.xml?rev=1177224&r1=1177223&r2=1177224&view=diff
==============================================================================
--- portals/site/pluto/pom.xml (original)
+++ portals/site/pluto/pom.xml Thu Sep 29 08:54:16 2011
@@ -30,9 +30,10 @@
<name>Pluto Documentation</name>
<description>Pluto Site Documentation</description>
<parent>
- <groupId>org.apache.portals.site</groupId>
- <artifactId>portals-site</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.portals.site</groupId>
+ <artifactId>portals-site-parent</artifactId>
+ <relativePath>../parent/pom.xml</relativePath>
+ <version>1.0</version>
</parent>
<packaging>pom</packaging>
Modified: portals/site/pom.xml
URL: http://svn.apache.org/viewvc/portals/site/pom.xml?rev=1177224&r1=1177223&r2=1177224&view=diff
==============================================================================
--- portals/site/pom.xml (original)
+++ portals/site/pom.xml Thu Sep 29 08:54:16 2011
@@ -2,291 +2,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<prerequisites>
- <maven>2.0.9</maven>
+ <maven>2.2.1</maven>
</prerequisites>
- <groupId>org.apache.portals.site</groupId>
<artifactId>portals-site</artifactId>
- <version>1.0</version>
+ <parent>
+ <groupId>org.apache.portals.site</groupId>
+ <artifactId>portals-site-parent</artifactId>
+ <relativePath>parent/pom.xml</relativePath>
+ <version>1.0</version>
+ </parent>
<name>Apache Portals</name>
<packaging>pom</packaging>
<description>
Apache Portals Site project
-</description>
- <!-- Comment out for site-plugin not to change the absolute urls starting with the following url to a relative urls.
- <url>http://portals.apache.org</url>
- -->
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <inceptionYear>2004</inceptionYear>
- <developers>
- <developer>
- <name>David Sean Taylor</name>
- <id>taylor</id>
- <email>taylor@apache.org</email>
- <roles>
- <role>PMC Chair</role>
- </roles>
- </developer>
- <developer>
- <name>Ate Douma</name>
- <id>ate</id>
- <email>ate@apache.org</email>
- <timezone>+2</timezone>
- <organization>Hippo</organization>
- <organizationUrl>http://www.onehippo.com</organizationUrl>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Shinsuke Sugaya</name>
- <id>shinsuke</id>
- <email>shinsuke@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
-
- <developer>
- <name>Michael Blum</name>
- <id>blumm</id>
- <email>blumm#a@T#apache.d0t.org</email>
- </developer>
-
- <developer>
- <name>Carsten Ziegeler</name>
- <id>cziegeler</id>
- <email>cziegeler#a@T#apache.d0t.org</email>
- </developer>
-
- <developer>
- <name>Jeremy Ford</name>
- <id>jford</id>
- <email>jford@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>David Le Strat</name>
- <id>dls</id>
- <email>dlestrat@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Randy Watler</name>
- <id>rwatler</id>
- <email>rwatler@apache.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Scott Weaver</name>
- <id>weaver</id>
- <email>Sweaver@rippe.com</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Vivek Kumar</name>
- <id>vkumar</id>
- <email>vkumar#a@T#apache.d0t.org</email>
- <timezone>+5.5</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Dennis Dam</name>
- <id>ddam</id>
- <email>ddam@apache.org</email>
- <timezone>+2</timezone>
- <organization>Hippo</organization>
- <organizationUrl>http://www.onehippo.com</organizationUrl>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>David DeWolf</name>
- <id>ddewolf</id>
- <email>ddewolf@apache.org</email>
- <timezone>-4</timezone>
- <url>http://www.daviddewolf.com</url>
- <organization>Three Pillar Software, Inc.</organization>
- <organizationUrl>http://www.threepillarsoftware.com</organizationUrl>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Nick Lothian</name>
- <id>nlothian</id>
- <email>nlothian#a@T#apache.d0t.org</email>
- </developer>
-
- <developer>
- <name>Craig Doremus</name>
- <id>cdoremus</id>
- <email>cdoremus#a@T#apache.d0t.org</email>
- </developer>
-
- <developer>
- <name>Zhong Zheng</name>
- <id>zheng</id>
- <email>zheng#a@T#apache.d0t.org</email>
- <timezone>+1</timezone>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
-
- <developer>
- <name>Mark Orciuch</name>
- <id>mark</id>
- <email>mark_oriuch at nqsltd.com</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Santiago Gala</name>
- <id>sgala</id>
- <email>sgala#a@T#hisitech.d0t.com</email>
- <organization />
- </developer>
-
- <developer>
- <name>Raphael Luta</name>
- <id>raphael</id>
- <email>raphael#a@T#apache.d0t.org</email>
- <organization />
- </developer>
- <developer>
- <name>Scott T. Weaver</name>
- <id>weaver</id>
- <email>weaver#a@T#apache.d0t.org</email>
- </developer>
-
- <developer>
- <name>Stefan Hepper</name>
- <id>sthepper</id>
- <email>sthepper#a@T#apache.d0t.org</email>
- </developer>
-
- <developer>
- <name>Elliot Metsger</name>
- <id>esm</id>
- <email>esm#a@T#apache.d0t.org</email>
- <timezone>-4</timezone>
- <url>http://uppertank.net/blog</url>
- <organization>Johns Hopkins University, Sheridan Libraries
- </organization>
- <organizationUrl>http://www.library.jhu.edu</organizationUrl>
- </developer>
- <developer>
- <name>Woonsan Ko</name>
- <id>woonsan</id>
- <email>woonsan@apache.org</email>
- <timezone>+9</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Jeffrey D. Brekke</name>
- <id>jeffry</id>
- <email>ekkerbj#a@T#netscape.d0t.net</email>
- <organization />
- </developer>
- <developer>
- <name>Neeme Praks</name>
- <id>neeme</id>
- <email>neeme#a@T#one.d0t.v</email>
- <organization />
- </developer>
-
- <developer>
- <name>Jeff Prickett</name>
- <id>prickett</id>
- <email>jeffprickett#a@T#mindspring.d0t.com</email>
- <organization />
- </developer>
-
- <developer>
- <name>Ingo Schuster</name>
- <id>ingo</id>
- <email>ingo#a@T#raleigh.d0t.ibm.d0t.com</email>
- <organization />
- </developer>
-
- <developer>
- <name>Paul Spencer</name>
- <id>paulsp</id>
- <email>paulsp#a@T#apache.d0t.org</email>
- <organization />
- </developer>
- <developer>
- <name>Roger Ruttimann</name>
- <id>roger</id>
- <email>roger.ruttimann#a@T#earthlink.d0t.net</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Jun Yang</name>
- <id>jyang</id>
- <email>jyang#a@T#apache.d0t.org</email>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>David Jencks</name>
- <id>djencks</id>
- <email>djencks#a@T#apache.d0t.org</email>
- <roles>
- <role>Occasional Java Developer</role>
- </roles>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Michael Westbay</name>
- <email>westbay#a@T#users.d0t.sourceforge.d0t.net</email>
- </contributor>
- <contributor>
- <name>Ken Weiner</name>
- <email>kweiner#a@T#unicon.d0t.net</email>
- </contributor>
- <contributor>
- <name>Ken Atherton</name>
- <email>katherto#a@T#visa.d0t.com</email>
- </contributor>
- <contributor>
- <name>David Hay</name>
- </contributor>
- </contributors>
-
+ </description>
</project>
\ No newline at end of file