Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 33588 invoked from network); 29 Sep 2010 21:29:39 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 29 Sep 2010 21:29:39 -0000 Received: (qmail 16235 invoked by uid 500); 29 Sep 2010 21:29:39 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 16136 invoked by uid 500); 29 Sep 2010 21:29:38 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 16129 invoked by uid 99); 29 Sep 2010 21:29:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Sep 2010 21:29:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Sep 2010 21:29:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7CA9A23888CF; Wed, 29 Sep 2010 21:29:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1002851 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4842/ resources/mng-4842/core/ resources/mng-4842/plugin/ resources/mng-4842/repo/ resources/mng-4842/repo/org/ resources/mn... Date: Wed, 29 Sep 2010 21:29:12 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100929212912.7CA9A23888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Wed Sep 29 21:29:10 2010 New Revision: 1002851 URL: http://svn.apache.org/viewvc?rev=1002851&view=rev Log: [MNG-4842] [regression] Repositories discovered in dependency POMs override repositories configured for original resolution request of POM o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/core/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/core/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/plugin/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/plugin/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/dep-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/dep-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/parent/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/parent/0.1/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/parent/0.1/parent-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/settings-template.xml (with props) Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=1002851&r1=1002850&r2=1002851&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Wed Sep 29 21:29:10 2010 @@ -83,6 +83,7 @@ public class IntegrationTestSuite // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng4842ParentResolutionOfDependencyPomTest.class ); suite.addTestSuite( MavenITmng4834ParentProjectResolvedFromRemoteReposTest.class ); suite.addTestSuite( MavenITmng4829ChecksumFailureWarningTest.class ); suite.addTestSuite( MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java?rev=1002851&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java Wed Sep 29 21:29:10 2010 @@ -0,0 +1,93 @@ +package org.apache.maven.it; + +/* + * 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 org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +import java.io.File; +import java.util.List; + +/** + * This is a test set for MNG-4842. + * + * @author Benjamin Bentmann + */ +public class MavenITmng4842ParentResolutionOfDependencyPomTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4842ParentResolutionOfDependencyPomTest() + { + super( "[2.0.3,3.0-alpha-1),[3.0,)" ); + } + + /** + * Verify that resolution of parent POMs for dependency POMs treats the remote repositories of the current + * resolution request as dominant when merging with any repositories declared in the dependency POM. This + * variant of the test checks dependency resolution by the core. + */ + public void testitCore() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4842" ); + + Verifier verifier = newVerifier( new File( testDir, "core" ).getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng4842" ); + verifier.getCliOptions().add( "-s" ); + verifier.getCliOptions().add( "settings.xml" ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List compile = verifier.loadLines( "target/compile.txt", "UTF-8" ); + + assertTrue( compile.toString(), compile.contains( "dep-0.1.jar" ) ); + verifier.assertArtifactPresent( "org.apache.maven.its.mng4842", "parent", "0.1", "pom" ); + } + + /** + * Verify that resolution of parent POMs for dependency POMs treats the remote repositories of the current + * resolution request as dominant when merging with any repositories declared in the dependency POM. This + * variant of the test checks manual dependency resolution by a plugin. + */ + public void testitPlugin() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4842" ); + + Verifier verifier = newVerifier( new File( testDir, "plugin" ).getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng4842" ); + verifier.getCliOptions().add( "-s" ); + verifier.getCliOptions().add( "settings.xml" ); + verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.assertArtifactPresent( "org.apache.maven.its.mng4842", "parent", "0.1", "pom" ); + } + +} Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/core/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/core/pom.xml?rev=1002851&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/core/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/core/pom.xml Wed Sep 29 21:29:10 2010 @@ -0,0 +1,67 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4842 + test + 0.1-SNAPSHOT + jar + + Maven Integration Test :: MNG-4842 + + Verify that resolution of parent POMs for dependency POMs treats the remote repositories of the current + resolution request as dominant when merging with any repositories declared in the dependency POM. This + variant of the test checks dependency resolution by the core. + + + + + org.apache.maven.its.mng4842 + dep + 0.1 + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile.txt + 1 + + + + resolve + validate + + compile + + + + + + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/core/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/core/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/plugin/pom.xml?rev=1002851&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/plugin/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/plugin/pom.xml Wed Sep 29 21:29:10 2010 @@ -0,0 +1,65 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4842 + test + 0.1-SNAPSHOT + jar + + Maven Integration Test :: MNG-4842 + + Verify that resolution of parent POMs for dependency POMs treats the remote repositories of the current + resolution request as dominant when merging with any repositories declared in the dependency POM. This + variant of the test checks manual dependency resolution by a plugin. + + + + + + org.apache.maven.its.plugins + maven-it-plugin-artifact + 2.1-SNAPSHOT + + target/artifact.properties + + + org.apache.maven.its.mng4842 + dep + 0.1 + + + + + + test + validate + + resolve-transitive + + + + + + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/plugin/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/plugin/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/dep-0.1.jar URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/dep-0.1.jar?rev=1002851&view=auto ============================================================================== Binary file - no diff available. Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/dep-0.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/dep-0.1.pom URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/dep-0.1.pom?rev=1002851&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/dep-0.1.pom (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/dep/0.1/dep-0.1.pom Wed Sep 29 21:29:10 2010 @@ -0,0 +1,59 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng4842 + parent + 0.1 + + + org.apache.maven.its.mng4842 + dep + 0.1 + jar + + + + + + maven-core-it + http://bad.host.mng4842/void + + false + fail + + + false + fail + + + + + + + maven-core-it + file:///${basedir}/repo + + + Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/parent/0.1/parent-0.1.pom URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/parent/0.1/parent-0.1.pom?rev=1002851&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/parent/0.1/parent-0.1.pom (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/repo/org/apache/maven/its/mng4842/parent/0.1/parent-0.1.pom Wed Sep 29 21:29:10 2010 @@ -0,0 +1,36 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4842 + parent + 0.1 + pom + + + + maven-core-it + file:///${basedir}/repo + + + Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/settings-template.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/settings-template.xml?rev=1002851&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/settings-template.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/settings-template.xml Wed Sep 29 21:29:10 2010 @@ -0,0 +1,46 @@ + + + + + + + + maven-core-it-repo + + + + maven-core-it + @baseurl@/../repo + + true + ignore + + + false + fail + + + + + + + maven-core-it-repo + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/settings-template.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4842/settings-template.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision