Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change the maven group ID 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163670 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-03-23 06:52:55 +00:00
parent 80880d071e
commit 14bb2c805a
103 changed files with 365 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/pom.xml
View File

@ -4,4 +4,4 @@
<artifactId>foo</artifactId> <artifactId>foo</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
</model> </model>

5
maven-1.x-integration/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-1.x-integration</artifactId> <artifactId>maven-1.x-integration</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven 1.x Compatibility</name> <name>Maven 1.x Compatibility</name>
@ -20,4 +19,4 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

7
maven-archetype/maven-archetype-core/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-archetype</artifactId> <artifactId>maven-archetype</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-archetype-core</artifactId> <artifactId>maven-archetype-core</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
@ -25,7 +24,7 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -39,4 +38,4 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

7
maven-archetype/maven-archetype-plugin/pom.xml
View File

@ -1,22 +1,21 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-archetype-plugin</artifactId> <artifactId>maven-archetype-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Archetype Plugin</name> <name>Maven Archetype Plugin</name>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-archetype-core</artifactId> <artifactId>maven-archetype-core</artifactId>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

5
maven-archetype/maven-archetype-site/pom.xml
View File

@ -1,12 +1,11 @@
<model> <model>
<parent> <parent>
<artifactId>maven-archetype</artifactId> <artifactId>maven-archetype</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-archetype-site</artifactId> <artifactId>maven-archetype-site</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
</model> </model>

3
maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-archetypes</artifactId> <artifactId>maven-archetypes</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-archetype-mojo</artifactId> <artifactId>maven-archetype-mojo</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>

5
maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml
View File

@ -1,12 +1,11 @@
<model> <model>
<parent> <parent>
<artifactId>maven-archetypes</artifactId> <artifactId>maven-archetypes</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-archetype-quickstart</artifactId> <artifactId>maven-archetype-quickstart</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
</model> </model>

5
maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml
View File

@ -1,12 +1,11 @@
<model> <model>
<parent> <parent>
<artifactId>maven-archetypes</artifactId> <artifactId>maven-archetypes</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-archetype-webapp</artifactId> <artifactId>maven-archetype-webapp</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
</model> </model>

3
maven-archetype/maven-archetypes/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-archetype</artifactId> <artifactId>maven-archetype</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-archetypes</artifactId> <artifactId>maven-archetypes</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>

3
maven-archetype/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-archetype</artifactId> <artifactId>maven-archetype</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>

11
maven-archiver/pom.xml
View File

@ -2,10 +2,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<groupId>maven</groupId>
<artifactId>maven-archiver</artifactId> <artifactId>maven-archiver</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<name>Maven Archiver</name> <name>Maven Archiver</name>
@ -16,22 +15,22 @@
<version>1.0-alpha-1-SNAPSHOT</version> <version>1.0-alpha-1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</dependency> </dependency>

5
maven-artifact/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven</name> <name>Maven</name>
@ -34,4 +33,4 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

2
maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java
View File

@ -247,7 +247,7 @@ public abstract class ArtifactComponentTestCase
protected Artifact createArtifact( String artifactId, String version, String type ) protected Artifact createArtifact( String artifactId, String version, String type )
{ {
return new DefaultArtifact( "maven", artifactId, version, type ); return new DefaultArtifact( "org.apache.maven", artifactId, version, type );
} }
protected Artifact createArtifact( String groupId, String artifactId, String version, String type ) protected Artifact createArtifact( String groupId, String artifactId, String version, String type )

2
maven-artifact/src/test/java/org/apache/maven/artifact/NewLayoutArtifactComponentTestCase.java
View File

@ -229,7 +229,7 @@ public abstract class NewLayoutArtifactComponentTestCase
protected Artifact createArtifact( String artifactId, String version, String type ) protected Artifact createArtifact( String artifactId, String version, String type )
{ {
return new DefaultArtifact( "maven", artifactId, version, type ); return new DefaultArtifact( "org.apache.maven", artifactId, version, type );
} }
protected Artifact createArtifact( String groupId, String artifactId, String version, String type ) protected Artifact createArtifact( String groupId, String artifactId, String version, String type )

4
maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
View File

@ -147,7 +147,7 @@ public class ArtifactResolverTest
if ( artifact.getArtifactId().equals( "g" ) ) if ( artifact.getArtifactId().equals( "g" ) )
{ {
dependencies.add( createArtifact( "maven", "h", "1.0", "jar" ) ); dependencies.add( createArtifact( "org.apache.maven", "h", "1.0", "jar" ) );
} }
return dependencies; return dependencies;
@ -184,7 +184,7 @@ public class ArtifactResolverTest
if ( artifact.getArtifactId().equals( "i" ) ) if ( artifact.getArtifactId().equals( "i" ) )
{ {
dependencies.add( createArtifact( "maven", "j", "1.0", "jar" ) ); dependencies.add( createArtifact( "org.apache.maven", "j", "1.0", "jar" ) );
} }
return dependencies; return dependencies;

4
maven-artifact/src/test/java/org/apache/maven/artifact/resolver/NewLayoutArtifactResolverTest.java
View File

@ -147,7 +147,7 @@ public class NewLayoutArtifactResolverTest
if ( artifact.getArtifactId().equals( "g" ) ) if ( artifact.getArtifactId().equals( "g" ) )
{ {
dependencies.add( createArtifact( "maven", "h", "1.0", "jar" ) ); dependencies.add( createArtifact( "org.apache.maven", "h", "1.0", "jar" ) );
} }
return dependencies; return dependencies;
@ -184,7 +184,7 @@ public class NewLayoutArtifactResolverTest
if ( artifact.getArtifactId().equals( "i" ) ) if ( artifact.getArtifactId().equals( "i" ) )
{ {
dependencies.add( createArtifact( "maven", "j", "1.0", "jar" ) ); dependencies.add( createArtifact( "org.apache.maven", "j", "1.0", "jar" ) );
} }
return dependencies; return dependencies;

