Author: jdcasey
Date: Tue Sep 20 13:05:08 2005
New Revision: 290552
URL: http://svn.apache.org/viewcvs?rev=290552&view=rev
Log:
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.
Modified:
maven/components/trunk/maven-core-it/it2002/project/pom.xml
maven/components/trunk/maven-core-it/it2002/test.sh
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Modified: maven/components/trunk/maven-core-it/it2002/project/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/pom.xml?rev=290552&r1=290551&r2=290552&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it2002/project/pom.xml (original)
+++ maven/components/trunk/maven-core-it/it2002/project/pom.xml Tue Sep 20
13:05:08 2005
@@ -101,6 +101,10 @@
<artifactId>maven-artifact</artifactId>
</dependency>
</dependencies>
+
+ <properties>
+ <testName>testValue</testName>
+ </properties>
</profile>
</profiles>
Modified: maven/components/trunk/maven-core-it/it2002/test.sh
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/test.sh?rev=290552&r1=290551&r2=290552&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it2002/test.sh (original)
+++ maven/components/trunk/maven-core-it/it2002/test.sh Tue Sep 20 13:05:08 2005
@@ -1,7 +1,6 @@
#!/bin/bash
rm -Rf target
-rm -Rf project.checkout
mkdir target
@@ -17,9 +16,9 @@
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
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=290552&r1=290551&r2=290552&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
Tue Sep 20 13:05:08 2005
@@ -543,7 +543,10 @@
if ( props != null )
{
- newProfile.setProperties( new Properties( props ) );
+ Properties newProps = new Properties();
+ newProps.putAll( props );
+
+ newProfile.setProperties( newProps );
}
newProfile.setReporting( cloneProfileReporting(
profile.getReporting() ) );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
