diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 2564b1f751..dac3479eaf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -91,6 +91,7 @@ public class IntegrationTestSuite // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.class ); suite.addTestSuite( MavenITmng4203TransitiveDependencyExclusionTest.class ); suite.addTestSuite( MavenITmng4199CompileMeetsRuntimeScopeTest.class ); suite.addTestSuite( MavenITmng4196ExclusionOnPluginDepTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java new file mode 100644 index 0000000000..930fcaf15c --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java @@ -0,0 +1,62 @@ +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.Properties; + +/** + * This is a test set for MNG-4208. + * + * @author Benjamin Bentmann + */ +public class MavenITmng4208InterpolationPrefersCliOverProjectPropsTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4208InterpolationPrefersCliOverProjectPropsTest() + { + super( ALL_MAVEN_VERSIONS ); + } + + /** + * Test that exclusions defined on a dependency apply to its transitive dependencies as well. + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4208" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.getCliOptions().add( "-DtestProperty=PASSED" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + Properties props = verifier.loadProperties( "target/pom.properties" ); + assertEquals( "PASSED", props.getProperty( "project.properties.interpolatedProperty" ) ); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-4208/pom.xml b/its/core-it-suite/src/test/resources/mng-4208/pom.xml new file mode 100644 index 0000000000..eea351ab6a --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4208/pom.xml @@ -0,0 +1,64 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4208 + test + 0.1 + jar + + Maven Integration Test :: MNG-4208 + + Test that CLI properties specified by the user override project properties during interpolation. + + + + FAILED + ${testProperty} + + + + + + org.apache.maven.its.plugins + maven-it-plugin-expression + 2.1-SNAPSHOT + + + dump + validate + + target/pom.properties + + project/properties + + + + eval + + + + + + +