10
maven-artifact/src/test/resources/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven</name> <name>Maven</name>
@ -8,14 +8,14 @@
<inceptionYear>2001</inceptionYear> <inceptionYear>2001</inceptionYear>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -85,7 +85,7 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>wagon-http-lightweight</artifactId> <artifactId>wagon-http-lightweight</artifactId>
<version>0.9-SNAPSHOT</version> <version>0.9-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -113,4 +113,4 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

3
maven-core-it-plugin/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-core-it-plugin</artifactId> <artifactId>maven-core-it-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Core Integration Test Plugin</name> <name>Maven Core Integration Test Plugin</name>

13
maven-core-it-support/pom.xml
View File

@ -1,7 +1,14 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-it-support</artifactId> <artifactId>maven-core-it-support</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
</model> <distributionManagement>
<repository>
<id>repo1</id>
<name>Maven Central Repository</name>
<url>scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2</url>
</repository>
</distributionManagement>
</model>

4
maven-core-it-verifier/pom.xml
View File

@ -1,7 +1,7 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it-verifier</artifactId> <artifactId>maven-core-it-verifier</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
</model> </model>

4
maven-core-it/it0000/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0000</artifactId> <artifactId>maven-core-it0000</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
@ -13,4 +13,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

4
maven-core-it/it0001/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0001</artifactId> <artifactId>maven-core-it0001</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
@ -13,4 +13,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

2
maven-core-it/it0002/expected-results.txt
View File

@ -2,4 +2,4 @@ target/classes/org/apache/maven/it0002/Person.class
target/test-classes/org/apache/maven/it0002/PersonTest.class target/test-classes/org/apache/maven/it0002/PersonTest.class
target/maven-core-it0002-1.0.jar target/maven-core-it0002-1.0.jar
target/maven-core-it0002-1.0.jar!/it0002.properties target/maven-core-it0002-1.0.jar!/it0002.properties
${localRepository}/maven/jars/maven-it-support-1.0.jar ${localRepository}/org.apache.maven/jars/maven-core-it-support-1.0.jar

8
maven-core-it/it0002/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0002</artifactId> <artifactId>maven-core-it0002</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
@ -13,11 +13,11 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-it-support</artifactId> <artifactId>maven-core-it-support</artifactId>
<version>1.0</version> <version>1.0</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

2
maven-core-it/it0002/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/jars/maven-it-support-1.0.jar rm ${localRepository}/org.apache.maven/jars/maven-core-it-support-1.0.jar

2
maven-core-it/it0003/expected-results.txt
View File

@ -2,4 +2,4 @@ target/classes/org/apache/maven/it0003/Person.class
target/test-classes/org/apache/maven/it0003/PersonTest.class target/test-classes/org/apache/maven/it0003/PersonTest.class
target/maven-core-it0003-1.0.jar target/maven-core-it0003-1.0.jar
target/maven-core-it0003-1.0.jar!/it0003.properties target/maven-core-it0003-1.0.jar!/it0003.properties
${localRepository}/maven/jars/maven-core-it0003-1.0.jar ${localRepository}/org.apache.maven/jars/maven-core-it0003-1.0.jar

4
maven-core-it/it0003/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0003</artifactId> <artifactId>maven-core-it0003</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
@ -13,4 +13,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

2
maven-core-it/it0003/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/jars/maven-core-it0003-1.0.jar rm ${localRepository}/org.apache.maven/jars/maven-core-it0003-1.0.jar

2
maven-core-it/it0004/expected-results.txt
View File

@ -1 +1 @@
${localRepository}/maven/poms/maven-core-it0004-1.0.pom ${localRepository}/org.apache.maven/poms/maven-core-it0004-1.0.pom

2
maven-core-it/it0004/goals.txt
View File

@ -1 +1 @@
pom:install install:install

6
maven-core-it/it0004/pom.xml
View File

@ -1,7 +1,7 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0004</artifactId> <artifactId>maven-core-it0004</artifactId>
<packaging>jar</packaging> <packaging>pom</packaging>
<version>1.0</version> <version>1.0</version>
</model> </model>

2
maven-core-it/it0004/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/poms/maven-core-it0004-1.0.pom rm ${localRepository}/org.apache.maven/poms/maven-core-it0004-1.0.pom

2
maven-core-it/it0005/expected-results.txt
View File

@ -1 +1 @@
${localRepository}/maven/poms/maven-core-it0005-1.0-SNAPSHOT.pom ${localRepository}/org.apache.maven/poms/maven-core-it0005-1.0-SNAPSHOT.pom

2
maven-core-it/it0005/goals.txt
View File

@ -1 +1 @@
pom:install install:install

6
maven-core-it/it0005/pom.xml
View File

@ -1,7 +1,7 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0005</artifactId> <artifactId>maven-core-it0005</artifactId>
<packaging>jar</packaging> <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</model> </model>

2
maven-core-it/it0005/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/poms/maven-core-it0005-1.0-SNAPSHOT.pom rm ${localRepository}/org.apache.maven/poms/maven-core-it0005-1.0-SNAPSHOT.pom

2
maven-core-it/it0007/expected-results.txt
View File

@ -2,4 +2,4 @@ target/classes/org/apache/maven/it0007/Person.class
target/test-classes/org/apache/maven/it0007/PersonTest.class target/test-classes/org/apache/maven/it0007/PersonTest.class
target/maven-core-it0007-1.0.jar target/maven-core-it0007-1.0.jar
target/maven-core-it0007-1.0.jar!/it0007.properties target/maven-core-it0007-1.0.jar!/it0007.properties
${localRepository}/maven/poms/maven-it-support-1.0.pom ${localRepository}/org.apache.maven/poms/maven-core-it-support-1.0.pom

