diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 132bc18fd3..3aa24c6772 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -4,4 +4,4 @@ foo jar 1.0 - \ No newline at end of file + diff --git a/maven-1.x-integration/pom.xml b/maven-1.x-integration/pom.xml index 1cb2776744..9a65af08df 100644 --- a/maven-1.x-integration/pom.xml +++ b/maven-1.x-integration/pom.xml @@ -1,11 +1,10 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-1.x-integration jar Maven 1.x Compatibility @@ -20,4 +19,4 @@ compile - \ No newline at end of file + diff --git a/maven-archetype/maven-archetype-core/pom.xml b/maven-archetype/maven-archetype-core/pom.xml index 5973ccbb8e..b9bd2d8188 100644 --- a/maven-archetype/maven-archetype-core/pom.xml +++ b/maven-archetype/maven-archetype-core/pom.xml @@ -1,11 +1,10 @@ maven-archetype - maven + org.apache.maven 1.0-alpha-1-SNAPSHOT 4.0.0 - maven maven-archetype-core jar 1.0-alpha-1-SNAPSHOT @@ -25,7 +24,7 @@ compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar @@ -39,4 +38,4 @@ compile - \ No newline at end of file + diff --git a/maven-archetype/maven-archetype-plugin/pom.xml b/maven-archetype/maven-archetype-plugin/pom.xml index aa70968df1..890a0e4ed2 100644 --- a/maven-archetype/maven-archetype-plugin/pom.xml +++ b/maven-archetype/maven-archetype-plugin/pom.xml @@ -1,22 +1,21 @@ maven-plugin-parent - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-archetype-plugin maven-plugin Maven Archetype Plugin 1.0-SNAPSHOT - maven + org.apache.maven maven-archetype-core 1.0-alpha-1-SNAPSHOT jar compile - \ No newline at end of file + diff --git a/maven-archetype/maven-archetype-site/pom.xml b/maven-archetype/maven-archetype-site/pom.xml index 24abb53d37..d3ef0ad053 100644 --- a/maven-archetype/maven-archetype-site/pom.xml +++ b/maven-archetype/maven-archetype-site/pom.xml @@ -1,12 +1,11 @@ maven-archetype - maven + org.apache.maven 1.0-alpha-1-SNAPSHOT 4.0.0 - maven maven-archetype-site jar 1.0 - \ No newline at end of file + diff --git a/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml index 85cc68bbb0..ea2668cfa9 100644 --- a/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml +++ b/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml @@ -1,11 +1,10 @@ maven-archetypes - maven + org.apache.maven 1.0-alpha-1-SNAPSHOT 4.0.0 - maven maven-archetype-mojo jar 1.0-alpha-1-SNAPSHOT diff --git a/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml index e8b3387031..eb5303a2f7 100644 --- a/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml +++ b/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml @@ -1,12 +1,11 @@ maven-archetypes - maven + org.apache.maven 1.0-alpha-1-SNAPSHOT 4.0.0 - maven maven-archetype-quickstart jar 1.0-alpha-1-SNAPSHOT - \ No newline at end of file + diff --git a/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml b/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml index b78670f727..24dc86cb64 100644 --- a/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml +++ b/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml @@ -1,12 +1,11 @@ maven-archetypes - maven + org.apache.maven 1.0-alpha-1-SNAPSHOT 4.0.0 - maven maven-archetype-webapp jar 1.0-alpha-1-SNAPSHOT - \ No newline at end of file + diff --git a/maven-archetype/maven-archetypes/pom.xml b/maven-archetype/maven-archetypes/pom.xml index 6ad70ea127..61d9c65162 100644 --- a/maven-archetype/maven-archetypes/pom.xml +++ b/maven-archetype/maven-archetypes/pom.xml @@ -1,11 +1,10 @@ maven-archetype - maven + org.apache.maven 1.0-alpha-1-SNAPSHOT 4.0.0 - maven maven-archetypes pom 1.0-alpha-1-SNAPSHOT diff --git a/maven-archetype/pom.xml b/maven-archetype/pom.xml index 9600e95bfe..9a0fbce509 100644 --- a/maven-archetype/pom.xml +++ b/maven-archetype/pom.xml @@ -1,11 +1,10 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-archetype pom 1.0-alpha-1-SNAPSHOT diff --git a/maven-archiver/pom.xml b/maven-archiver/pom.xml index ce0881dfc8..b24e52b31a 100644 --- a/maven-archiver/pom.xml +++ b/maven-archiver/pom.xml @@ -2,10 +2,9 @@ 4.0.0 maven-component - maven + org.apache.maven 2.0-SNAPSHOT - maven maven-archiver 1.0-SNAPSHOT Maven Archiver @@ -16,22 +15,22 @@ 1.0-alpha-1-SNAPSHOT - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT - maven + org.apache.maven maven-core 2.0-SNAPSHOT - maven + org.apache.maven maven-model 2.0-SNAPSHOT - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index ee95a8fc11..d56df2519b 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -1,11 +1,10 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-artifact jar Maven @@ -34,4 +33,4 @@ compile - \ No newline at end of file + diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java index 96f58a6382..3dc5b61063 100644 --- a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java +++ b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java @@ -247,7 +247,7 @@ public abstract class ArtifactComponentTestCase 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 ) diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/NewLayoutArtifactComponentTestCase.java b/maven-artifact/src/test/java/org/apache/maven/artifact/NewLayoutArtifactComponentTestCase.java index a00f637efc..67abea8134 100644 --- a/maven-artifact/src/test/java/org/apache/maven/artifact/NewLayoutArtifactComponentTestCase.java +++ b/maven-artifact/src/test/java/org/apache/maven/artifact/NewLayoutArtifactComponentTestCase.java @@ -229,7 +229,7 @@ public abstract class NewLayoutArtifactComponentTestCase 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 ) diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java index 4a0a0061e7..0eff043583 100644 --- a/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java +++ b/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java @@ -147,7 +147,7 @@ public class ArtifactResolverTest 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; @@ -184,7 +184,7 @@ public class ArtifactResolverTest 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; diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/NewLayoutArtifactResolverTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/NewLayoutArtifactResolverTest.java index 233bbbe7dd..1cf5d3b408 100644 --- a/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/NewLayoutArtifactResolverTest.java +++ b/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/NewLayoutArtifactResolverTest.java @@ -147,7 +147,7 @@ public class NewLayoutArtifactResolverTest 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; @@ -184,7 +184,7 @@ public class NewLayoutArtifactResolverTest 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; diff --git a/maven-artifact/src/test/resources/pom.xml b/maven-artifact/src/test/resources/pom.xml index 439c8a2b1b..7e6860ecf2 100644 --- a/maven-artifact/src/test/resources/pom.xml +++ b/maven-artifact/src/test/resources/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core jar Maven @@ -8,14 +8,14 @@ 2001 - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar @@ -85,7 +85,7 @@ compile - maven + org.apache.maven wagon-http-lightweight 0.9-SNAPSHOT jar @@ -113,4 +113,4 @@ compile - \ No newline at end of file + diff --git a/maven-core-it-plugin/pom.xml b/maven-core-it-plugin/pom.xml index d76343e68f..3e4e6160ad 100644 --- a/maven-core-it-plugin/pom.xml +++ b/maven-core-it-plugin/pom.xml @@ -1,11 +1,10 @@ maven-plugin-parent - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-core-it-plugin maven-plugin Maven Core Integration Test Plugin diff --git a/maven-core-it-support/pom.xml b/maven-core-it-support/pom.xml index de1cd8bed6..d1bcd96dcc 100644 --- a/maven-core-it-support/pom.xml +++ b/maven-core-it-support/pom.xml @@ -1,7 +1,14 @@ 4.0.0 - maven - maven-it-support + org.apache.maven + maven-core-it-support jar 1.0 - \ No newline at end of file + + + repo1 + Maven Central Repository + scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2 + + + diff --git a/maven-core-it-verifier/pom.xml b/maven-core-it-verifier/pom.xml index f81c4a31de..5c617d3068 100644 --- a/maven-core-it-verifier/pom.xml +++ b/maven-core-it-verifier/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - maven + org.apache.maven maven-core-it-verifier jar 1.0 - \ No newline at end of file + diff --git a/maven-core-it/it0000/pom.xml b/maven-core-it/it0000/pom.xml index 20f01d83ee..7022156b0b 100644 --- a/maven-core-it/it0000/pom.xml +++ b/maven-core-it/it0000/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it0000 jar 1.0 @@ -13,4 +13,4 @@ test - \ No newline at end of file + diff --git a/maven-core-it/it0001/pom.xml b/maven-core-it/it0001/pom.xml index dc977b29df..740b353e30 100644 --- a/maven-core-it/it0001/pom.xml +++ b/maven-core-it/it0001/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it0001 jar 1.0 @@ -13,4 +13,4 @@ test - \ No newline at end of file + diff --git a/maven-core-it/it0002/expected-results.txt b/maven-core-it/it0002/expected-results.txt index 47399fce2c..36600e5e64 100644 --- a/maven-core-it/it0002/expected-results.txt +++ b/maven-core-it/it0002/expected-results.txt @@ -2,4 +2,4 @@ target/classes/org/apache/maven/it0002/Person.class target/test-classes/org/apache/maven/it0002/PersonTest.class target/maven-core-it0002-1.0.jar 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 diff --git a/maven-core-it/it0002/pom.xml b/maven-core-it/it0002/pom.xml index f88a76a750..a1b8a8fd9c 100644 --- a/maven-core-it/it0002/pom.xml +++ b/maven-core-it/it0002/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it0002 jar 1.0 @@ -13,11 +13,11 @@ test - maven - maven-it-support + org.apache.maven + maven-core-it-support 1.0 jar compile - \ No newline at end of file + diff --git a/maven-core-it/it0002/prebuild-hook.txt b/maven-core-it/it0002/prebuild-hook.txt index 7e33354e0d..52fc6a5965 100755 --- a/maven-core-it/it0002/prebuild-hook.txt +++ b/maven-core-it/it0002/prebuild-hook.txt @@ -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 diff --git a/maven-core-it/it0003/expected-results.txt b/maven-core-it/it0003/expected-results.txt index 5d03beda4e..913f708ec7 100644 --- a/maven-core-it/it0003/expected-results.txt +++ b/maven-core-it/it0003/expected-results.txt @@ -2,4 +2,4 @@ target/classes/org/apache/maven/it0003/Person.class target/test-classes/org/apache/maven/it0003/PersonTest.class target/maven-core-it0003-1.0.jar 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 diff --git a/maven-core-it/it0003/pom.xml b/maven-core-it/it0003/pom.xml index 756f21e4bc..043fd09179 100644 --- a/maven-core-it/it0003/pom.xml +++ b/maven-core-it/it0003/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it0003 jar 1.0 @@ -13,4 +13,4 @@ test - \ No newline at end of file + diff --git a/maven-core-it/it0003/prebuild-hook.txt b/maven-core-it/it0003/prebuild-hook.txt index 35f6c61555..bd9b8983f7 100644 --- a/maven-core-it/it0003/prebuild-hook.txt +++ b/maven-core-it/it0003/prebuild-hook.txt @@ -1 +1 @@ -rm ${localRepository}/maven/jars/maven-core-it0003-1.0.jar +rm ${localRepository}/org.apache.maven/jars/maven-core-it0003-1.0.jar diff --git a/maven-core-it/it0004/expected-results.txt b/maven-core-it/it0004/expected-results.txt index d14c1bc605..198f2374b3 100644 --- a/maven-core-it/it0004/expected-results.txt +++ b/maven-core-it/it0004/expected-results.txt @@ -1 +1 @@ -${localRepository}/maven/poms/maven-core-it0004-1.0.pom +${localRepository}/org.apache.maven/poms/maven-core-it0004-1.0.pom diff --git a/maven-core-it/it0004/goals.txt b/maven-core-it/it0004/goals.txt index 3f0f331c81..c7021ab678 100644 --- a/maven-core-it/it0004/goals.txt +++ b/maven-core-it/it0004/goals.txt @@ -1 +1 @@ -pom:install +install:install diff --git a/maven-core-it/it0004/pom.xml b/maven-core-it/it0004/pom.xml index c50254bb6a..7650da3c59 100644 --- a/maven-core-it/it0004/pom.xml +++ b/maven-core-it/it0004/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - maven + org.apache.maven maven-core-it0004 - jar + pom 1.0 - \ No newline at end of file + diff --git a/maven-core-it/it0004/prebuild-hook.txt b/maven-core-it/it0004/prebuild-hook.txt index 537ff6672c..d42fce25c6 100644 --- a/maven-core-it/it0004/prebuild-hook.txt +++ b/maven-core-it/it0004/prebuild-hook.txt @@ -1 +1 @@ -rm ${localRepository}/maven/poms/maven-core-it0004-1.0.pom +rm ${localRepository}/org.apache.maven/poms/maven-core-it0004-1.0.pom diff --git a/maven-core-it/it0005/expected-results.txt b/maven-core-it/it0005/expected-results.txt index fb99d440ee..59a685b93e 100644 --- a/maven-core-it/it0005/expected-results.txt +++ b/maven-core-it/it0005/expected-results.txt @@ -1 +1 @@ -${localRepository}/maven/poms/maven-core-it0005-1.0-SNAPSHOT.pom +${localRepository}/org.apache.maven/poms/maven-core-it0005-1.0-SNAPSHOT.pom diff --git a/maven-core-it/it0005/goals.txt b/maven-core-it/it0005/goals.txt index 3f0f331c81..c7021ab678 100644 --- a/maven-core-it/it0005/goals.txt +++ b/maven-core-it/it0005/goals.txt @@ -1 +1 @@ -pom:install +install:install diff --git a/maven-core-it/it0005/pom.xml b/maven-core-it/it0005/pom.xml index 0ff8f6b6d2..cc279d32b6 100644 --- a/maven-core-it/it0005/pom.xml +++ b/maven-core-it/it0005/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - maven + org.apache.maven maven-core-it0005 - jar + pom 1.0-SNAPSHOT - \ No newline at end of file + diff --git a/maven-core-it/it0005/prebuild-hook.txt b/maven-core-it/it0005/prebuild-hook.txt index 76cfd9bcef..0a76bbfc6b 100644 --- a/maven-core-it/it0005/prebuild-hook.txt +++ b/maven-core-it/it0005/prebuild-hook.txt @@ -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 diff --git a/maven-core-it/it0007/expected-results.txt b/maven-core-it/it0007/expected-results.txt index 8cdc7a4a06..d53e3015a2 100644 --- a/maven-core-it/it0007/expected-results.txt +++ b/maven-core-it/it0007/expected-results.txt @@ -2,4 +2,4 @@ target/classes/org/apache/maven/it0007/Person.class target/test-classes/org/apache/maven/it0007/PersonTest.class target/maven-core-it0007-1.0.jar 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 diff --git a/maven-core-it/it0007/maven-it-support-parent-1.0.pom b/maven-core-it/it0007/maven-it-support-parent-1.0.pom index 94f417ade6..9d90c4b878 100644 --- a/maven-core-it/it0007/maven-it-support-parent-1.0.pom +++ b/maven-core-it/it0007/maven-it-support-parent-1.0.pom @@ -1,12 +1,12 @@ 4.0.0 - maven - maven-it-support-parent + org.apache.maven + maven-core-it-support-parent 1.0 - maven - maven-it-support + org.apache.maven + maven-core-it-support 1.0 diff --git a/maven-core-it/it0007/pom.xml b/maven-core-it/it0007/pom.xml index 7228197e47..ef3e101723 100644 --- a/maven-core-it/it0007/pom.xml +++ b/maven-core-it/it0007/pom.xml @@ -1,11 +1,10 @@ - maven-it-support - maven + maven-core-it-support + org.apache.maven 1.0 4.0.0 - maven maven-core-it0007 jar 1.0 diff --git a/maven-core-it/it0007/prebuild-hook.txt b/maven-core-it/it0007/prebuild-hook.txt index 2e84d78968..fbcd85cbf8 100644 --- a/maven-core-it/it0007/prebuild-hook.txt +++ b/maven-core-it/it0007/prebuild-hook.txt @@ -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 diff --git a/maven-core-it/it0008/pom.xml b/maven-core-it/it0008/pom.xml index 82d604c897..84497f174f 100644 --- a/maven-core-it/it0008/pom.xml +++ b/maven-core-it/it0008/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it0008 jar 1.0 @@ -16,7 +16,7 @@ - maven + org.apache.maven.plugins maven-core-it-plugin 1.0-SNAPSHOT diff --git a/maven-core-it/it0008/prebuild-hook.txt b/maven-core-it/it0008/prebuild-hook.txt index 283e4ea872..225beea707 100644 --- a/maven-core-it/it0008/prebuild-hook.txt +++ b/maven-core-it/it0008/prebuild-hook.txt @@ -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 diff --git a/maven-core-it/it0009/pom.xml b/maven-core-it/it0009/pom.xml index 95dffb01d6..2b3058e510 100644 --- a/maven-core-it/it0009/pom.xml +++ b/maven-core-it/it0009/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it0009 jar 1.0 @@ -16,7 +16,7 @@ - maven + org.apache.maven.plugins maven-core-it-plugin 1.0-SNAPSHOT diff --git a/maven-core-it/it0009/prebuild-hook.txt b/maven-core-it/it0009/prebuild-hook.txt index 283e4ea872..225beea707 100644 --- a/maven-core-it/it0009/prebuild-hook.txt +++ b/maven-core-it/it0009/prebuild-hook.txt @@ -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 diff --git a/maven-core-it/it0010/pom.xml b/maven-core-it/it0010/pom.xml index 6bdefab83e..142fb4510f 100644 --- a/maven-core-it/it0010/pom.xml +++ b/maven-core-it/it0010/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - maven + org.apache.maven maven-core-it0010 jar 1.0 - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar @@ -20,4 +20,4 @@ test - \ No newline at end of file + diff --git a/maven-core-it/it0010/prebuild-hook.txt b/maven-core-it/it0010/prebuild-hook.txt index 283e4ea872..225beea707 100644 --- a/maven-core-it/it0010/prebuild-hook.txt +++ b/maven-core-it/it0010/prebuild-hook.txt @@ -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 diff --git a/maven-core-it/it0011/pom.xml b/maven-core-it/it0011/pom.xml index f387bdcd6f..ed2ae43098 100644 --- a/maven-core-it/it0011/pom.xml +++ b/maven-core-it/it0011/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - maven + org.apache.maven maven-core-it0011 jar 1.0 - maven + org.apache.maven maven-plugin jar compile @@ -21,7 +21,7 @@ - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/maven-core-it/it0011/prebuild-hook.txt b/maven-core-it/it0011/prebuild-hook.txt index 283e4ea872..225beea707 100644 --- a/maven-core-it/it0011/prebuild-hook.txt +++ b/maven-core-it/it0011/prebuild-hook.txt @@ -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 diff --git a/maven-core-it/it0012/pom.xml b/maven-core-it/it0012/pom.xml index b892cd0eaf..8ac01be8ec 100644 --- a/maven-core-it/it0012/pom.xml +++ b/maven-core-it/it0012/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - maven + org.apache.maven maven-core-it0012 jar 3.8.1 - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar @@ -20,4 +20,4 @@ test - \ No newline at end of file + diff --git a/maven-core-it/it0012/prebuild-hook.txt b/maven-core-it/it0012/prebuild-hook.txt index 283e4ea872..225beea707 100644 --- a/maven-core-it/it0012/prebuild-hook.txt +++ b/maven-core-it/it0012/prebuild-hook.txt @@ -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 diff --git a/maven-core-it/it0013/pom.xml b/maven-core-it/it0013/pom.xml index 52a6ea8fc2..3ee4e1ac43 100644 --- a/maven-core-it/it0013/pom.xml +++ b/maven-core-it/it0013/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - maven + org.apache.maven.plugins maven-it0013-plugin maven-plugin 1.0-SNAPSHOT - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar diff --git a/maven-core-it/it0013/prebuild-hook.txt b/maven-core-it/it0013/prebuild-hook.txt index b656e4aa14..0a09373d82 100644 --- a/maven-core-it/it0013/prebuild-hook.txt +++ b/maven-core-it/it0013/prebuild-hook.txt @@ -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 diff --git a/maven-core-it/it0015/pom.xml b/maven-core-it/it0015/pom.xml index 956d410def..3ee7155297 100644 --- a/maven-core-it/it0015/pom.xml +++ b/maven-core-it/it0015/pom.xml @@ -1,19 +1,19 @@ 4.0.0 - maven + org.apache.maven.plugins maven-it0015-plugin maven-plugin 1.0-SNAPSHOT - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-script-marmalade 2.0-SNAPSHOT jar diff --git a/maven-core-it/it0016/pom.xml b/maven-core-it/it0016/pom.xml index eefd4d277f..378303f6d8 100644 --- a/maven-core-it/it0016/pom.xml +++ b/maven-core-it/it0016/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it0016 war 1.0 @@ -8,10 +8,10 @@ - maven + org.apache.maven.plugins maven-war-plugin 1.0-SNAPSHOT - \ No newline at end of file + diff --git a/maven-core-it/it0017/pom.xml b/maven-core-it/it0017/pom.xml index 3a3c9d996c..8b5acc77aa 100644 --- a/maven-core-it/it0017/pom.xml +++ b/maven-core-it/it0017/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it0017 ejb 1.0 @@ -8,10 +8,10 @@ - maven + org.apache.maven.plugins maven-ejb-plugin 1.0-SNAPSHOT - \ No newline at end of file + diff --git a/maven-core-it/it1000/pom.xml b/maven-core-it/it1000/pom.xml index 55b148f3b3..dd913cbf63 100644 --- a/maven-core-it/it1000/pom.xml +++ b/maven-core-it/it1000/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it1000 1.0 diff --git a/maven-core-it/it1002/pom.xml b/maven-core-it/it1002/pom.xml index 8030d5c32c..3346656f1b 100644 --- a/maven-core-it/it1002/pom.xml +++ b/maven-core-it/it1002/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - maven + org.apache.maven maven-core-it1002 jar 1.0 - \ No newline at end of file + diff --git a/maven-core-it/it1003/pom.xml b/maven-core-it/it1003/pom.xml index 0abb981b0b..ba5379f3bb 100644 --- a/maven-core-it/it1003/pom.xml +++ b/maven-core-it/it1003/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it1003 jar 1.0 @@ -13,4 +13,4 @@ test - \ No newline at end of file + diff --git a/maven-core-it/it1004/pom.xml b/maven-core-it/it1004/pom.xml index 4bc82cd86f..461ab5e495 100644 --- a/maven-core-it/it1004/pom.xml +++ b/maven-core-it/it1004/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core-it0018 1.0 @@ -18,4 +18,4 @@ 1.0-alpha-2-SNAPSHOT - \ No newline at end of file + diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 910b87532e..69198b57d0 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -1,11 +1,10 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-core jar Maven @@ -20,35 +19,35 @@ compile - maven + org.apache.maven maven-monitor 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-settings 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar @@ -90,7 +89,7 @@ compile - maven + org.apache.maven maven-script-marmalade 2.0-SNAPSHOT jar @@ -114,11 +113,11 @@ - maven + org.apache.maven.reports mail-lists - maven + org.apache.maven.reports dependencies @@ -129,4 +128,4 @@ scp://www.apache.org//www/maven.apache.org/m2 - \ No newline at end of file + diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java index 2f67e594c0..cbe28ae2e5 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java @@ -28,6 +28,8 @@ import org.apache.maven.monitor.event.EventDispatcher; import org.apache.maven.monitor.event.MavenEvents; import org.apache.maven.plugin.PluginExecutionException; 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.PluginDescriptor; import org.apache.maven.project.MavenProject; @@ -106,9 +108,9 @@ public class DefaultLifecycleExecutor 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 ); diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index d257dd65f1..c7991e89bd 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -72,6 +72,7 @@ public class DefaultPluginManager extends AbstractLogEnabled implements PluginManager, ComponentDiscoveryListener, Initializable, Contextualizable { + // TODO: share with type handler static String MAVEN_PLUGIN = "maven-plugin"; protected Map mojoDescriptors; @@ -207,7 +208,7 @@ public class DefaultPluginManager pluginId = pluginId.substring( 0, pluginId.indexOf( ":" ) ); } - return "maven-" + pluginId + "-plugin"; + return AbstractPlugin.getDefaultPluginArtifactId( pluginId ); } // TODO: don't throw Exception @@ -216,8 +217,7 @@ public class DefaultPluginManager { String pluginId = getPluginId( goalName ); - // TODO: hardcoding of group ID/artifact ID - verifyPlugin( "maven", pluginId, session ); + verifyPlugin( AbstractPlugin.getDefaultPluginGroupId(), pluginId, session ); } // TODO: don't throw Exception @@ -267,9 +267,8 @@ public class DefaultPluginManager artifactFactory = (ArtifactFactory) container.lookup( ArtifactFactory.ROLE ); - // TODO: more hard coding here... - Artifact pluginArtifact = artifactFactory.createArtifact( "maven", artifactId, version, null, - "maven-plugin", null ); + Artifact pluginArtifact = artifactFactory.createArtifact( AbstractPlugin.getDefaultPluginGroupId(), artifactId, + version, null, MAVEN_PLUGIN, null ); addPlugin( pluginArtifact, session ); } diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java index 234b0466cd..66f6e49311 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java @@ -63,7 +63,7 @@ public class MavenMojoDescriptor public String getRole() { - return "org.apache.maven.plugin.Plugin"; + return Plugin.ROLE; } public String getRoleHint() @@ -73,6 +73,6 @@ public class MavenMojoDescriptor public String getComponentType() { - return "maven-plugin"; + return DefaultPluginManager.MAVEN_PLUGIN; } } diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java index 5113b7f1ce..76b2fb4fab 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java @@ -27,7 +27,7 @@ public interface MavenProjectBuilder { 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"; diff --git a/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java index 9ac6604a22..cdca1db471 100644 --- a/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java @@ -55,7 +55,7 @@ public class CanonicalProjectBuilderTest Plugin plugin = (Plugin) plugins.get( 0 ); - assertEquals( "maven", plugin.getGroupId() ); + assertEquals( "org.apache.maven.plugins", plugin.getGroupId() ); assertEquals( "maven-plexus-plugin", plugin.getArtifactId() ); diff --git a/maven-core/src/test/java/org/apache/maven/util/introspection/ReflectionValueExtractorTest.java b/maven-core/src/test/java/org/apache/maven/util/introspection/ReflectionValueExtractorTest.java index 7989ec0305..3b63b06080 100644 --- a/maven-core/src/test/java/org/apache/maven/util/introspection/ReflectionValueExtractorTest.java +++ b/maven-core/src/test/java/org/apache/maven/util/introspection/ReflectionValueExtractorTest.java @@ -56,7 +56,7 @@ public class ReflectionValueExtractorTest 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 ) ); diff --git a/maven-core/src/test/resources/pom.xml b/maven-core/src/test/resources/pom.xml index 625adb7f56..08119c6901 100644 --- a/maven-core/src/test/resources/pom.xml +++ b/maven-core/src/test/resources/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-core jar Maven @@ -8,14 +8,14 @@ 2001 - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar @@ -25,4 +25,4 @@ scm-connection - \ No newline at end of file + diff --git a/maven-mboot2/pom.xml b/maven-mboot2/pom.xml index 2fcb393dce..07f290738d 100644 --- a/maven-mboot2/pom.xml +++ b/maven-mboot2/pom.xml @@ -1,14 +1,13 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-mboot jar Maven MBoot 2.0-SNAPSHOT Tool used to bootstrap m2. - \ No newline at end of file + diff --git a/maven-mboot2/src/main/java/MBoot.java b/maven-mboot2/src/main/java/MBoot.java index e8b884842f..524c02708d 100644 --- a/maven-mboot2/src/main/java/MBoot.java +++ b/maven-mboot2/src/main/java/MBoot.java @@ -53,13 +53,13 @@ public class MBoot "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", - "maven/jars/maven-artifact-2.0-SNAPSHOT.jar", - "maven/jars/maven-model-2.0-SNAPSHOT.jar", - "maven/jars/maven-plugin-2.0-SNAPSHOT.jar", - "maven/jars/maven-plugin-tools-api-2.0-SNAPSHOT.jar", - "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-core-2.0-SNAPSHOT.jar", + "org.apache.maven/jars/maven-artifact-2.0-SNAPSHOT.jar", + "org.apache.maven/jars/maven-model-2.0-SNAPSHOT.jar", + "org.apache.maven/jars/maven-plugin-2.0-SNAPSHOT.jar", + "org.apache.maven/jars/maven-plugin-tools-api-2.0-SNAPSHOT.jar", + "org.apache.maven/jars/maven-plugin-tools-java-2.0-SNAPSHOT.jar", + "org.apache.maven/jars/maven-plugin-tools-pluggy-2.0-SNAPSHOT.jar"}; // ---------------------------------------------------------------------- // These are modello's runtime dependencies @@ -135,8 +135,6 @@ public class MBoot private ArtifactDownloader downloader; - private ModelReader reader; - private String repoLocal; private List mbootDependencies; @@ -180,7 +178,7 @@ public class MBoot public void run( String[] args ) throws Exception { - reader = new ModelReader(); + ModelReader reader = new ModelReader(); String mavenRepoLocal = System.getProperty( "maven.repo.local" ); @@ -324,15 +322,13 @@ public class MBoot System.setProperty( "basedir", directory ); - buildProject( directory, builds[i] ); + reader = buildProject( directory, builds[i] ); if ( reader.artifactId.equals( "maven-core" ) ) { coreDeps = reader.getDependencies(); } - reader.reset(); - System.out.println( "--------------------------------------------------------------------" ); } @@ -348,9 +344,7 @@ public class MBoot System.setProperty( "basedir", directory ); - buildProject( directory, pluginBuilds[i] ); - - reader.reset(); + reader = buildProject( directory, pluginBuilds[i] ); System.out.println( "--------------------------------------------------------------------" ); } @@ -434,7 +428,7 @@ public class MBoot // 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(); @@ -475,11 +469,13 @@ public class MBoot System.out.println( "Finished at: " + fullStop ); } - public void buildProject( String basedir, String projectId ) + public ModelReader buildProject( String basedir, String projectId ) throws Exception { System.out.println( "Building project in " + basedir ); + ModelReader reader = new ModelReader(); + if ( !reader.parse( new File( basedir, "pom.xml" ) ) ) { System.err.println( "Could not parse pom.xml" ); @@ -651,24 +647,26 @@ public class MBoot // Run tests // ---------------------------------------------------------------------- - runTests( basedir, classes, testClasses ); + runTests( basedir, classes, testClasses, reader ); // ---------------------------------------------------------------------- // 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" ) ) { - installPlugin( basedir, repoLocal ); + installPlugin( basedir, repoLocal, reader ); } else { - installJar( basedir, repoLocal ); + installJar( basedir, repoLocal, reader ); } + + return reader; } IsolatedClassLoader cl; @@ -779,7 +777,7 @@ public class MBoot downloader.downloadDependencies( Arrays.asList( modelloDeps ) ); } - private void createJar( String classes, String buildDir ) + private void createJar( String classes, String buildDir, ModelReader reader ) throws Exception { JarMojo jarMojo = new JarMojo(); @@ -794,6 +792,8 @@ public class MBoot private void installPomFile( String repoLocal, File pomIn ) throws Exception { + ModelReader reader = new ModelReader(); + if ( !reader.parse( pomIn ) ) { System.err.println( "Could not parse pom.xml" ); @@ -807,16 +807,24 @@ public class MBoot 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" ); System.out.println( "Installing POM: " + 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 { String artifactId = reader.artifactId; @@ -825,6 +833,16 @@ public class MBoot 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" ); System.out.println( "Installing POM: " + pom ); @@ -832,7 +850,7 @@ public class MBoot 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 { String artifactId = reader.artifactId; @@ -841,6 +859,16 @@ public class MBoot 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" ); System.out.println( "Installing JAR: " + jar ); @@ -848,7 +876,7 @@ public class MBoot 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 { String artifactId = reader.artifactId; @@ -857,6 +885,16 @@ public class MBoot 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" ); System.out.println( "Installing Plugin: " + jar ); @@ -864,7 +902,7 @@ public class MBoot 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 { SurefirePlugin testRunner = new SurefirePlugin(); @@ -881,7 +919,7 @@ public class MBoot 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, classpath( reader.getDependencies(), null ), reportsDir ); @@ -1037,8 +1075,6 @@ public class MBoot { private SAXParserFactory saxFactory; - public abstract void reset(); - public boolean parse( File file ) { try @@ -1124,11 +1160,6 @@ public class MBoot private StringBuffer bodyText = new StringBuffer(); - public void reset() - { - dependencies = new ArrayList(); - } - public List getRemoteRepositories() { return remoteRepositories; diff --git a/maven-meeper/pom.xml b/maven-meeper/pom.xml index 72e856ce6a..d0677fe60a 100644 --- a/maven-meeper/pom.xml +++ b/maven-meeper/pom.xml @@ -1,14 +1,13 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-meeper jar Maven Meper 0.1-SNAPSHOT - \ No newline at end of file + diff --git a/maven-model/maven.mdo b/maven-model/maven.mdo index b64b4e2752..5ef838f1b5 100644 --- a/maven-model/maven.mdo +++ b/maven-model/maven.mdo @@ -1948,7 +1948,7 @@ groupId 4.0.0 String - maven + org.apache.maven.plugins artifactId diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 8758772506..f80c0f89fe 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -1,11 +1,11 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven + org.apache.maven maven-model jar Maven Model @@ -14,7 +14,7 @@ - maven + org.apache.maven.plugins maven-modello-plugin 1.0-SNAPSHOT diff --git a/maven-monitor/pom.xml b/maven-monitor/pom.xml index 8aad7f0f19..b6a2f3a26f 100644 --- a/maven-monitor/pom.xml +++ b/maven-monitor/pom.xml @@ -1,11 +1,10 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-monitor 2.0-SNAPSHOT Maven Monitor diff --git a/maven-plugin-tools/maven-plugin-tools-api/pom.xml b/maven-plugin-tools/maven-plugin-tools-api/pom.xml index d4aa70442a..b7a104cf87 100644 --- a/maven-plugin-tools/maven-plugin-tools-api/pom.xml +++ b/maven-plugin-tools/maven-plugin-tools-api/pom.xml @@ -1,11 +1,10 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-plugin-tools-api jar Maven Plugin Tools APIs @@ -19,28 +18,35 @@ compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar compile - maven + org.apache.maven + maven-monitor + 2.0-SNAPSHOT + jar + compile + + + org.apache.maven maven-model 2.0-SNAPSHOT jar diff --git a/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java b/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java index eeea2f6c57..ce44373f4d 100644 --- a/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java +++ b/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java @@ -73,7 +73,7 @@ public class PluginXdocGenerator w.addAttribute( "email", "dev@maven.apache.org" ); - w.writeText( "Maven developement team." ); + w.writeText( "Maven development team." ); w.endElement(); diff --git a/maven-plugin-tools/maven-plugin-tools-java/pom.xml b/maven-plugin-tools/maven-plugin-tools-java/pom.xml index 866cbeea42..8bae52fa88 100644 --- a/maven-plugin-tools/maven-plugin-tools-java/pom.xml +++ b/maven-plugin-tools/maven-plugin-tools-java/pom.xml @@ -1,11 +1,10 @@ maven-plugin-tools - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-plugin-tools-java jar Maven Plugin Tools for Java @@ -26,35 +25,35 @@ compile - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin-tools-api 2.0-SNAPSHOT jar @@ -68,4 +67,4 @@ - \ No newline at end of file + diff --git a/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml b/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml index 317131076f..8d70c6ca77 100644 --- a/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml +++ b/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml @@ -1,18 +1,17 @@ maven-plugin-tools - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-plugin-tools-marmalade jar Maven Plugin Tools for Marmalade 2.0-SNAPSHOT - maven + org.apache.maven maven-monitor 2.0-SNAPSHOT jar @@ -33,35 +32,35 @@ compile - maven + org.apache.maven maven-script-marmalade 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin-tools-api 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar @@ -82,14 +81,14 @@ test - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-settings 2.0-SNAPSHOT jar diff --git a/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml b/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml index 4431e4639d..e94fd25faa 100644 --- a/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml +++ b/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml @@ -1,11 +1,10 @@ maven-plugin-tools - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-plugin-tools-pluggy jar Maven Pluggy Simplistic Plugin Generator @@ -26,46 +25,46 @@ compile - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin-tools-api 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin-tools-java 2.0-SNAPSHOT jar compile - \ No newline at end of file + diff --git a/maven-plugin-tools/pom.xml b/maven-plugin-tools/pom.xml index 5dc60119f4..2e7dc0cdd9 100644 --- a/maven-plugin-tools/pom.xml +++ b/maven-plugin-tools/pom.xml @@ -1,25 +1,24 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-plugin-tools jar Maven Plugin Tools Base POM 2.0-SNAPSHOT - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin-tools-api 2.0-SNAPSHOT jar @@ -40,4 +39,4 @@ compile - \ No newline at end of file + diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 0031a5ad6c..669d98deb5 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -1,18 +1,17 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-plugin jar Maven Plugin 2.0-SNAPSHOT - maven + org.apache.maven maven-monitor 2.0-SNAPSHOT jar @@ -43,4 +42,4 @@ compile - \ No newline at end of file + diff --git a/maven-plugin/src/main/java/org/apache/maven/plugin/AbstractPlugin.java b/maven-plugin/src/main/java/org/apache/maven/plugin/AbstractPlugin.java index 44d8be0948..ff59046bd2 100644 --- a/maven-plugin/src/main/java/org/apache/maven/plugin/AbstractPlugin.java +++ b/maven-plugin/src/main/java/org/apache/maven/plugin/AbstractPlugin.java @@ -85,4 +85,20 @@ public abstract class AbstractPlugin { 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"; + } } diff --git a/maven-plugin/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java b/maven-plugin/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java index 4f4004b6ec..97fa0ed946 100644 --- a/maven-plugin/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java +++ b/maven-plugin/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java @@ -4,6 +4,7 @@ import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.PlexusConfigurationException; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; +import org.apache.maven.plugin.AbstractPlugin; import java.io.Reader; import java.util.ArrayList; @@ -23,9 +24,8 @@ public class PluginDescriptorBuilder PluginDescriptor pluginDescriptor = new PluginDescriptor(); - // TODO: hardcoding - pluginDescriptor.setGroupId( "maven" ); - pluginDescriptor.setArtifactId( "maven-" + c.getChild( "id" ).getValue() + "-plugin" ); + pluginDescriptor.setGroupId( AbstractPlugin.getDefaultPluginGroupId() ); + pluginDescriptor.setArtifactId( AbstractPlugin.getDefaultPluginArtifactId( c.getChild( "id" ).getValue() ) ); // ---------------------------------------------------------------------- // Components diff --git a/maven-plugins/maven-assemble-plugin/pom.xml b/maven-plugins/maven-assemble-plugin/pom.xml index 65a97ae057..7441a1a53c 100644 --- a/maven-plugins/maven-assemble-plugin/pom.xml +++ b/maven-plugins/maven-assemble-plugin/pom.xml @@ -1,23 +1,22 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-assemble-plugin maven-plugin Maven Assemble Plugin 1.0-SNAPSHOT - maven + org.apache.maven maven-core 2.0-SNAPSHOT - maven + org.apache.maven maven-model 2.0-SNAPSHOT diff --git a/maven-plugins/maven-clean-plugin/pom.xml b/maven-plugins/maven-clean-plugin/pom.xml index 934c19957f..f51035539d 100644 --- a/maven-plugins/maven-clean-plugin/pom.xml +++ b/maven-plugins/maven-clean-plugin/pom.xml @@ -1,11 +1,10 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-clean-plugin maven-plugin Maven Clean Plugin @@ -13,7 +12,7 @@ 2001 - maven + org.apache.maven maven-monitor 2.0-SNAPSHOT jar diff --git a/maven-plugins/maven-compiler-plugin/pom.xml b/maven-plugins/maven-compiler-plugin/pom.xml index 18fc2dd61e..ec99b833ef 100644 --- a/maven-plugins/maven-compiler-plugin/pom.xml +++ b/maven-plugins/maven-compiler-plugin/pom.xml @@ -1,11 +1,10 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-compiler-plugin maven-plugin Maven Compiler Plugin @@ -13,7 +12,7 @@ 2001 - maven + org.apache.maven maven-monitor 2.0-SNAPSHOT jar diff --git a/maven-plugins/maven-deploy-plugin/pom.xml b/maven-plugins/maven-deploy-plugin/pom.xml index beb17c5de2..8ae3d5f5ec 100644 --- a/maven-plugins/maven-deploy-plugin/pom.xml +++ b/maven-plugins/maven-deploy-plugin/pom.xml @@ -1,11 +1,10 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-deploy-plugin maven-plugin Maven Deploy Plugin @@ -13,28 +12,28 @@ 2004 - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-settings 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar @@ -55,4 +54,4 @@ runtime - \ No newline at end of file + diff --git a/maven-plugins/maven-ejb-plugin/pom.xml b/maven-plugins/maven-ejb-plugin/pom.xml index 6d83c944e8..e8eb994c8b 100644 --- a/maven-plugins/maven-ejb-plugin/pom.xml +++ b/maven-plugins/maven-ejb-plugin/pom.xml @@ -1,11 +1,10 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-ejb-plugin maven-plugin Maven EJB Plugin @@ -26,28 +25,28 @@ compile - maven + org.apache.maven maven-archiver 1.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar diff --git a/maven-plugins/maven-install-plugin/pom.xml b/maven-plugins/maven-install-plugin/pom.xml index 6fad97b90d..2e275a9d25 100644 --- a/maven-plugins/maven-install-plugin/pom.xml +++ b/maven-plugins/maven-install-plugin/pom.xml @@ -1,11 +1,10 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-install-plugin maven-plugin Maven Install Plugin @@ -13,21 +12,21 @@ 2004 - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar diff --git a/maven-plugins/maven-jar-plugin/pom.xml b/maven-plugins/maven-jar-plugin/pom.xml index c8946480ff..e346978699 100644 --- a/maven-plugins/maven-jar-plugin/pom.xml +++ b/maven-plugins/maven-jar-plugin/pom.xml @@ -1,11 +1,10 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-jar-plugin maven-plugin Maven Jar Plugin @@ -26,28 +25,28 @@ compile - maven + org.apache.maven maven-archiver 1.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar diff --git a/maven-plugins/maven-plugin-plugin/pom.xml b/maven-plugins/maven-plugin-plugin/pom.xml index 21a0a9761f..40d566f6d8 100644 --- a/maven-plugins/maven-plugin-plugin/pom.xml +++ b/maven-plugins/maven-plugin-plugin/pom.xml @@ -1,11 +1,10 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-plugin-plugin maven-plugin Maven @@ -13,42 +12,42 @@ 2001 - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin-tools-api 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin-tools-java 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin-tools-marmalade 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar diff --git a/maven-plugins/maven-resources-plugin/pom.xml b/maven-plugins/maven-resources-plugin/pom.xml index 13247e878d..7bb34deb63 100644 --- a/maven-plugins/maven-resources-plugin/pom.xml +++ b/maven-plugins/maven-resources-plugin/pom.xml @@ -1,25 +1,24 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-resources-plugin maven-plugin Maven Resources Plugin 1.0-SNAPSHOT - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar diff --git a/maven-plugins/maven-surefire-plugin/pom.xml b/maven-plugins/maven-surefire-plugin/pom.xml index 348e48b342..3e16a5b6ab 100644 --- a/maven-plugins/maven-surefire-plugin/pom.xml +++ b/maven-plugins/maven-surefire-plugin/pom.xml @@ -1,11 +1,10 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-surefire-plugin maven-plugin Maven Surefire Plugin diff --git a/maven-plugins/maven-war-plugin/pom.xml b/maven-plugins/maven-war-plugin/pom.xml index 457be7f97c..4595e333be 100644 --- a/maven-plugins/maven-war-plugin/pom.xml +++ b/maven-plugins/maven-war-plugin/pom.xml @@ -1,18 +1,17 @@ maven-plugin-parent - maven + org.apache.maven.plugins 2.0-SNAPSHOT 4.0.0 - maven maven-war-plugin maven-plugin Maven War Plugin 1.0-SNAPSHOT - maven + org.apache.maven maven-monitor 2.0-SNAPSHOT jar @@ -33,28 +32,28 @@ compile - maven + org.apache.maven maven-archiver 1.0-SNAPSHOT jar compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index bdb094aebe..4fdf30c4c0 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven.plugins maven-plugin-parent pom Maven Plugin @@ -34,14 +34,14 @@ - maven + org.apache.maven maven-monitor 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar @@ -66,4 +66,4 @@ scp://repo1.maven.org/home/projects/maven/repository/ibiblio-v2 - \ No newline at end of file + diff --git a/maven-reporting-api/pom.xml b/maven-reporting-api/pom.xml index 9af856004a..cef8d029d9 100755 --- a/maven-reporting-api/pom.xml +++ b/maven-reporting-api/pom.xml @@ -2,16 +2,15 @@ 4.0.0 maven-component - maven + org.apache.maven 2.0-SNAPSHOT - maven maven-reporting-api 2.0-SNAPSHOT 2005 - maven + org.apache.maven maven-model 2.0-SNAPSHOT @@ -30,7 +29,7 @@ - maven + org.apache.maven.plugins maven-plexus-plugin 1.0-SNAPSHOT diff --git a/maven-repository-tools/pom.xml b/maven-repository-tools/pom.xml index ec42c9e9f5..fd935eea80 100644 --- a/maven-repository-tools/pom.xml +++ b/maven-repository-tools/pom.xml @@ -1,20 +1,20 @@ 4.0.0 - maven + org.apache.maven maven-repository-tools jar Maven Repo Reaper 1.0-SNAPSHOT - maven + org.apache.maven maven-core 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar @@ -49,11 +49,11 @@ compile - maven + org.apache.maven maven-artifact 2.0-SNAPSHOT jar compile - \ No newline at end of file + diff --git a/maven-script/maven-script-marmalade/pom.xml b/maven-script/maven-script-marmalade/pom.xml index 1735af269d..efd3345708 100644 --- a/maven-script/maven-script-marmalade/pom.xml +++ b/maven-script/maven-script-marmalade/pom.xml @@ -1,25 +1,25 @@ maven-script-root - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven + org.apache.maven maven-script-marmalade jar Maven Marmalade Mojo Support 2.0-SNAPSHOT - maven + org.apache.maven maven-monitor 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar @@ -47,4 +47,4 @@ compile - \ No newline at end of file + diff --git a/maven-script/pom.xml b/maven-script/pom.xml index 966389ae1e..5eaab27050 100644 --- a/maven-script/pom.xml +++ b/maven-script/pom.xml @@ -1,29 +1,28 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven maven-script-root jar Maven Script Support Root 2.0-SNAPSHOT - maven + org.apache.maven maven-monitor 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-plugin 2.0-SNAPSHOT jar compile - \ No newline at end of file + diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index 1e0e8bf1d3..9295302668 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -2,17 +2,15 @@ 4.0.0 maven-component - maven + org.apache.maven 2.0-SNAPSHOT - maven maven-settings 2.0-SNAPSHOT Maven Local Settings Model - maven maven-modello-plugin 1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 301aa530a1..f425010021 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven maven-component pom Maven Project diff --git a/sandbox/maven-repository-plugin/pom.xml b/sandbox/maven-repository-plugin/pom.xml index 944104c15a..90afafe6a3 100644 --- a/sandbox/maven-repository-plugin/pom.xml +++ b/sandbox/maven-repository-plugin/pom.xml @@ -2,11 +2,10 @@ - maven + org.apache.maven.plugins maven-plugin-parent 2.0-SNAPSHOT - maven maven-repository-plugin plugin Maven Repository Plugin @@ -14,7 +13,7 @@ org.apache.maven.plugin.repository - maven + org.apache.maven maven-repository-tools 1.0-SNAPSHOT diff --git a/sandbox/pom-pre-alpha-converter/pom.xml b/sandbox/pom-pre-alpha-converter/pom.xml index 2ed0ed87c5..1df83d3eb6 100644 --- a/sandbox/pom-pre-alpha-converter/pom.xml +++ b/sandbox/pom-pre-alpha-converter/pom.xml @@ -1,24 +1,23 @@ maven-component - maven + org.apache.maven 2.0-SNAPSHOT 4.0.0 - maven pom-pre-alpha-converter jar 1.0 - maven + org.apache.maven maven-model 2.0-SNAPSHOT jar compile - maven + org.apache.maven maven-model 4.0.0-pre-alpha1 jar @@ -32,4 +31,4 @@ compile - \ No newline at end of file + diff --git a/sandbox/repoclean/pom.xml b/sandbox/repoclean/pom.xml index fcdacd3ad3..480177ee71 100644 --- a/sandbox/repoclean/pom.xml +++ b/sandbox/repoclean/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - maven + org.apache.maven repoclean 1.0-SNAPSHOT Maven v3-to-v4 Repository Cleaner @@ -43,4 +43,4 @@ test - \ No newline at end of file +