portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r377110 - in /portals/jetspeed-2/trunk: ./ app-servers/ applications/demo/ applications/j2-admin/ applications/jetspeed/ applications/rss/rss-war/ components/deploy-tool/ components/page-manager/ components/portal-site/ etc/
Date Sun, 12 Feb 2006 02:23:58 GMT
Author: rwatler
Date: Sat Feb 11 18:23:56 2006
New Revision: 377110

URL: http://svn.apache.org/viewcvs?rev=377110&view=rev
Log:
maven2 build checkpoint: fix packaging issues and ant plugin execution/deps

Added:
    portals/jetspeed-2/trunk/components/deploy-tool/build.xml   (with props)
Modified:
    portals/jetspeed-2/trunk/app-servers/build.xml
    portals/jetspeed-2/trunk/app-servers/pom.xml
    portals/jetspeed-2/trunk/applications/demo/pom.xml
    portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
    portals/jetspeed-2/trunk/applications/jetspeed/build.xml
    portals/jetspeed-2/trunk/applications/jetspeed/pom.xml
    portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
    portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
    portals/jetspeed-2/trunk/components/page-manager/build.xml
    portals/jetspeed-2/trunk/components/portal-site/build.xml
    portals/jetspeed-2/trunk/etc/build.xml
    portals/jetspeed-2/trunk/etc/pom.xml
    portals/jetspeed-2/trunk/pom.xml

Modified: portals/jetspeed-2/trunk/app-servers/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/build.xml?rev=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/build.xml Sat Feb 11 18:23:56 2006
@@ -189,7 +189,7 @@
         <!-- Generate and deploy application context file -->
         <delete file="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/jetspeed.xml"/>
         <copy todir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
-            <fileset dir="../etc/conf/tomcat">
+            <fileset dir="${basedir}/../etc/conf/tomcat">
                 <include name="jetspeed-tomcat-5.xml" unless="org.apache.jetspeed.tomcat.5.5"/>

                 <include name="jetspeed-tomcat-5.5.xml" if="org.apache.jetspeed.tomcat.5.5"/>

             </fileset>

Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/pom.xml?rev=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Sat Feb 11 18:23:56 2006
@@ -98,6 +98,37 @@
                     </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=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/pom.xml Sat Feb 11 18:23:56 2006
@@ -81,6 +81,16 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
+            <groupId>velocity-tools</groupId>
+            <artifactId>velocity-tools</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <scope>runtime</scope>

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=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/pom.xml Sat Feb 11 18:23:56 2006
@@ -98,6 +98,31 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
+            <groupId>myfaces</groupId>
+            <artifactId>myfaces-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>myfaces</groupId>
+            <artifactId>tomahawk</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>velocity-tools</groupId>
+            <artifactId>velocity-tools</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>runtime</scope>