8
maven-core-it/it0007/maven-it-support-parent-1.0.pom
View File

@ -1,12 +1,12 @@
<project> <project>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-it-support-parent</artifactId> <artifactId>maven-core-it-support-parent</artifactId>
<version>1.0</version> <version>1.0</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-it-support</artifactId> <artifactId>maven-core-it-support</artifactId>
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

5
maven-core-it/it0007/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-it-support</artifactId> <artifactId>maven-core-it-support</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>1.0</version> <version>1.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-core-it0007</artifactId> <artifactId>maven-core-it0007</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>

2
maven-core-it/it0007/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/poms/maven-it-support-parent-1.0.pom rm ${localRepository}/org.apache.maven/poms/maven-core-it-support-parent-1.0.pom

4
maven-core-it/it0008/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0008</artifactId> <artifactId>maven-core-it0008</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
@ -16,7 +16,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-core-it-plugin</artifactId> <artifactId>maven-core-it-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</plugin> </plugin>

2
maven-core-it/it0008/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar rm ${localRepository}/org.apache.maven/maven-plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar

4
maven-core-it/it0009/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0009</artifactId> <artifactId>maven-core-it0009</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
@ -16,7 +16,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-core-it-plugin</artifactId> <artifactId>maven-core-it-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<configuration> <configuration>

2
maven-core-it/it0009/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar rm ${localRepository}/org.apache.maven/maven-plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar

6
maven-core-it/it0010/pom.xml
View File

@ -1,12 +1,12 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0010</artifactId> <artifactId>maven-core-it0010</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -20,4 +20,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

2
maven-core-it/it0010/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar rm ${localRepository}/org.apache.maven/maven-plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar

8
maven-core-it/it0011/pom.xml
View File

@ -1,12 +1,12 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0011</artifactId> <artifactId>maven-core-it0011</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
@ -21,7 +21,7 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -36,4 +36,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</model> </model>

2
maven-core-it/it0011/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar rm ${localRepository}/org.apache.maven/maven-plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar

6
maven-core-it/it0012/pom.xml
View File

@ -1,12 +1,12 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0012</artifactId> <artifactId>maven-core-it0012</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>3.8.1</version> <version>3.8.1</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -20,4 +20,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

2
maven-core-it/it0012/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar rm ${localRepository}/org.apache.maven/maven-plugins/maven-core-it-plugin-1.0-SNAPSHOT.jar

4
maven-core-it/it0013/pom.xml
View File

@ -1,12 +1,12 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-it0013-plugin</artifactId> <artifactId>maven-it0013-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

2
maven-core-it/it0013/prebuild-hook.txt
View File

@ -1 +1 @@
rm ${localRepository}/maven/plugins/maven-it0013-plugin-1.0-SNAPSHOT.jar rm ${localRepository}/org.apache.maven/maven-plugins/maven-it0013-plugin-1.0-SNAPSHOT.jar

6
maven-core-it/it0015/pom.xml
View File

@ -1,19 +1,19 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-it0015-plugin</artifactId> <artifactId>maven-it0015-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-script-marmalade</artifactId> <artifactId>maven-script-marmalade</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

6
maven-core-it/it0016/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0016</artifactId> <artifactId>maven-core-it0016</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.0</version> <version>1.0</version>
@ -8,10 +8,10 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</model> </model>

6
maven-core-it/it0017/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0017</artifactId> <artifactId>maven-core-it0017</artifactId>
<packaging>ejb</packaging> <packaging>ejb</packaging>
<version>1.0</version> <version>1.0</version>
@ -8,10 +8,10 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId> <artifactId>maven-ejb-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</model> </model>

2
maven-core-it/it1000/pom.xml
View File

@ -1,6 +1,6 @@
<projectX> <projectX>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it1000</artifactId> <artifactId>maven-core-it1000</artifactId>
<version>1.0</version> <version>1.0</version>
</project> </project>

4
maven-core-it/it1002/pom.xml
View File

@ -1,7 +1,7 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it1002</artifactId> <artifactId>maven-core-it1002</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
</model> </model>

4
maven-core-it/it1003/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it1003</artifactId> <artifactId>maven-core-it1003</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0</version> <version>1.0</version>
@ -13,4 +13,4 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

4
maven-core-it/it1004/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core-it0018</artifactId> <artifactId>maven-core-it0018</artifactId>
<version>1.0</version> <version>1.0</version>
<distributionManagement> <distributionManagement>
@ -18,4 +18,4 @@
<version>1.0-alpha-2-SNAPSHOT</version> <version>1.0-alpha-2-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

21
maven-core/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven</name> <name>Maven</name>
@ -20,35 +19,35 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId> <artifactId>maven-settings</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -90,7 +89,7 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-script-marmalade</artifactId> <artifactId>maven-script-marmalade</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -114,11 +113,11 @@
<reports> <reports>
<plugins> <plugins>
<plugin> <plugin>
<groupId>maven</groupId> <groupId>org.apache.maven.reports</groupId>
<artifactId>mail-lists</artifactId> <artifactId>mail-lists</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>maven</groupId> <groupId>org.apache.maven.reports</groupId>
<artifactId>dependencies</artifactId> <artifactId>dependencies</artifactId>
</plugin> </plugin>
</plugins> </plugins>
@ -129,4 +128,4 @@
<url>scp://www.apache.org//www/maven.apache.org/m2</url> <url>scp://www.apache.org//www/maven.apache.org/m2</url>
</site> </site>
</distributionManagement> </distributionManagement>
</model> </model>

