You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/09 21:54:53 UTC
svn commit: r420340 - in /geronimo/sandbox/svkmerge/m2migration/m2-plugins:
geronimo-assembly-plugin/pom.xml geronimo-packaging-plugin/pom.xml pom.xml
Author: jdillon
Date: Sun Jul 9 12:54:52 2006
New Revision: 420340
URL: http://svn.apache.org/viewvc?rev=420340&view=rev
Log:
All plugins depend on plugin-support
Modified:
geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/pom.xml?rev=420340&r1=420339&r2=420340&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/pom.xml Sun Jul 9 12:54:52 2006
@@ -17,10 +17,7 @@
<!-- $Rev$ $Date$ -->
-<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">
+<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>
@@ -38,23 +35,17 @@
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>plugin-support</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
</dependencies>
<build>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml?rev=420340&r1=420339&r2=420340&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml Sun Jul 9 12:54:52 2006
@@ -17,10 +17,7 @@
<!-- $Rev$ $Date$ -->
-<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">
+<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>
@@ -38,12 +35,6 @@
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>plugin-support</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${pom.version}</version>
@@ -73,11 +64,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
<!-- for processing velocity -->
<dependency>
<groupId>xmlbeans</groupId>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml?rev=420340&r1=420339&r2=420340&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml Sun Jul 9 12:54:52 2006
@@ -42,11 +42,6 @@
</dependency>
</dependencies>
- <modules>
- <module>geronimo-packaging-plugin</module>
- <module>geronimo-assembly-plugin</module>
- </modules>
-
<build>
<pluginManagement>
<plugins>
@@ -58,6 +53,11 @@
</plugins>
</pluginManagement>
</build>
+
+ <modules>
+ <module>geronimo-packaging-plugin</module>
+ <module>geronimo-assembly-plugin</module>
+ </modules>
</project>