You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/08/08 23:03:57 UTC

svn commit: r230893 - in /portals/jetspeed-2/trunk: full-portal.xml project.xml

Author: ate
Date: Mon Aug  8 14:03:49 2005
New Revision: 230893

URL: http://svn.apache.org/viewcvs?rev=230893&view=rev
Log:
-- Merging JS2-319 (by hand now) --
maven project hierachy changed to the way genapp will generate for a custom portal: eating our own dogfood  :-)

Modified:
    portals/jetspeed-2/trunk/full-portal.xml
    portals/jetspeed-2/trunk/project.xml

Modified: portals/jetspeed-2/trunk/full-portal.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/full-portal.xml?rev=230893&r1=230892&r2=230893&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/full-portal.xml (original)
+++ portals/jetspeed-2/trunk/full-portal.xml Mon Aug  8 14:03:49 2005
@@ -28,5 +28,12 @@
 	           <war.bundle>true</war.bundle>
 	        </properties>
 		</dependency>		
+    <dependency>
+        <groupId>torque</groupId>
+        <artifactId>maven-torque-plugin</artifactId>
+        <version>3.2-rc2-dev</version>
+        <type>plugin</type>
+        <properties/>
+    </dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: portals/jetspeed-2/trunk/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.xml?rev=230893&r1=230892&r2=230893&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.xml (original)
+++ portals/jetspeed-2/trunk/project.xml Mon Aug  8 14:03:49 2005
@@ -17,27 +17,9 @@
   $Id$
 -->
 <project>
-    <extend>project-info.xml</extend>
-    <pomVersion>3</pomVersion>
-    <name>Jetspeed 2 Enterprise Portal</name>
-    <artifactId>jetspeed2</artifactId>
-    <currentVersion>${jetspeed.version}</currentVersion>   
-    <dependencies>
-        <dependency>
-            <groupId>hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>1.7.1</version>
-            <type>jar</type>
-            <properties>
-                <war.bundle>false</war.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>torque</groupId>
-            <artifactId>maven-torque-plugin</artifactId>
-            <version>3.2-rc2-dev</version>
-            <type>plugin</type>
-            <properties/>
-        </dependency>
-    </dependencies>
+  <extend>full-portal.xml</extend>
+  <name>Jetspeed 2 Enterprise Portal</name>
+  <groupId>jetspeed2</groupId>
+  <artifactId>jetspeed</artifactId>
+  <currentVersion>${jetspeed.version}</currentVersion>
 </project>



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