6
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -28,6 +28,8 @@ import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents; import org.apache.maven.monitor.event.MavenEvents;
import org.apache.maven.plugin.PluginExecutionException; import org.apache.maven.plugin.PluginExecutionException;
import org.apache.maven.plugin.PluginManager; import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.DefaultPluginManager;
import org.apache.maven.plugin.AbstractPlugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
@ -106,9 +108,9 @@ public class DefaultLifecycleExecutor
if ( artifactHandler.additionalPlugin() != null ) if ( artifactHandler.additionalPlugin() != null )
{ {
String additionalPluginGroupId = "maven"; String additionalPluginGroupId = AbstractPlugin.getDefaultPluginGroupId();
String additionalPluginArtifactId = "maven-" + artifactHandler.additionalPlugin() + "-plugin"; String additionalPluginArtifactId = AbstractPlugin.getDefaultPluginArtifactId( artifactHandler.additionalPlugin() );
injectHandlerPluginConfiguration( project, additionalPluginGroupId, additionalPluginArtifactId ); injectHandlerPluginConfiguration( project, additionalPluginGroupId, additionalPluginArtifactId );

11
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -72,6 +72,7 @@ public class DefaultPluginManager
extends AbstractLogEnabled extends AbstractLogEnabled
implements PluginManager, ComponentDiscoveryListener, Initializable, Contextualizable implements PluginManager, ComponentDiscoveryListener, Initializable, Contextualizable
{ {
// TODO: share with type handler
static String MAVEN_PLUGIN = "maven-plugin"; static String MAVEN_PLUGIN = "maven-plugin";
protected Map mojoDescriptors; protected Map mojoDescriptors;
@ -207,7 +208,7 @@ public class DefaultPluginManager
pluginId = pluginId.substring( 0, pluginId.indexOf( ":" ) ); pluginId = pluginId.substring( 0, pluginId.indexOf( ":" ) );
} }
return "maven-" + pluginId + "-plugin"; return AbstractPlugin.getDefaultPluginArtifactId( pluginId );
} }
// TODO: don't throw Exception // TODO: don't throw Exception
@ -216,8 +217,7 @@ public class DefaultPluginManager
{ {
String pluginId = getPluginId( goalName ); String pluginId = getPluginId( goalName );
// TODO: hardcoding of group ID/artifact ID verifyPlugin( AbstractPlugin.getDefaultPluginGroupId(), pluginId, session );
verifyPlugin( "maven", pluginId, session );
} }
// TODO: don't throw Exception // TODO: don't throw Exception
@ -267,9 +267,8 @@ public class DefaultPluginManager
artifactFactory = (ArtifactFactory) container.lookup( ArtifactFactory.ROLE ); artifactFactory = (ArtifactFactory) container.lookup( ArtifactFactory.ROLE );
// TODO: more hard coding here... Artifact pluginArtifact = artifactFactory.createArtifact( AbstractPlugin.getDefaultPluginGroupId(), artifactId,
Artifact pluginArtifact = artifactFactory.createArtifact( "maven", artifactId, version, null, version, null, MAVEN_PLUGIN, null );
"maven-plugin", null );
addPlugin( pluginArtifact, session ); addPlugin( pluginArtifact, session );
} }

4
maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java
View File

@ -63,7 +63,7 @@ public class MavenMojoDescriptor
public String getRole() public String getRole()
{ {
return "org.apache.maven.plugin.Plugin"; return Plugin.ROLE;
} }
public String getRoleHint() public String getRoleHint()
@ -73,6 +73,6 @@ public class MavenMojoDescriptor
public String getComponentType() public String getComponentType()
{ {
return "maven-plugin"; return DefaultPluginManager.MAVEN_PLUGIN;
} }
} }

2
maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
View File

