portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r929910 - in /portals/jetspeed-2/portal/trunk: jetspeed-archetype/ jetspeed-archetype/pom.xml maven/jetspeed-archetype/ maven/pom.xml pom.xml
Date Thu, 01 Apr 2010 10:37:54 GMT
Author: rwatler
Date: Thu Apr  1 10:37:54 2010
New Revision: 929910

URL: http://svn.apache.org/viewvc?rev=929910&view=rev
Log:
JS2-1158: move jetspeed-archetype out of maven module to let it run last after applications
are built

Added:
    portals/jetspeed-2/portal/trunk/jetspeed-archetype/
      - copied from r929903, portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/
Removed:
    portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/
Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml
    portals/jetspeed-2/portal/trunk/maven/pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml?rev=929910&r1=929903&r2=929910&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-archetype/pom.xml Thu Apr  1 10:37:54 2010
@@ -25,12 +25,26 @@
   <artifactId>jetspeed-archetype</artifactId>
   <description>Jetspeed 2 Maven Archetype</description>
   <name>Jetspeed 2 Maven Archetype</name>
-  <packaging>maven-archetype</packaging>
   <parent>
     <groupId>org.apache.portals.jetspeed-2</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>jetspeed-2</artifactId>
     <version>2.2.1-SNAPSHOT</version>
   </parent>
+  <packaging>maven-archetype</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>jetspeed-portal-resources</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>jetspeed</artifactId>
+      <version>${pom.version}</version>
+      <type>war</type>
+    </dependency>
+  </dependencies>
 
   <build>
     <extensions>

Modified: portals/jetspeed-2/portal/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/pom.xml?rev=929910&r1=929909&r2=929910&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/pom.xml Thu Apr  1 10:37:54 2010
@@ -42,7 +42,6 @@
     <module>jetspeed-unpack-war-maven-plugin</module>
     <module>jetspeed-deploy-maven-plugin</module>
     <module>jetspeed-db-maven-plugin</module>
-    <module>jetspeed-archetype</module>
     <module>jetspeed-fileutils-maven-plugin</module>
     <module>jetspeed-maven-skin</module>
   </modules>

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=929910&r1=929909&r2=929910&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Thu Apr  1 10:37:54 2010
@@ -1970,6 +1970,7 @@
         <module>components</module>
         <module>jetspeed-ant-tasks</module>
         <module>applications</module>
+        <module>jetspeed-archetype</module>
       </modules>
     </profile>
     <profile>



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