brett 2005/04/04 21:11:03
Modified: . pom.xml
maven-archiver pom.xml
maven-artifact pom.xml
maven-core pom.xml
maven-mboot2/src/main/java MBoot.java
maven-mboot2/src/main/java/download ArtifactDownloader.java
maven-model pom.xml
maven-plugin pom.xml
maven-plugin-tools pom.xml
maven-plugin-tools/maven-plugin-tools-api pom.xml
maven-plugin-tools/maven-plugin-tools-java pom.xml
maven-plugin-tools/maven-plugin-tools-marmalade pom.xml
maven-plugin-tools/maven-plugin-tools-pluggy pom.xml
maven-plugins pom.xml
maven-plugins/maven-assemble-plugin pom.xml
maven-plugins/maven-clean-plugin pom.xml
maven-plugins/maven-compiler-plugin pom.xml
maven-plugins/maven-deploy-plugin pom.xml
maven-plugins/maven-ejb-plugin pom.xml
maven-plugins/maven-idea-plugin pom.xml
maven-plugins/maven-install-plugin pom.xml
maven-plugins/maven-jar-plugin pom.xml
maven-plugins/maven-plugin-plugin pom.xml
maven-plugins/maven-resources-plugin pom.xml
maven-plugins/maven-surefire-plugin pom.xml
maven-plugins/maven-war-plugin pom.xml
maven-script pom.xml
maven-script/maven-script-marmalade pom.xml
maven-settings pom.xml
Log:
clean up dependencies.
Still need to clean up ~/maven2/lib and some large dependencies from
marmalade that
shouldn't be needed in general - but down to about a 3Mb repository.
Revision Changes Path
1.24 +0 -21 maven-components/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/pom.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.23
+++ pom.xml 5 Apr 2005 04:11:02 -0000 1.24
@@ -59,27 +59,6 @@
</developers>
<dependencies>
<dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-artifact</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <version>1.1-alpha-1</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
1.7 +1 -16 maven-components/maven-archiver/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-archiver/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.6
+++ pom.xml 5 Apr 2005 04:11:02 -0000 1.7
@@ -12,7 +12,7 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -24,20 +24,5 @@
<artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-2</version>
- </dependency>
</dependencies>
</project>
1.15 +7 -13 maven-components/maven-artifact/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/pom.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.14
+++ pom.xml 5 Apr 2005 04:11:02 -0000 1.15
@@ -1,4 +1,4 @@
-<model>
+<project>
<parent>
<artifactId>maven-component</artifactId>
<groupId>org.apache.maven</groupId>
@@ -6,31 +6,25 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-artifact</artifactId>
- <packaging>jar</packaging>
<name>Maven</name>
<version>2.0-SNAPSHOT</version>
<inceptionYear>2001</inceptionYear>
<dependencies>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
+ <artifactId>wagon-provider-api</artifactId>
<version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
+ <artifactId>wagon-file</artifactId>
<version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
-</model>
+</project>
1.26 +11 -58 maven-components/maven-core/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/pom.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pom.xml 4 Apr 2005 14:35:06 -0000 1.25
+++ pom.xml 5 Apr 2005 04:11:02 -0000 1.26
@@ -1,4 +1,4 @@
-<model>
+<project>
<parent>
<artifactId>maven-component</artifactId>
<groupId>org.apache.maven</groupId>
@@ -6,7 +6,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-core</artifactId>
- <packaging>jar</packaging>
<name>Maven</name>
<version>2.0-SNAPSHOT</version>
<inceptionYear>2001</inceptionYear>
@@ -15,99 +14,53 @@
<groupId>plexus</groupId>
<artifactId>plexus-container-artifact</artifactId>
<version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.0-beta-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-i18n</artifactId>
<version>1.0-beta-3</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-script-marmalade</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
- <artifactId>plexus-marmalade-factory</artifactId>
+ <artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-script-marmalade</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>marmalade</groupId>
- <artifactId>marmalade-core</artifactId>
- <version>1.0-alpha2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
- <type>jar</type>
- <scope>compile</scope>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>1.0-alpha-2</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<reports>
@@ -128,4 +81,4 @@
<url>scp://www.apache.org//www/maven.apache.org/m2</url>
</site>
</distributionManagement>
-</model>
+</project>
1.94 +8 -4 maven-components/maven-mboot2/src/main/java/MBoot.java
Index: MBoot.java
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- MBoot.java 4 Apr 2005 21:26:20 -0000 1.93
+++ MBoot.java 5 Apr 2005 04:11:02 -0000 1.94
@@ -589,7 +589,7 @@
System.out.println( "Compiling test sources ..." );
- Collection testDependencies = reader.getDependencies();
+ Collection testDependencies = new ArrayList(
reader.getDependencies() );
compile( testDependencies, testSources, testClasses, classes, null,
SCOPE_TEST, localRepository );
@@ -800,6 +800,7 @@
List classpath = classpath( depList, null, SCOPE_TEST,
localRepository );
classpath.add( classes );
classpath.add( testClasses );
+
boolean success = testRunner.execute( basedir, includes, excludes,
classpath, reportsDir );
if ( !success )
@@ -842,7 +843,10 @@
}
}
- classpath.add( extraClasspath );
+ if ( extraClasspath != null )
+ {
+ classpath.add( extraClasspath );
+ }
return classpath;
}
@@ -880,8 +884,8 @@
{
CompilerConfiguration compilerConfiguration = new
CompilerConfiguration();
compilerConfiguration.setOutputLocation( outputDirectory );
- compilerConfiguration.setClasspathEntries(
- classpath( dependencies, extraClasspath, scope,
localRepository ) );
+ List classpathEntries = classpath( dependencies, extraClasspath,
scope, localRepository );
+ compilerConfiguration.setClasspathEntries( classpathEntries );
compilerConfiguration.setSourceLocations( Arrays.asList(
sourceDirectories ) );
/* Compile with debugging info */
1.12 +4 -2
maven-components/maven-mboot2/src/main/java/download/ArtifactDownloader.java
Index: ArtifactDownloader.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-mboot2/src/main/java/download/ArtifactDownloader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ArtifactDownloader.java 4 Apr 2005 21:32:53 -0000 1.11
+++ ArtifactDownloader.java 5 Apr 2005 04:11:03 -0000 1.12
@@ -80,13 +80,15 @@
directory.mkdirs();
}
- if ( dep.getGroupId().equals( "org.apache.maven" ) )
+ boolean snapshot = dep.getVersion().indexOf(
SNAPSHOT_SIGNATURE ) >= 0;
+
+ if ( dep.getGroupId().equals( "org.apache.maven" ) &&
snapshot )
{
//skip our own
continue;
}
- if ( destinationFile.exists() && dep.getVersion().indexOf(
SNAPSHOT_SIGNATURE ) < 0 )
+ if ( destinationFile.exists() && !snapshot )
{
continue;
}
1.9 +10 -4 maven-components/maven-model/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-model/pom.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pom.xml 23 Mar 2005 06:52:53 -0000 1.8
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.9
@@ -1,4 +1,4 @@
-<model>
+<project>
<parent>
<artifactId>maven-component</artifactId>
<groupId>org.apache.maven</groupId>
@@ -7,16 +7,22 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <packaging>jar</packaging>
<name>Maven Model</name>
<version>2.0-SNAPSHOT</version>
<description>Maven Model</description>
+ <dependencies>
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0-alpha-2</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-modello-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-1</version>
<configuration>
<version>4.0.0</version>
<model>maven.mdo</model>
@@ -35,4 +41,4 @@
</plugin>
</plugins>
</build>
-</model>
+</project>
1.9 +6 -24 maven-components/maven-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugin/pom.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pom.xml 4 Apr 2005 14:35:06 -0000 1.8
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.9
@@ -1,4 +1,4 @@
-<model>
+<project>
<parent>
<artifactId>maven-component</artifactId>
<groupId>org.apache.maven</groupId>
@@ -6,10 +6,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-plugin</artifactId>
- <packaging>jar</packaging>
<name>Maven Plugin</name>
<version>2.0-SNAPSHOT</version>
<dependencies>
+ <!-- TODO: can we avoid this dependency so that it is not propogated to
Mojo implementors?
+ Maybe split plugin-api from the descriptor builder? -->
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
@@ -19,32 +20,13 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>modello</groupId>
- <artifactId>modello</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
+
+ <!-- TODO: shouldn't be needed - separate plugin test case -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
- <type>jar</type>
- <!-- Should be changed to test scope, but that requires moving the
- | plugin test case out to another artifact or something.
- | -->
- <scope>compile</scope>
</dependency>
</dependencies>
-</model>
+</project>
1.8 +0 -30 maven-components/maven-plugin-tools/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugin-tools/pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pom.xml 29 Mar 2005 21:36:47 -0000 1.7
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.8
@@ -9,36 +9,6 @@
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven Plugin Tools Base POM</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-tools-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>modello</groupId>
- <artifactId>modello</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
<modules>
<module>maven-plugin-tools-api</module>
<module>maven-plugin-tools-java</module>
1.6 +4 -38
maven-components/maven-plugin-tools/maven-plugin-tools-api/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugin-tools/maven-plugin-tools-api/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.5
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.6
@@ -11,53 +11,19 @@
<version>2.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>modello</groupId>
+ <groupId>org.codehaus.modello</groupId>
<artifactId>modello-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
+ <version>1.0-alpha-1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
<version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</model>
1.5 +0 -41
maven-components/maven-plugin-tools/maven-plugin-tools-java/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugin-tools/maven-plugin-tools-java/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pom.xml 23 Mar 2005 06:52:54 -0000 1.4
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.5
@@ -14,57 +14,16 @@
<groupId>qdox</groupId>
<artifactId>qdox</artifactId>
<version>1.2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>modello</groupId>
- <artifactId>modello</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- </build>
</model>
1.13 +0 -78
maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pom.xml 4 Apr 2005 14:35:06 -0000 1.12
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.13
@@ -11,102 +11,24 @@
<version>2.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>marmalade</groupId>
<artifactId>marmalade-core</artifactId>
<version>1.0-alpha2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script-marmalade</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-marmalade-factory</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</project>
1.4 +0 -36
maven-components/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pom.xml 23 Mar 2005 06:52:54 -0000 1.3
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.4
@@ -11,60 +11,24 @@
<version>2.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>modello</groupId>
- <artifactId>modello</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-java</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</model>
1.22 +0 -11 maven-components/maven-plugins/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/pom.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pom.xml 4 Apr 2005 06:04:29 -0000 1.21
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.22
@@ -37,22 +37,11 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
<organization>
1.7 +0 -15
maven-components/maven-plugins/maven-assemble-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-assemble-plugin/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pom.xml 23 Mar 2005 06:52:54 -0000 1.6
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.7
@@ -11,23 +11,8 @@
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-1</version>
</dependency>
</dependencies>
1.10 +2 -11 maven-components/maven-plugins/maven-clean-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-clean-plugin/pom.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pom.xml 23 Mar 2005 06:52:54 -0000 1.9
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.10
@@ -1,4 +1,4 @@
-<model>
+<project>
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
@@ -10,13 +10,4 @@
<name>Maven Clean Plugin</name>
<version>1.0-SNAPSHOT</version>
<inceptionYear>2001</inceptionYear>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</model>
+</project>
1.19 +0 -10
maven-components/maven-plugins/maven-compiler-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-compiler-plugin/pom.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pom.xml 4 Apr 2005 06:32:44 -0000 1.18
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.19
@@ -12,11 +12,6 @@
<inceptionYear>2001</inceptionYear>
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
<version>1.2</version>
@@ -26,10 +21,5 @@
<artifactId>plexus-compiler-javac</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-2</version>
- </dependency>
</dependencies>
</model>
1.11 +0 -27
maven-components/maven-plugins/maven-deploy-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-deploy-plugin/pom.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.10
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.11
@@ -15,49 +15,22 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<version>1.0-alpha-2</version>
- <type>jar</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>1.0-alpha-2</version>
- <type>jar</type>
<scope>runtime</scope>
</dependency>
</dependencies>
1.5 +0 -37 maven-components/maven-plugins/maven-ejb-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-ejb-plugin/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.4
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.5
@@ -11,46 +11,9 @@
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</model>
1.4 +0 -10 maven-components/maven-plugins/maven-idea-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-idea-plugin/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.3
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.4
@@ -15,15 +15,5 @@
<artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
1.12 +0 -18
maven-components/maven-plugins/maven-install-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-install-plugin/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.11
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.12
@@ -15,29 +15,11 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</model>
1.17 +0 -39 maven-components/maven-plugins/maven-jar-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/pom.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.16
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.17
@@ -11,53 +11,14 @@
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</model>
1.14 +2 -34
maven-components/maven-plugins/maven-plugin-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-plugin-plugin/pom.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pom.xml 4 Apr 2005 12:41:44 -0000 1.13
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.14
@@ -13,52 +13,20 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-java</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-marmalade</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</model>
1.17 +0 -9
maven-components/maven-plugins/maven-resources-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-resources-plugin/pom.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pom.xml 23 Mar 2005 06:52:54 -0000 1.16
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.17
@@ -12,17 +12,8 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</model>
1.12 +5 -8
maven-components/maven-plugins/maven-surefire-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-plugins/maven-surefire-plugin/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pom.xml 4 Apr 2005 05:41:57 -0000 1.11
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.12
@@ -12,13 +12,15 @@
<dependencies>
<dependency>
<groupId>surefire</groupId>
- <artifactId>surefire</artifactId>
+ <artifactId>surefire-booter</artifactId>
<version>1.2</version>
</dependency>
+ <!-- Specified for mboot -->
<dependency>
<groupId>surefire</groupId>
- <artifactId>surefire-booter</artifactId>
+ <artifactId>surefire</artifactId>
<version>1.2</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -27,16 +29,11 @@
<scope>runtime</scope>
</dependency>
- <!-- TODO: should be able to remove -->
+ <!-- TODO: would like to remove -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-2</version>
- </dependency>
</dependencies>
</model>
1.9 +0 -51 maven-components/maven-plugins/maven-war-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-war-plugin/pom.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pom.xml 1 Apr 2005 16:03:42 -0000 1.8
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.9
@@ -12,59 +12,8 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-1-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>1.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</model>
1.6 +0 -16 maven-components/maven-script/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-script/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pom.xml 29 Mar 2005 21:36:47 -0000 1.5
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.6
@@ -9,22 +9,6 @@
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven Script Support Root</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- </dependencies>
<modules>
<module>maven-script-marmalade</module>
</modules>
1.7 +0 -20
maven-components/maven-script/maven-script-marmalade/pom.xml
Index: pom.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-script/maven-script-marmalade/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pom.xml 4 Apr 2005 14:35:06 -0000 1.6
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.7
@@ -13,38 +13,18 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-monitor</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>marmalade</groupId>
<artifactId>marmalade-core</artifactId>
<version>1.0-alpha2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-marmalade-factory</artifactId>
<version>1.0-alpha-2</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
</model>
1.5 +3 -3 maven-components/maven-settings/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-settings/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pom.xml 4 Apr 2005 14:35:06 -0000 1.4
+++ pom.xml 5 Apr 2005 04:11:03 -0000 1.5
@@ -1,4 +1,4 @@
-<model>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>maven-component</artifactId>
@@ -19,7 +19,7 @@
<plugins>
<plugin>
<artifactId>maven-modello-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-alpha-1</version>
<goals>
<goal>
<id>xpp3-writer</id>
@@ -38,4 +38,4 @@
</plugin>
</plugins>
</build>
-</model>
+</project>