@ -27,7 +27,7 @@ public interface MavenProjectBuilder
{ {
String ROLE = MavenProjectBuilder.class.getName(); String ROLE = MavenProjectBuilder.class.getName();
static final String STANDALONE_SUPERPOM_GROUPID = "maven"; static final String STANDALONE_SUPERPOM_GROUPID = "org.apache.maven";
static final String STANDALONE_SUPERPOM_ARTIFACTID = "super-pom"; static final String STANDALONE_SUPERPOM_ARTIFACTID = "super-pom";

2
maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
View File

@ -55,7 +55,7 @@ public class CanonicalProjectBuilderTest
Plugin plugin = (Plugin) plugins.get( 0 ); Plugin plugin = (Plugin) plugins.get( 0 );
assertEquals( "maven", plugin.getGroupId() ); assertEquals( "org.apache.maven.plugins", plugin.getGroupId() );
assertEquals( "maven-plexus-plugin", plugin.getArtifactId() ); assertEquals( "maven-plexus-plugin", plugin.getArtifactId() );

2
maven-core/src/test/java/org/apache/maven/util/introspection/ReflectionValueExtractorTest.java
View File

@ -56,7 +56,7 @@ public class ReflectionValueExtractorTest
assertEquals( "4.0.0", ReflectionValueExtractor.evaluate( "project.modelVersion", project ) ); assertEquals( "4.0.0", ReflectionValueExtractor.evaluate( "project.modelVersion", project ) );
assertEquals( "maven", ReflectionValueExtractor.evaluate( "project.groupId", project ) ); assertEquals( "org.apache.maven", ReflectionValueExtractor.evaluate( "project.groupId", project ) );
assertEquals( "maven-core", ReflectionValueExtractor.evaluate( "project.artifactId", project ) ); assertEquals( "maven-core", ReflectionValueExtractor.evaluate( "project.artifactId", project ) );

8
maven-core/src/test/resources/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven</name> <name>Maven</name>
@ -8,14 +8,14 @@
<inceptionYear>2001</inceptionYear> <inceptionYear>2001</inceptionYear>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -25,4 +25,4 @@
<scm> <scm>
<connection>scm-connection</connection> <connection>scm-connection</connection>
</scm> </scm>
</model> </model>

5
maven-mboot2/pom.xml
View File

@ -1,14 +1,13 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-mboot</artifactId> <artifactId>maven-mboot</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven MBoot</name> <name>Maven MBoot</name>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<description>Tool used to bootstrap m2.</description> <description>Tool used to bootstrap m2.</description>
</model> </model>

107
maven-mboot2/src/main/java/MBoot.java
View File

@ -53,13 +53,13 @@ public class MBoot
"plexus/jars/plexus-container-default-1.0-alpha-2-SNAPSHOT.jar"}; "plexus/jars/plexus-container-default-1.0-alpha-2-SNAPSHOT.jar"};
String[] pluginGeneratorDeps = new String[]{"plexus/jars/plexus-container-default-1.0-alpha-2-SNAPSHOT.jar", String[] pluginGeneratorDeps = new String[]{"plexus/jars/plexus-container-default-1.0-alpha-2-SNAPSHOT.jar",
"maven/jars/maven-core-2.0-SNAPSHOT.jar", "org.apache.maven/jars/maven-core-2.0-SNAPSHOT.jar",
"maven/jars/maven-artifact-2.0-SNAPSHOT.jar", "org.apache.maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
"maven/jars/maven-model-2.0-SNAPSHOT.jar", "org.apache.maven/jars/maven-model-2.0-SNAPSHOT.jar",
"maven/jars/maven-plugin-2.0-SNAPSHOT.jar", "org.apache.maven/jars/maven-plugin-2.0-SNAPSHOT.jar",
"maven/jars/maven-plugin-tools-api-2.0-SNAPSHOT.jar", "org.apache.maven/jars/maven-plugin-tools-api-2.0-SNAPSHOT.jar",
"maven/jars/maven-plugin-tools-java-2.0-SNAPSHOT.jar", "org.apache.maven/jars/maven-plugin-tools-java-2.0-SNAPSHOT.jar",
"maven/jars/maven-plugin-tools-pluggy-2.0-SNAPSHOT.jar"}; "org.apache.maven/jars/maven-plugin-tools-pluggy-2.0-SNAPSHOT.jar"};
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// These are modello's runtime dependencies // These are modello's runtime dependencies
@ -135,8 +135,6 @@ public class MBoot
private ArtifactDownloader downloader; private ArtifactDownloader downloader;
private ModelReader reader;
private String repoLocal; private String repoLocal;
private List mbootDependencies; private List mbootDependencies;
@ -180,7 +178,7 @@ public class MBoot
public void run( String[] args ) public void run( String[] args )
throws Exception throws Exception
{ {
reader = new ModelReader(); ModelReader reader = new ModelReader();
String mavenRepoLocal = System.getProperty( "maven.repo.local" ); String mavenRepoLocal = System.getProperty( "maven.repo.local" );
@ -324,15 +322,13 @@ public class MBoot
System.setProperty( "basedir", directory ); System.setProperty( "basedir", directory );
buildProject( directory, builds[i] ); reader = buildProject( directory, builds[i] );
if ( reader.artifactId.equals( "maven-core" ) ) if ( reader.artifactId.equals( "maven-core" ) )
{ {
coreDeps = reader.getDependencies(); coreDeps = reader.getDependencies();
} }
reader.reset();
System.out.println( "--------------------------------------------------------------------" ); System.out.println( "--------------------------------------------------------------------" );
} }
@ -348,9 +344,7 @@ public class MBoot
System.setProperty( "basedir", directory ); System.setProperty( "basedir", directory );
buildProject( directory, pluginBuilds[i] ); reader = buildProject( directory, pluginBuilds[i] );
reader.reset();
System.out.println( "--------------------------------------------------------------------" ); System.out.println( "--------------------------------------------------------------------" );
} }
@ -434,7 +428,7 @@ public class MBoot
// Copy maven itself // Copy maven itself
FileUtils.copyFileToDirectory( repoLocal + "/maven/jars/maven-core-2.0-SNAPSHOT.jar", lib ); FileUtils.copyFileToDirectory( repoLocal + "/org.apache.maven/jars/maven-core-2.0-SNAPSHOT.jar", lib );
System.out.println(); System.out.println();
@ -475,11 +469,13 @@ public class MBoot
System.out.println( "Finished at: " + fullStop ); System.out.println( "Finished at: " + fullStop );
} }
public void buildProject( String basedir, String projectId ) public ModelReader buildProject( String basedir, String projectId )
throws Exception throws Exception
{ {
System.out.println( "Building project in " + basedir ); System.out.println( "Building project in " + basedir );
ModelReader reader = new ModelReader();
if ( !reader.parse( new File( basedir, "pom.xml" ) ) ) if ( !reader.parse( new File( basedir, "pom.xml" ) ) )
{ {
System.err.println( "Could not parse pom.xml" ); System.err.println( "Could not parse pom.xml" );
@ -651,24 +647,26 @@ public class MBoot
// Run tests // Run tests
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
runTests( basedir, classes, testClasses ); runTests( basedir, classes, testClasses, reader );
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// Create JAR // Create JAR
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
createJar( classes, buildDir ); createJar( classes, buildDir, reader );
installPom( basedir, repoLocal ); installPom( basedir, repoLocal, reader );
if ( !reader.artifactId.equals( "maven-plugin" ) && reader.artifactId.endsWith( "plugin" ) ) if ( !reader.artifactId.equals( "maven-plugin" ) && reader.artifactId.endsWith( "plugin" ) )
{ {
installPlugin( basedir, repoLocal ); installPlugin( basedir, repoLocal, reader );
} }
else else
{ {
installJar( basedir, repoLocal ); installJar( basedir, repoLocal, reader );
} }
return reader;
} }
IsolatedClassLoader cl; IsolatedClassLoader cl;
@ -779,7 +777,7 @@ public class MBoot
downloader.downloadDependencies( Arrays.asList( modelloDeps ) ); downloader.downloadDependencies( Arrays.asList( modelloDeps ) );
} }
private void createJar( String classes, String buildDir ) private void createJar( String classes, String buildDir, ModelReader reader )
throws Exception throws Exception
{ {
JarMojo jarMojo = new JarMojo(); JarMojo jarMojo = new JarMojo();
@ -794,6 +792,8 @@ public class MBoot
private void installPomFile( String repoLocal, File pomIn ) private void installPomFile( String repoLocal, File pomIn )
throws Exception throws Exception
{ {
ModelReader reader = new ModelReader();
if ( !reader.parse( pomIn ) ) if ( !reader.parse( pomIn ) )
{ {
System.err.println( "Could not parse pom.xml" ); System.err.println( "Could not parse pom.xml" );
@ -807,16 +807,24 @@ public class MBoot
String groupId = reader.groupId; String groupId = reader.groupId;
if ( groupId == null )
{
groupId = reader.parentGroupId;
}
if ( version == null )
{
version = reader.parentVersion;
}
File pom = new File( repoLocal, "/" + groupId + "/poms/" + artifactId + "-" + version + ".pom" ); File pom = new File( repoLocal, "/" + groupId + "/poms/" + artifactId + "-" + version + ".pom" );
System.out.println( "Installing POM: " + pom ); System.out.println( "Installing POM: " + pom );
FileUtils.copyFile( pomIn, pom ); FileUtils.copyFile( pomIn, pom );
reader.reset();
} }
private void installPom( String basedir, String repoLocal ) private void installPom( String basedir, String repoLocal, ModelReader reader )
throws Exception throws Exception
{ {
String artifactId = reader.artifactId; String artifactId = reader.artifactId;
@ -825,6 +833,16 @@ public class MBoot
String groupId = reader.groupId; String groupId = reader.groupId;
if ( groupId == null )
{
groupId = reader.parentGroupId;
}
if ( version == null )
{
version = reader.parentVersion;
}
File pom = new File( repoLocal, "/" + groupId + "/poms/" + artifactId + "-" + version + ".pom" ); File pom = new File( repoLocal, "/" + groupId + "/poms/" + artifactId + "-" + version + ".pom" );
System.out.println( "Installing POM: " + pom ); System.out.println( "Installing POM: " + pom );
@ -832,7 +850,7 @@ public class MBoot
FileUtils.copyFile( new File( basedir, "pom.xml" ), pom ); FileUtils.copyFile( new File( basedir, "pom.xml" ), pom );
} }
private void installJar( String basedir, String repoLocal ) private void installJar( String basedir, String repoLocal, ModelReader reader )
throws Exception throws Exception
{ {
String artifactId = reader.artifactId; String artifactId = reader.artifactId;
@ -841,6 +859,16 @@ public class MBoot
String groupId = reader.groupId; String groupId = reader.groupId;
if ( groupId == null )
{
groupId = reader.parentGroupId;
}
if ( version == null )
{
version = reader.parentVersion;
}
File jar = new File( repoLocal, "/" + groupId + "/jars/" + artifactId + "-" + version + ".jar" ); File jar = new File( repoLocal, "/" + groupId + "/jars/" + artifactId + "-" + version + ".jar" );
System.out.println( "Installing JAR: " + jar ); System.out.println( "Installing JAR: " + jar );
@ -848,7 +876,7 @@ public class MBoot
FileUtils.copyFile( new File( basedir, BUILD_DIR + "/" + artifactId + "-" + version + ".jar" ), jar ); FileUtils.copyFile( new File( basedir, BUILD_DIR + "/" + artifactId + "-" + version + ".jar" ), jar );
} }
private void installPlugin( String basedir, String repoLocal ) private void installPlugin( String basedir, String repoLocal, ModelReader reader )
throws Exception throws Exception
{ {
String artifactId = reader.artifactId; String artifactId = reader.artifactId;
@ -857,6 +885,16 @@ public class MBoot
String groupId = reader.groupId; String groupId = reader.groupId;
if ( groupId == null )
{
groupId = reader.parentGroupId;
}
if ( version == null )
{
version = reader.parentVersion;
}
File jar = new File( repoLocal, "/" + groupId + "/maven-plugins/" + artifactId + "-" + version + ".jar" ); File jar = new File( repoLocal, "/" + groupId + "/maven-plugins/" + artifactId + "-" + version + ".jar" );
System.out.println( "Installing Plugin: " + jar ); System.out.println( "Installing Plugin: " + jar );
@ -864,7 +902,7 @@ public class MBoot
FileUtils.copyFile( new File( basedir, BUILD_DIR + "/" + artifactId + "-" + version + ".jar" ), jar ); FileUtils.copyFile( new File( basedir, BUILD_DIR + "/" + artifactId + "-" + version + ".jar" ), jar );
} }
private void runTests( String basedir, String classes, String testClasses ) private void runTests( String basedir, String classes, String testClasses, ModelReader reader )
throws Exception throws Exception
{ {
SurefirePlugin testRunner = new SurefirePlugin(); SurefirePlugin testRunner = new SurefirePlugin();
@ -881,7 +919,7 @@ public class MBoot
excludes.add( "**/*Abstract*.java" ); excludes.add( "**/*Abstract*.java" );
String reportsDir = new File( basedir, "target/test-reports" ).getAbsolutePath(); String reportsDir = new File( basedir, "target/surefire-reports" ).getAbsolutePath();
boolean success = testRunner.execute( repoLocal, basedir, classes, testClasses, includes, excludes, boolean success = testRunner.execute( repoLocal, basedir, classes, testClasses, includes, excludes,
classpath( reader.getDependencies(), null ), reportsDir ); classpath( reader.getDependencies(), null ), reportsDir );
@ -1037,8 +1075,6 @@ public class MBoot
{ {
private SAXParserFactory saxFactory; private SAXParserFactory saxFactory;
public abstract void reset();
public boolean parse( File file ) public boolean parse( File file )
{ {
try try
@ -1124,11 +1160,6 @@ public class MBoot
private StringBuffer bodyText = new StringBuffer(); private StringBuffer bodyText = new StringBuffer();
public void reset()
{
dependencies = new ArrayList();
}
public List getRemoteRepositories() public List getRemoteRepositories()
{ {
return remoteRepositories; return remoteRepositories;

5
maven-meeper/pom.xml
View File

@ -1,14 +1,13 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-meeper</artifactId> <artifactId>maven-meeper</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Meper</name> <name>Maven Meper</name>
<version>0.1-SNAPSHOT</version> <version>0.1-SNAPSHOT</version>
<description></description> <description></description>
</model> </model>

2
maven-model/maven.mdo
View File

@ -1948,7 +1948,7 @@
<name>groupId</name> <name>groupId</name>
<version>4.0.0</version> <version>4.0.0</version>
<type>String</type> <type>String</type>
<defaultValue>maven</defaultValue> <defaultValue>org.apache.maven.plugins</defaultValue>
</field> </field>
<field> <field>
<name>artifactId</name> <name>artifactId</name>

6
maven-model/pom.xml
View File

@ -1,11 +1,11 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Model</name> <name>Maven Model</name>
@ -14,7 +14,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-modello-plugin</artifactId> <artifactId>maven-modello-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<configuration> <configuration>

3
maven-monitor/pom.xml
View File

@ -1,11 +1,10 @@
<project> <project>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<name>Maven Monitor</name> <name>Maven Monitor</name>

18
maven-plugin-tools/maven-plugin-tools-api/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId> <artifactId>maven-plugin-tools-api</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Plugin Tools APIs</name> <name>Maven Plugin Tools APIs</name>
@ -19,28 +18,35 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <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> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

2
maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
View File

@ -73,7 +73,7 @@ public class PluginXdocGenerator
w.addAttribute( "email", "dev@maven.apache.org" ); w.addAttribute( "email", "dev@maven.apache.org" );
w.writeText( "Maven developement team." ); w.writeText( "Maven development team." );
w.endElement(); w.endElement();

15
maven-plugin-tools/maven-plugin-tools-java/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-tools</artifactId> <artifactId>maven-plugin-tools</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-plugin-tools-java</artifactId> <artifactId>maven-plugin-tools-java</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Plugin Tools for Java</name> <name>Maven Plugin Tools for Java</name>
@ -26,35 +25,35 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId> <artifactId>maven-plugin-tools-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -68,4 +67,4 @@
</testResource> </testResource>
</testResources> </testResources>
</build> </build>
</model> </model>

19
maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
View File

@ -1,18 +1,17 @@
<project> <project>
<parent> <parent>
<artifactId>maven-plugin-tools</artifactId> <artifactId>maven-plugin-tools</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-plugin-tools-marmalade</artifactId> <artifactId>maven-plugin-tools-marmalade</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Plugin Tools for Marmalade</name> <name>Maven Plugin Tools for Marmalade</name>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -33,35 +32,35 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-script-marmalade</artifactId> <artifactId>maven-script-marmalade</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId> <artifactId>maven-plugin-tools-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -82,14 +81,14 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId> <artifactId>maven-settings</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

17
maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-tools</artifactId> <artifactId>maven-plugin-tools</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-plugin-tools-pluggy</artifactId> <artifactId>maven-plugin-tools-pluggy</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Pluggy Simplistic Plugin Generator</name> <name>Maven Pluggy Simplistic Plugin Generator</name>
@ -26,46 +25,46 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId> <artifactId>maven-plugin-tools-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-java</artifactId> <artifactId>maven-plugin-tools-java</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

9
maven-plugin-tools/pom.xml
View File

@ -1,25 +1,24 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-plugin-tools</artifactId> <artifactId>maven-plugin-tools</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Plugin Tools Base POM</name> <name>Maven Plugin Tools Base POM</name>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId> <artifactId>maven-plugin-tools-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -40,4 +39,4 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

7
maven-plugin/pom.xml
View File

@ -1,18 +1,17 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Plugin</name> <name>Maven Plugin</name>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -43,4 +42,4 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

16
maven-plugin/src/main/java/org/apache/maven/plugin/AbstractPlugin.java
View File

@ -85,4 +85,20 @@ public abstract class AbstractPlugin
{ {
throw new PluginExecutionException( "You must override execute() if you implement the new paradigm" ); throw new PluginExecutionException( "You must override execute() if you implement the new paradigm" );
} }
/**
* @todo remove - harcoding.
*/
public static String getDefaultPluginArtifactId( String id )
{
return "maven-" + id + "-plugin";
}
/**
* @todo remove - harcoding.
*/
public static String getDefaultPluginGroupId()
{
return "org.apache.maven.plugins";
}
} }

6
maven-plugin/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
View File

@ -4,6 +4,7 @@ import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException; import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.apache.maven.plugin.AbstractPlugin;
import java.io.Reader; import java.io.Reader;
import java.util.ArrayList; import java.util.ArrayList;
@ -23,9 +24,8 @@ public class PluginDescriptorBuilder
PluginDescriptor pluginDescriptor = new PluginDescriptor(); PluginDescriptor pluginDescriptor = new PluginDescriptor();
// TODO: hardcoding pluginDescriptor.setGroupId( AbstractPlugin.getDefaultPluginGroupId() );
pluginDescriptor.setGroupId( "maven" ); pluginDescriptor.setArtifactId( AbstractPlugin.getDefaultPluginArtifactId( c.getChild( "id" ).getValue() ) );
pluginDescriptor.setArtifactId( "maven-" + c.getChild( "id" ).getValue() + "-plugin" );
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// Components // Components

7
maven-plugins/maven-assemble-plugin/pom.xml
View File

@ -1,23 +1,22 @@
<project> <project>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-assemble-plugin</artifactId> <artifactId>maven-assemble-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Assemble Plugin</name> <name>Maven Assemble Plugin</name>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</dependency> </dependency>

5
maven-plugins/maven-clean-plugin/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Clean Plugin</name> <name>Maven Clean Plugin</name>
@ -13,7 +12,7 @@
<inceptionYear>2001</inceptionYear> <inceptionYear>2001</inceptionYear>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

5
maven-plugins/maven-compiler-plugin/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Compiler Plugin</name> <name>Maven Compiler Plugin</name>
@ -13,7 +12,7 @@
<inceptionYear>2001</inceptionYear> <inceptionYear>2001</inceptionYear>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

13
maven-plugins/maven-deploy-plugin/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Deploy Plugin</name> <name>Maven Deploy Plugin</name>
@ -13,28 +12,28 @@
<inceptionYear>2004</inceptionYear> <inceptionYear>2004</inceptionYear>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId> <artifactId>maven-settings</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -55,4 +54,4 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

11
maven-plugins/maven-ejb-plugin/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-ejb-plugin</artifactId> <artifactId>maven-ejb-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven EJB Plugin</name> <name>Maven EJB Plugin</name>
@ -26,28 +25,28 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId> <artifactId>maven-archiver</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

9
maven-plugins/maven-install-plugin/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Install Plugin</name> <name>Maven Install Plugin</name>
@ -13,21 +12,21 @@
<inceptionYear>2004</inceptionYear> <inceptionYear>2004</inceptionYear>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

11
maven-plugins/maven-jar-plugin/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Jar Plugin</name> <name>Maven Jar Plugin</name>
@ -26,28 +25,28 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId> <artifactId>maven-archiver</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

15
maven-plugins/maven-plugin-plugin/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven</name> <name>Maven</name>
@ -13,42 +12,42 @@
<inceptionYear>2001</inceptionYear> <inceptionYear>2001</inceptionYear>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-api</artifactId> <artifactId>maven-plugin-tools-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-java</artifactId> <artifactId>maven-plugin-tools-java</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-tools-marmalade</artifactId> <artifactId>maven-plugin-tools-marmalade</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

7
maven-plugins/maven-resources-plugin/pom.xml
View File

@ -1,25 +1,24 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Resources Plugin</name> <name>Maven Resources Plugin</name>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

3
maven-plugins/maven-surefire-plugin/pom.xml
View File

@ -1,11 +1,10 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven Surefire Plugin</name> <name>Maven Surefire Plugin</name>

13
maven-plugins/maven-war-plugin/pom.xml
View File

@ -1,18 +1,17 @@
<model> <model>
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>Maven War Plugin</name> <name>Maven War Plugin</name>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -33,28 +32,28 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId> <artifactId>maven-archiver</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>

8
maven-plugins/pom.xml
View File

@ -1,6 +1,6 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Maven Plugin</name> <name>Maven Plugin</name>
@ -34,14 +34,14 @@
</developers> </developers>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -66,4 +66,4 @@
<url>scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2</url> <url>scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2</url>
</repository> </repository>
</distributionManagement> </distributionManagement>
</model> </model>

7
maven-reporting-api/pom.xml
View File

@ -2,16 +2,15 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<groupId>maven</groupId>
<artifactId>maven-reporting-api</artifactId> <artifactId>maven-reporting-api</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<inceptionYear>2005</inceptionYear> <inceptionYear>2005</inceptionYear>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</dependency> </dependency>
@ -30,7 +29,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>maven</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plexus-plugin</artifactId> <artifactId>maven-plexus-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</plugin> </plugin>

10
maven-repository-tools/pom.xml
View File

@ -1,20 +1,20 @@
<model> <model>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-repository-tools</artifactId> <artifactId>maven-repository-tools</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Repo Reaper</name> <name>Maven Repo Reaper</name>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -49,11 +49,11 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

10
maven-script/maven-script-marmalade/pom.xml
View File

@ -1,25 +1,25 @@
<model> <model>
<parent> <parent>
<artifactId>maven-script-root</artifactId> <artifactId>maven-script-root</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-script-marmalade</artifactId> <artifactId>maven-script-marmalade</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Marmalade Mojo Support</name> <name>Maven Marmalade Mojo Support</name>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
@ -47,4 +47,4 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

9
maven-script/pom.xml
View File

@ -1,29 +1,28 @@
<model> <model>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-script-root</artifactId> <artifactId>maven-script-root</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Maven Script Support Root</name> <name>Maven Script Support Root</name>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-monitor</artifactId> <artifactId>maven-monitor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin</artifactId> <artifactId>maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

4
maven-settings/pom.xml
View File

@ -2,17 +2,15 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
</parent> </parent>
<groupId>maven</groupId>
<artifactId>maven-settings</artifactId> <artifactId>maven-settings</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<name>Maven Local Settings Model</name> <name>Maven Local Settings Model</name>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>maven</groupId>
<artifactId>maven-modello-plugin</artifactId> <artifactId>maven-modello-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<goals> <goals>

2
pom.xml
View File

@ -1,6 +1,6 @@
<project> <project>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-component</artifactId> <artifactId>maven-component</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Maven Project</name> <name>Maven Project</name>

Some files were not shown because too many files have changed in this diff Show More