diff --git a/maven-core-it/README.txt b/maven-core-it/README.txt index 259dc23907..dbc209c308 100644 --- a/maven-core-it/README.txt +++ b/maven-core-it/README.txt @@ -117,6 +117,7 @@ it0040: Test the use of a packaging from a plugin it0041: Test the use of a new type from a plugin it0042: Test that the reactor can establish the artifact location of known projects for dependencies + First test generate sources to see that it works even when they aren't compiled it0043: Test for repository inheritence - ensure using the same id overrides the defaults diff --git a/maven-core-it/it0042/goals.txt b/maven-core-it/it0042/goals.txt index ba3bd78738..302ef7d8f3 100644 --- a/maven-core-it/it0042/goals.txt +++ b/maven-core-it/it0042/goals.txt @@ -1 +1 @@ -package +generate-sources diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 4aaa9142b8..9f9b22af65 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -118,15 +118,9 @@ 2.0-beta-4-SNAPSHOT - plexus - plexus-input-handler - 1.0-alpha-2 - - - plexus-container-default - plexus - - + org.codehaus.plexus + plexus-input-handler-api + 1.0-alpha-3 org.apache.maven @@ -172,4 +166,4 @@ scp://minotaur.apache.org//www/maven.apache.org/m2 - \ No newline at end of file + 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 c56cca091d..eefaf190a5 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 @@ -1135,7 +1135,6 @@ public class DefaultPluginManager artifacts.add( "classworlds" ); artifacts.add( "commons-cli" ); artifacts.add( "doxia-sink-api" ); - artifacts.add( "jline" ); artifacts.add( "jsch" ); artifacts.add( "maven-artifact" ); artifacts.add( "maven-artifact-manager" ); @@ -1152,7 +1151,7 @@ public class DefaultPluginManager artifacts.add( "maven-repository-metadata" ); artifacts.add( "maven-settings" ); artifacts.add( "plexus-container-default" ); - artifacts.add( "plexus-input-handler" ); + artifacts.add( "plexus-input-handler-api" ); artifacts.add( "plexus-utils" ); artifacts.add( "wagon-provider-api" ); artifacts.add( "wagon-file" ); diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 8930b10c53..0edd4e912f 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -2,7 +2,7 @@ maven org.apache.maven - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 4.0.0 org.apache.maven @@ -33,7 +33,7 @@ org.apache.maven maven-settings - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven.wagon @@ -50,22 +50,22 @@ org.apache.maven.reporting maven-reporting-api - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven maven-profile - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven maven-model - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven maven-artifact - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven.wagon @@ -75,17 +75,17 @@ org.apache.maven maven-repository-metadata - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven maven-project - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven maven-plugin-registry - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 commons-cli @@ -95,32 +95,32 @@ org.apache.maven maven-plugin-api - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven maven-core - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 - plexus - plexus-input-handler - 1.0-alpha-2 + org.codehaus.plexus + plexus-input-handler-api + 1.0-alpha-3 org.apache.maven maven-plugin-descriptor - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven maven-monitor - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven maven-artifact-manager - 2.0-beta-3-SNAPSHOT + 2.0-beta-3 org.apache.maven.wagon diff --git a/maven-embedder/src/main/assembly/dep.xml b/maven-embedder/src/main/assembly/dep.xml index 5f733a043f..d0cf448b38 100644 --- a/maven-embedder/src/main/assembly/dep.xml +++ b/maven-embedder/src/main/assembly/dep.xml @@ -22,11 +22,6 @@ commons-lang:commons-lang commons-logging:commons-logging commons-cli:commons-cli - jsch:jsch org.apache.maven.wagon:wagon-ssh + plexus:plexus-container-default diff --git a/maven-plugins/maven-release-plugin/pom.xml b/maven-plugins/maven-release-plugin/pom.xml index 8c92c86624..4d47bb658b 100644 --- a/maven-plugins/maven-release-plugin/pom.xml +++ b/maven-plugins/maven-release-plugin/pom.xml @@ -26,8 +26,8 @@ plexus - plexus-input-handler - 1.0-alpha-2 + plexus-input-handler-api + 1.0-alpha-3 org.apache.maven.scm @@ -55,4 +55,4 @@ 1.0-alpha-2 - \ No newline at end of file +