portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r399848 [1/3] - in /portals/jetspeed-2/trunk: ./ ant-tasks/ app-servers/ applications/ applications/demo/ applications/gems/ applications/j2-admin/ applications/rss/ applications/rss/rss-jar/ applications/rss/rss-war/ commons/ components/ c...
Date Thu, 04 May 2006 20:24:28 GMT
Author: rwatler
Date: Thu May  4 13:24:19 2006
New Revision: 399848

URL: http://svn.apache.org/viewcvs?rev=399848&view=rev
Log:
upgrade M2 build for 2.0.4 and fix assorted archetype bugs

Added:
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/META-INF/
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/META-INF/context.xml   (with props)
Modified:
    portals/jetspeed-2/trunk/ant-tasks/pom.xml
    portals/jetspeed-2/trunk/app-servers/pom.xml
    portals/jetspeed-2/trunk/applications/demo/pom.xml
    portals/jetspeed-2/trunk/applications/gems/pom.xml
    portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
    portals/jetspeed-2/trunk/applications/pom.xml
    portals/jetspeed-2/trunk/applications/rss/pom.xml
    portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
    portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
    portals/jetspeed-2/trunk/commons/pom.xml
    portals/jetspeed-2/trunk/components/capability/pom.xml
    portals/jetspeed-2/trunk/components/cm/pom.xml
    portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
    portals/jetspeed-2/trunk/components/file-cache/pom.xml
    portals/jetspeed-2/trunk/components/header-resource/pom.xml
    portals/jetspeed-2/trunk/components/id-generator/pom.xml
    portals/jetspeed-2/trunk/components/jetspeed/pom.xml
    portals/jetspeed-2/trunk/components/locator/pom.xml
    portals/jetspeed-2/trunk/components/page-manager/pom.xml
    portals/jetspeed-2/trunk/components/pom.xml
    portals/jetspeed-2/trunk/components/portal-site/pom.xml
    portals/jetspeed-2/trunk/components/portal/pom.xml
    portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
    portals/jetspeed-2/trunk/components/prefs/pom.xml
    portals/jetspeed-2/trunk/components/profiler/pom.xml
    portals/jetspeed-2/trunk/components/rdbms/pom.xml
    portals/jetspeed-2/trunk/components/registry/pom.xml
    portals/jetspeed-2/trunk/components/rewriter/pom.xml
    portals/jetspeed-2/trunk/components/search/pom.xml
    portals/jetspeed-2/trunk/components/security-schema/pom.xml
    portals/jetspeed-2/trunk/components/security/pom.xml
    portals/jetspeed-2/trunk/components/serializer/pom.xml
    portals/jetspeed-2/trunk/components/sso/pom.xml
    portals/jetspeed-2/trunk/components/statistics/pom.xml
    portals/jetspeed-2/trunk/components/web-content/pom.xml
    portals/jetspeed-2/trunk/components/webapp-logging/pom.xml
    portals/jetspeed-2/trunk/content-server/pom.xml
    portals/jetspeed-2/trunk/etc/build.xml
    portals/jetspeed-2/trunk/etc/import/pom.xml
    portals/jetspeed-2/trunk/etc/pom.xml
    portals/jetspeed-2/trunk/jetspeed-api/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/META-INF/archetype.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/src/archetype/archetype-resources/src/webapp/WEB-INF/velocity/toolbox.xml
    portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/component/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal-component/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/applications/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/components/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/shared-component/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/pom.xml
    portals/jetspeed-2/trunk/portal/pom.xml
    portals/jetspeed-2/trunk/taglibs/pom.xml
    portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml

Modified: portals/jetspeed-2/trunk/ant-tasks/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/ant-tasks/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/pom.xml (original)
+++ portals/jetspeed-2/trunk/ant-tasks/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>ant-tasks</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>app-servers</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -145,37 +146,6 @@
                     </execution>
 
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
 

Modified: portals/jetspeed-2/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>demo</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>applications</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>
@@ -142,37 +143,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/applications/gems/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/gems/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/gems/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>portals-gems</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>applications</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>j2-admin</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>applications</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>
@@ -169,37 +170,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/applications/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>applications</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/applications/rss/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>rss-applications</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>applications</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-rss</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>rss-applications</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>rss</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>rss-applications</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>
@@ -121,37 +122,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
 

Modified: portals/jetspeed-2/trunk/commons/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/commons/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/commons/pom.xml (original)
+++ portals/jetspeed-2/trunk/commons/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-commons</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -85,37 +86,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/capability/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/capability/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-capability</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -95,37 +96,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/cm/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/cm/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-cm</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -147,37 +148,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-deploy-tools</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -110,37 +111,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/file-cache/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/file-cache/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-file-cache</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -97,37 +98,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/header-resource/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/header-resource/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-header-resource</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -73,37 +74,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/id-generator/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/id-generator/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-id-generator</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -85,37 +86,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/jetspeed/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/jetspeed/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-components</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -89,37 +90,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/locator/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/locator/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-locator</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -85,37 +86,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/page-manager/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-page-manager</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -146,37 +147,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>components</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>jetspeed-2</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -196,13 +197,18 @@
                         <!--
                             Note: using forking to prevent module test case connection
                             pools and spring crosstalk via surefire isolation class
-                            loaders when multipe modules are built, (e.g. components/registry).
+                            loaders when multiple modules are built, (e.g. components/registry).
                             Specifying a fork option also sets appropriate working
                             directory for test via default basedir configuration.
                             This setting also has ramifactions for embedded databases
                             that lock access to a single JVM instance, (e.g. derby).
                         -->
                         <forkMode>once</forkMode>
+                        <!--
+                            Note: some component tests depend on current working directory
+                            being set to the project base directory to locate test data.
+                        -->
+                        <workingDirectory>${basedir}</workingDirectory>
                     </configuration>
                 </plugin>
 

Modified: portals/jetspeed-2/trunk/components/portal-site/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-portal-site</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -125,37 +126,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-portal</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -244,37 +245,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portlet-factory/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portlet-factory/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portlet-factory/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-portlet-factory</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -85,37 +86,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/prefs/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-prefs</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -105,37 +106,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/profiler/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-profiler</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -101,37 +102,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/rdbms/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-rdbms</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -106,37 +107,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/registry/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-registry</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -142,37 +143,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/rewriter/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rewriter/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-rewriter</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -116,37 +117,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/search/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/search/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/search/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/search/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-search</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -93,37 +94,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/security-schema/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security-schema/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security-schema/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security-schema/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-security-schema</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -94,37 +95,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/security/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-security</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -140,37 +141,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/components/serializer/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/serializer/pom.xml?rev=399848&r1=399847&r2=399848&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/pom.xml Thu May  4 13:24:19 2006
@@ -21,16 +21,17 @@
          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.4</maven>
+    </prerequisites>
 
     <!-- POM Identification -->
 
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <version>2.1-dev</version>
     <artifactId>jetspeed-serializer</artifactId>
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
-        <version>2.1-dev</version>
         <artifactId>components</artifactId>
+        <version>2.1-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -97,37 +98,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <!--
-                    Bug: All plugin dependencies must be copied to the first instance
-                    of the maven-antrun-plugin run, (e.g. to the root pom), since the
-                    first set of deps sticks for the entire maven2 execution cycle.
-                    Bug: Plugin dependencies are not propagated from pluginManagement.
-                    Bug: Versions must be specified here and not in dependencyManagement.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven</groupId>
-                        <artifactId>maven-artifact-ant</artifactId>
-                        <version>${org.apache.maven.artifact.ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message