Modified: portals/jetspeed-2/trunk/applications/jetspeed/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed/build.xml?rev=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed/build.xml (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed/build.xml Sat Feb 11 18:23:56 2006
@@ -46,14 +46,14 @@
     <target name="configure">
 
         <!-- Build webapp resources -->        
-        <delete dir="target/webapp"/>
-        <mkdir dir="target/webapp"/>
-        <copy todir="target/webapp">
-            <fileset dir="../../src/webapp"/>
+        <delete dir="${basedir}/target/webapp"/>
+        <mkdir dir="${basedir}/target/webapp"/>
+        <copy todir="${basedir}/target/webapp">
+            <fileset dir="${basedir}/../../src/webapp"/>
         </copy>
 
         <!-- Configure runtime configuration propertiee resource -->
-        <replace file="target/webapp/WEB-INF/conf/jetspeed.properties">
+        <replace file="${basedir}/target/webapp/WEB-INF/conf/jetspeed.properties">
             <replacefilter token="@AUTODEPLOYMENT_SERVER@"
                            value="${org.apache.jetspeed.services.autodeployment.server}"/>
             <replacefilter token="@AUTODEPLOYMENT_USER@"
@@ -67,9 +67,9 @@
         </replace>
 
         <!-- Build OJB resources -->        
-        <mkdir dir="target/webapp/WEB-INF/classes"/>
-        <copy todir="target/webapp/WEB-INF/classes">
-            <fileset dir="../../etc/db-ojb"/>
+        <mkdir dir="${basedir}/target/webapp/WEB-INF/classes"/>
+        <copy todir="${basedir}/target/webapp/WEB-INF/classes">
+            <fileset dir="${basedir}/../../etc/db-ojb"/>
         </copy>
 
     </target>

Modified: portals/jetspeed-2/trunk/applications/jetspeed/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed/pom.xml?rev=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed/pom.xml Sat Feb 11 18:23:56 2006
@@ -63,7 +63,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
 
-                    <!-- deploy to application server -->
+                    <!-- configure resources -->
                     <execution>
                         <id>jetspeed-resources</id>
                         <phase>process-resources</phase>
@@ -102,94 +102,132 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>content-server</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-cm</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-components</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-deploy-tools</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-rdbms</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-prefs</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-search</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-security</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-registry</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-id-generator</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-file-cache</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-locator</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-capability</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-profiler</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-page-manager</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-portal-site</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-portlet-factory</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-sso</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-statistics</artifactId>
+            <scope>runtime</scope>
         </dependency>        
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-header-resource</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-portal</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>request</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
     </dependencies>

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=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml Sat Feb 11 18:23:56 2006
@@ -69,6 +69,16 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
+            <groupId>velocity-tools</groupId>
+            <artifactId>velocity-tools</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>runtime</scope>

Added: portals/jetspeed-2/trunk/components/deploy-tool/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/deploy-tool/build.xml?rev=377110&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/build.xml (added)
+++ portals/jetspeed-2/trunk/components/deploy-tool/build.xml Sat Feb 11 18:23:56 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+  $Id:$
+-->
+<project name="deploy-tool" default="help">
+
+    <!-- Usage -->
+
+    <target name="help">
+        <echo message="Buildfile for the deploy-tool maven POM."/>
+        <echo message="Usage: ant [ resources ]"/>
+        <echo message="Where:"/>
+        <echo message="    resources - setup infusion resources."/>
+    </target>
+
+    <!-- Resources -->
+
+    <target name="resources">
+
+        <mkdir dir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy"/>
+        <copy file="${basedir}/../../src/webapp/WEB-INF/tld/portlet.tld"
+              todir="${basedir}/target/classes/org/apache/jetspeed/tools/deploy"/>
+
+    </target>
+
+</project>

Propchange: portals/jetspeed-2/trunk/components/deploy-tool/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/pom.xml Sat Feb 11 18:23:56 2006
@@ -63,6 +63,31 @@
 
     </dependencies>
 
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>page-manager-testdata</id>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="resources" antfile="build.xml" dir="${basedir}"
inheritall="off"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <!-- Project Information -->
 
     <scm>

Modified: portals/jetspeed-2/trunk/components/page-manager/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/build.xml?rev=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/build.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/build.xml Sat Feb 11 18:23:56 2006
@@ -31,10 +31,10 @@
 
     <target name="testdata">
 
-        <delete dir="target/testdata"/>
-        <mkdir dir="target"/>
-        <copy todir="target/testdata">
-            <fileset dir="testdata"/>
+        <delete dir="${basedir}/target/testdata"/>
+        <mkdir dir="${basedir}/target"/>
+        <copy todir="${basedir}/target/testdata">
+            <fileset dir="${basedir}/testdata"/>
         </copy>
 
     </target>

Modified: portals/jetspeed-2/trunk/components/portal-site/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/build.xml?rev=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/build.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/build.xml Sat Feb 11 18:23:56 2006
@@ -31,10 +31,10 @@
 
     <target name="testdata">
 
-        <delete dir="target/testdata"/>
-        <mkdir dir="target"/>
-        <copy todir="target/testdata">
-            <fileset dir="testdata"/>
+        <delete dir="${basedir}/target/testdata"/>
+        <mkdir dir="${basedir}/target"/>
+        <copy todir="${basedir}/target/testdata">
+            <fileset dir="${basedir}/testdata"/>
         </copy>
 
     </target>

Modified: portals/jetspeed-2/trunk/etc/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/build.xml?rev=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/build.xml (original)
+++ portals/jetspeed-2/trunk/etc/build.xml Sat Feb 11 18:23:56 2006
@@ -49,10 +49,11 @@
 
     <target name="help">
         <echo message="Buildfile for the etc maven POM."/>
-        <echo message="Usage: ant [ schema | populate ]"/>
+        <echo message="Usage: ant [ schema | populate-db | populate-db-userinfo ]"/>
         <echo message="Where:"/>
         <echo message="    schema - build schema for database."/>
-        <echo message="    populate - build and populate database instance."/>
+        <echo message="    populate-db - build and minimally populate database instance."/>
+        <echo message="    populate-db-userinfo - build and populate database instance
with default users."/>
         <echo message="Configuration:"/>
         <echo message="    org.apache.jetspeed.database.skip=${org.apache.jetspeed.database.skip}"/>
         <echo message="    org.apache.jetspeed.database.default.name=${org.apache.jetspeed.database.default.name}"/>
@@ -245,7 +246,7 @@
 
     <!-- Populate Database -->
 
-    <target name="populate" depends="populate-skip" unless="org.apache.jetspeed.skip">
+    <target name="populate-db" depends="populate-skip" unless="org.apache.jetspeed.skip">
 
         <!-- execute drop scripts -->
         <antcall target="sql-execute">
@@ -265,6 +266,17 @@
         <antcall target="sql-execute">
             <param name="database.arg.scripts.dir" value="${org.apache.jetspeed.target.sql}"/>
             <param name="database.arg.scripts" value="populate-db-default.sql"/>
+            <param name="database.arg.onerror" value="abort"/>
+        </antcall>
+
+    </target>
+
+    <target name="populate-db-userinfo" depends="populate-db" unless="org.apache.jetspeed.skip">
+
+        <!-- execute default userinfo population scripts -->
+        <antcall target="sql-execute">
+            <param name="database.arg.scripts.dir" value="${org.apache.jetspeed.target.sql}"/>
+            <param name="database.arg.scripts" value="populate-userinfo-for-default-psml.sql"/>
             <param name="database.arg.onerror" value="abort"/>
         </antcall>
 

Modified: portals/jetspeed-2/trunk/etc/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/pom.xml?rev=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/pom.xml Sat Feb 11 18:23:56 2006
@@ -74,7 +74,7 @@
                         <phase>generate-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant target="populate" antfile="build.xml" dir="${basedir}"
inheritall="off">
+                                <ant target="populate-db" antfile="build.xml" dir="${basedir}"
inheritall="off">
                                     <property name="org.apache.jetspeed.database.skip"
                                               value="${org.apache.jetspeed.env.skip.test}"/>
                                     <property name="org.apache.jetspeed.database.default.name"
@@ -103,7 +103,7 @@
                         <phase>install</phase>
                         <configuration>
                             <tasks>
-                                <ant target="populate" antfile="build.xml" dir="${basedir}"
inheritall="off">
+                                <ant target="populate-db-userinfo" antfile="build.xml"
dir="${basedir}" inheritall="off">
                                     <property name="org.apache.jetspeed.database.skip"
                                               value="${org.apache.jetspeed.env.skip.production}"/>
                                     <property name="org.apache.jetspeed.database.default.name"
@@ -127,6 +127,57 @@
                     </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>torque</groupId>
+                        <artifactId>torque</artifactId>
+                        <version>${torque.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>jndi</groupId>
+                                <artifactId>jndi</artifactId>
+                            </exclusion>
+                            <exclusion>
+                                <groupId>javax.sql</groupId>
+                                <artifactId>jdbc-stdext</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
+                    <dependency>
+                        <groupId>torque</groupId>
+                        <artifactId>torque-gen</artifactId>
+                        <version>${torque.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>torque</groupId>
+                        <artifactId>torque-gen-templates</artifactId>
+                        <version>${torque.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=377110&r1=377109&r2=377110&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Sat Feb 11 18:23:56 2006
@@ -901,20 +901,23 @@
             </plugins>
         </pluginManagement>    
 
-        <!-- Plugin Dependencies -->
+        <!--
+            Bug: All plugin dependencies must be copied to the first instance
+            of the maven-antrun-plugin run, (e.g. here in 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.
+        -->
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <!--
-                    Bug: Plugin dependencies must be in parent POM since they can only be
-                    defined once.
-                    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.
-                -->
+                <inherited>false</inherited>
                 <dependencies>
+
+                    <!-- Ant -->
                     <dependency>
                         <groupId>ant</groupId>
                         <artifactId>ant</artifactId>
@@ -930,11 +933,15 @@
                         <artifactId>ant-nodeps</artifactId>
                         <version>${ant.version}</version>
                     </dependency>
+
+                    <!-- Maven AntLib -->
                     <dependency>
                         <groupId>org.apache.maven</groupId>
                         <artifactId>maven-artifact-ant</artifactId>
                         <version>${org.apache.maven.artifact.ant.version}</version>
                     </dependency>
+
+                    <!-- Torque -->
                     <dependency>
                         <groupId>torque</groupId>
                         <artifactId>torque</artifactId>
@@ -957,14 +964,10 @@
                     </dependency>
                     <dependency>
                         <groupId>torque</groupId>
-                        <artifactId>torque-gen</artifactId>
-                        <version>${torque.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
                         <artifactId>torque-gen-templates</artifactId>
                         <version>${torque.version}</version>
                     </dependency>
+
                 </dependencies>
             </plugin>
         </plugins>



---------------------------------------------------------------------
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