mirror of https://github.com/apache/maven.git
Resolving: MNG-930
o Fixed profile properties cloning in ModelUtils o Added properties to the test profile in it2002 o Moved the checkout dir for it2002 to be under target, to make it easier to clean. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290552 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
83d67e6f81
commit
a67d232228
|
@ -101,6 +101,10 @@
|
|||
<artifactId>maven-artifact</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
<testName>testValue</testName>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
rm -Rf target
|
||||
rm -Rf project.checkout
|
||||
|
||||
mkdir target
|
||||
|
||||
|
@ -17,9 +16,9 @@ fi
|
|||
svn import project file://localhost/${dir}/target/svnroot/project/trunk -m "import."
|
||||
svn mkdir file://localhost/${dir}/target/svnroot/project/tags -m "Creating tags dir."
|
||||
|
||||
svn co file://localhost/${dir}/target/svnroot/project/trunk project.checkout
|
||||
svn co file://localhost/${dir}/target/svnroot/project/trunk target/project.checkout
|
||||
|
||||
cd project.checkout
|
||||
cd target/project.checkout
|
||||
|
||||
cat pom.xml | sed "s#\${project.file.parentFile.parentFile}#$dir#g" >tmp
|
||||
mv tmp pom.xml
|
||||
|
|
|
@ -543,7 +543,10 @@ public final class ModelUtils
|
|||
|
||||
if ( props != null )
|
||||
{
|
||||
newProfile.setProperties( new Properties( props ) );
|
||||
Properties newProps = new Properties();
|
||||
newProps.putAll( props );
|
||||
|
||||
newProfile.setProperties( newProps );
|
||||
}
|
||||
|
||||
newProfile.setReporting( cloneProfileReporting( profile.getReporting() ) );
|
||||
|
|
Loading…
Reference in New Issue