geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r419764 - /geronimo/trunk/m2-plugins/pom.xml
Date Fri, 07 Jul 2006 01:43:27 GMT
Author: jdillon
Date: Thu Jul  6 18:43:26 2006
New Revision: 419764

URL: http://svn.apache.org/viewvc?rev=419764&view=rev
Log:
Merge changes for m2

Modified:
    geronimo/trunk/m2-plugins/pom.xml   (contents, props changed)

Modified: geronimo/trunk/m2-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/pom.xml?rev=419764&r1=419763&r2=419764&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/pom.xml (original)
+++ geronimo/trunk/m2-plugins/pom.xml Thu Jul  6 18:43:26 2006
@@ -17,7 +17,11 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
@@ -29,32 +33,37 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>plugins-parent</artifactId>
-    <packaging>pom</packaging>
     <name>Geronimo Plugins</name>
-    <description>Geronimo Plugins</description>
+    <description>Geronimo :: Plugins</description>
+    <packaging>pom</packaging>
+    
+    <properties>
+        <maven.version>2.0</maven.version>
+    </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>${maven.version}</version>
+        </dependency>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>geronimo-packaging-plugin</module>
-            </modules>
-        </profile>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <version>${maven.version}</version>
+        </dependency>
 
-        <profile>
-            <id>singleplugin</id>
-            <activation>
-                <property>
-                    <name>plugin</name>
-                </property>
-            </activation>
-            <modules>
-                <module>${plugin}</module>
-            </modules>
-        </profile>
-    </profiles>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>${maven.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <modules>
+        <module>geronimo-packaging-plugin</module>
+    </modules>
+    
 </project>
 

Propchange: geronimo/trunk/m2-plugins/pom.xml
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Thu Jul  6 18:43:26 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/m2-plugins/pom.xml:419355



Mime
View raw message