brett 2004/07/06 05:23:41
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtils.java
Log:
PR: MAVEN-1296
Submitted by: Eric Lapierre
Reviewed by: Brett Porter
fix for property inheritence in some circumstances
Revision Changes Path
No revision
No revision
1.107.4.22 +3 -5 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.107.4.21
retrieving revision 1.107.4.22
diff -u -r1.107.4.21 -r1.107.4.22
--- MavenUtils.java 26 Jun 2004 14:52:05 -0000 1.107.4.21
+++ MavenUtils.java 6 Jul 2004 12:23:41 -0000 1.107.4.22
@@ -236,10 +236,8 @@
context.setParent( parent.getContext() );
}
- Properties properties = loadProjectBuildProperties(
parentPom.getParentFile() );
- integrateMapInContext( properties, context );
- properties = loadProjectProperties( parentPom.getParentFile() );
- integrateMapInContext( properties, context );
+ // Map in the parent context which already has the properties loaded
+ integrateMapInContext( parent.getContext().getVariables(), context );
project.mergeParent( parent );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
