maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase GoalAttainmentPhase.java
Date Tue, 28 Dec 2004 19:32:36 GMT
jvanzyl     2004/12/28 11:32:36

  Modified:    maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase
                        GoalAttainmentPhase.java
  Log:
  o don't merge configuration if there is no project. again here we
    might always want to send the super POM through for consistency.
  
  Revision  Changes    Path
  1.10      +5 -2      maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalAttainmentPhase.java
  
  Index: GoalAttainmentPhase.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalAttainmentPhase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- GoalAttainmentPhase.java	25 Dec 2004 16:38:26 -0000	1.9
  +++ GoalAttainmentPhase.java	28 Dec 2004 19:32:36 -0000	1.10
  @@ -127,7 +127,10 @@
                   map.put( key, value );
               }
   
  -            map = mergeProjectDefinedPluginConfiguration( context.getProject(), goal.getId(),
map );
  +            if ( context.getProject() != null )
  +            {
  +                map = mergeProjectDefinedPluginConfiguration( context.getProject(), goal.getId(),
map );
  +            }
           }
   
           for ( int i = 0; i < parameters.size(); i++ )
  
  
  

Mime
View raw message