Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 61959 invoked from network); 5 Oct 2009 12:25:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Oct 2009 12:25:08 -0000 Received: (qmail 35748 invoked by uid 500); 5 Oct 2009 12:25:07 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 35657 invoked by uid 500); 5 Oct 2009 12:25:07 -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 35648 invoked by uid 99); 5 Oct 2009 12:25:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Oct 2009 12:25:07 +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; Mon, 05 Oct 2009 12:24:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 30D5B23888FC; Mon, 5 Oct 2009 12:24:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r821765 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4383/ resources/mng-4383/build/ resources/mng-4383/metadata/ resources/mng-4383/metadata/repo/ resources/mng-4383/metadata/re... Date: Mon, 05 Oct 2009 12:24:03 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091005122403.30D5B23888FC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Mon Oct 5 12:24:02 2009 New Revision: 821765 URL: http://svn.apache.org/viewvc?rev=821765&view=rev Log: [MNG-4383] Uninterpolated expressions should cause an error o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/build/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/build/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/a-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/a-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/b-0.2.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/b-0.2.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/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=821765&r1=821764&r2=821765&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 Mon Oct 5 12:24:02 2009 @@ -88,6 +88,7 @@ suite.addTestSuite( MavenITmng4387QuietLoggingTest.class ); suite.addTestSuite( MavenITmng4386DebugLoggingTest.class ); suite.addTestSuite( MavenITmng4385LifecycleMappingFromExtensionInReactorTest.class ); + suite.addTestSuite( MavenITmng4383ValidDependencyVersionTest.class ); suite.addTestSuite( MavenITmng4381ExtensionSingletonComponentTest.class ); suite.addTestSuite( MavenITmng4367LayoutAwareMirrorSelectionTest.class ); suite.addTestSuite( MavenITmng4365XmlMarkupInAttributeValueTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java?rev=821765&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java Mon Oct 5 12:24:02 2009 @@ -0,0 +1,97 @@ +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-4383. + * + * @author Benjamin Bentmann + */ +public class MavenITmng4383ValidDependencyVersionTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4383ValidDependencyVersionTest() + { + super( ALL_MAVEN_VERSIONS ); + } + + /** + * Test that non-interpolated dependency versions cause a validation error during building. + */ + public void testitProjectBuild() + throws Exception + { + requiresMavenVersion( "[3.0-alpha-3,)" ); + + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4383/build" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + try + { + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + fail( "Invalid dependency version did not cause validation error" ); + } + catch ( VerificationException e ) + { + // expected + } + finally + { + verifier.resetStreams(); + } + } + + /** + * Test that non-interpolated dependency versions in dependency POMs are gracefully ignored (as long as those + * dependencies are not actually resolved). + */ + public void testitMetadataRetrieval() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4383/metadata" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng4383" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.getCliOptions().add( "-s" ); + verifier.getCliOptions().add( "settings.xml" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + List classpath = verifier.loadLines( "target/test.txt", "UTF-8" ); + + assertTrue( classpath.toString(), classpath.contains( "b-0.2.jar" ) ); + assertTrue( classpath.toString(), classpath.contains( "a-0.1.jar" ) ); + } + +} Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/build/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/build/pom.xml?rev=821765&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/build/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/build/pom.xml Mon Oct 5 12:24:02 2009 @@ -0,0 +1,42 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4383 + test + 0.1 + jar + + Maven Integration Test :: MNG-4383 + + Test that non-interpolated dependency versions cause a validation error during building. + + + + + org.apache.maven.its.mng4383 + a + ${missing.property} + + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/build/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/build/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/pom.xml?rev=821765&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/pom.xml Mon Oct 5 12:24:02 2009 @@ -0,0 +1,66 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4383 + test + 0.1 + + Maven Integration Test :: MNG-4383 + + Test that non-interpolated dependency versions in dependency POMs are gracefully ignored (as long as those + dependencies are not actually resolved). + + + + + + org.apache.maven.its.mng4383 + b + 0.2 + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + + test + validate + + target/test.txt + 1 + + + compile + + + + + + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/a-0.1.jar URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/a-0.1.jar?rev=821765&view=auto ============================================================================== Binary file - no diff available. Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/a-0.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/a-0.1.pom URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/a-0.1.pom?rev=821765&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/a-0.1.pom (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/0.1/a-0.1.pom Mon Oct 5 12:24:02 2009 @@ -0,0 +1,36 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4383 + a + 0.1 + jar + + + + maven-core-it + file:///${basedir}/repo + + + Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/maven-metadata.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/maven-metadata.xml?rev=821765&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/maven-metadata.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/maven-metadata.xml Mon Oct 5 12:24:02 2009 @@ -0,0 +1,13 @@ + + + org.apache.maven.its.mng4383 + a + 0.1 + + 0.1 + + 0.1 + + 20091005120653 + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/maven-metadata.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/a/maven-metadata.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/b-0.2.jar URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/b-0.2.jar?rev=821765&view=auto ============================================================================== Binary file - no diff available. Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/b-0.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/b-0.2.pom URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/b-0.2.pom?rev=821765&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/b-0.2.pom (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/0.2/b-0.2.pom Mon Oct 5 12:24:02 2009 @@ -0,0 +1,51 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4383 + b + 0.2 + jar + + + + maven-core-it + file:///${basedir}/repo + + + + + + + org.apache.maven.its.mng4383 + a + 0.1 + + + org.apache.maven.its.mng4383 + x + ${missing.property} + test + + + Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/maven-metadata.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/maven-metadata.xml?rev=821765&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/maven-metadata.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/maven-metadata.xml Mon Oct 5 12:24:02 2009 @@ -0,0 +1,13 @@ + + + org.apache.maven.its.mng4383 + b + 0.2 + + 0.2 + + 0.2 + + 20091005120935 + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/maven-metadata.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/repo/org/apache/maven/its/mng4383/b/maven-metadata.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/settings-template.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/settings-template.xml?rev=821765&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/settings-template.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/settings-template.xml Mon Oct 5 12:24:02 2009 @@ -0,0 +1,43 @@ + + + + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/settings-template.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4383/metadata/settings-template.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision