Index: core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java =================================================================== --- core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (revision 542862) +++ core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (working copy) @@ -158,6 +158,7 @@ suite.addTestSuite( MavenIT0119PluginPrefixOrder.class ); // not fixed yet //suite.addTestSuite( MavenIT0120EjbClientDependency.class ); + suite.addTestSuite( MavenIT0122ReactorDependencyResolutionTest.class ); return suite; } } Index: core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java =================================================================== --- core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java (revision 0) +++ core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0122ReactorDependencyResolutionTest.java (revision 0) @@ -0,0 +1,30 @@ +package org.apache.maven.integrationtests; + +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +import java.io.File; + +public class MavenIT0122ReactorDependencyResolutionTest + extends AbstractMavenIntegrationTestCase +{ + /** + * Test that reactor projects are included in dependency resolution. + * + * @throws Exception + */ + public void testit0122() throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0122-reactorDependencyResolution/plugin" ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.executeGoal( "install" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0122-reactorDependencyResolution/project" ); + verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.executeGoal( "org.apache.maven.its.it0122:maven-it-it0122-plugin:1.0:test" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + } +} Property changes on: core-integration-tests\src\test\java\org\apache\maven\integrationtests\MavenIT0122ReactorDependencyResolutionTest.java ___________________________________________________________________ Name: svn:keywords + Id HeadURL Name: svn:eol-style + native Index: core-integration-tests/src/test/resources/pom.xml =================================================================== --- core-integration-tests/src/test/resources/pom.xml (revision 542862) +++ core-integration-tests/src/test/resources/pom.xml (working copy) @@ -120,5 +120,6 @@ + it0122-reactorDependencyResolution Index: core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/project/main/pom.xml =================================================================== --- core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/project/main/pom.xml (revision 0) +++ core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/project/main/pom.xml (revision 0) @@ -0,0 +1,14 @@ + + 4.0.0 + Maven Integration Test :: it0122 :: Main + org.apache.maven.its.it0122 + maven-it-it0122-main + 1.0 + + + org.apache.maven.its.it0122 + maven-it-it0122-dependency + 1.0 + + + Property changes on: core-integration-tests\src\test\resources\it0122-reactorDependencyResolution\project\main\pom.xml ___________________________________________________________________ Name: svn:keywords + Id HeadURL Name: svn:eol-style + native Index: core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/project/pom.xml =================================================================== --- core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/project/pom.xml (revision 0) +++ core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/project/pom.xml (revision 0) @@ -0,0 +1,13 @@ + + 4.0.0 + Maven Integration Test :: it0122 + Test that reactor projects are included in dependency resolution. + org.apache.maven.its.it0122 + maven-it-it0122 + pom + 1.0 + + dependency + main + + Property changes on: core-integration-tests\src\test\resources\it0122-reactorDependencyResolution\project\pom.xml ___________________________________________________________________ Name: svn:keywords + Id HeadURL Name: svn:eol-style + native Index: core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/project/dependency/pom.xml =================================================================== --- core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/project/dependency/pom.xml (revision 0) +++ core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/project/dependency/pom.xml (revision 0) @@ -0,0 +1,7 @@ + + 4.0.0 + Maven Integration Test :: it0122 :: Dependency + org.apache.maven.its.it0122 + maven-it-it0122-dependency + 1.0 + Property changes on: core-integration-tests\src\test\resources\it0122-reactorDependencyResolution\project\dependency\pom.xml ___________________________________________________________________ Name: svn:keywords + Id HeadURL Name: svn:eol-style + native Index: core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/plugin/src/main/java/org/apache/maven/its/it0122/TestMojo.java =================================================================== --- core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/plugin/src/main/java/org/apache/maven/its/it0122/TestMojo.java (revision 0) +++ core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/plugin/src/main/java/org/apache/maven/its/it0122/TestMojo.java (revision 0) @@ -0,0 +1,46 @@ +package org.apache.maven.its.it0122; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.io.IOException; + +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; + +/** + * Simple Mojo that just requires compile-scope dependency resolution. + * + * @author Mark Hobson + * @version $Id$ + * @goal test + * @requiresDependencyResolution compile + */ +public class TestMojo extends AbstractMojo +{ + /** + * @see org.apache.maven.plugin.Mojo#execute() + */ + public void execute() throws MojoExecutionException, MojoFailureException + { + getLog().info("Test Mojo executed"); + } +} Property changes on: core-integration-tests\src\test\resources\it0122-reactorDependencyResolution\plugin\src\main\java\org\apache\maven\its\it0122\TestMojo.java ___________________________________________________________________ Name: svn:keywords + Id HeadURL Name: svn:eol-style + native Index: core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/plugin/pom.xml =================================================================== --- core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/plugin/pom.xml (revision 0) +++ core-integration-tests/src/test/resources/it0122-reactorDependencyResolution/plugin/pom.xml (revision 0) @@ -0,0 +1,15 @@ + + 4.0.0 + Maven Integration Test :: it0122 :: Plugin + org.apache.maven.its.it0122 + maven-it-it0122-plugin + maven-plugin + 1.0 + + + org.apache.maven + maven-plugin-api + 2.0 + + + Property changes on: core-integration-tests\src\test\resources\it0122-reactorDependencyResolution\plugin\pom.xml ___________________________________________________________________ Name: svn:keywords + Id HeadURL Name: svn:eol-style + native