maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/lifecycle DefaultLifecycleExecutor.java
Date Thu, 17 Mar 2005 02:26:19 GMT
brett       2005/03/16 18:26:19

  Modified:    maven-core/src/main/java/org/apache/maven/lifecycle
                        DefaultLifecycleExecutor.java
  Log:
  another issue with re-initialising the phases in the reactor
  
  Revision  Changes    Path
  1.27      +4 -12     maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
  
  Index: DefaultLifecycleExecutor.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- DefaultLifecycleExecutor.java	16 Mar 2005 23:19:00 -0000	1.26
  +++ DefaultLifecycleExecutor.java	17 Mar 2005 02:26:19 -0000	1.27
  @@ -332,14 +332,9 @@
               {
                   throw new LifecycleExecutionException( "Required goal not found: " + task
);
               }
  -
  -            if ( mojoDescriptor.getPhase() != null )
  -            {
  -                Phase phase = (Phase) phaseMap.get( mojoDescriptor.getPhase() );
  -
  -                phase.getGoals().add( task );
  -            }
           }
  +
  +        configureMojo( mojoDescriptor, phaseMap );
       }
   
       private void executePhase( String phase, MavenSession session, MavenExecutionResponse
response, Map phaseMap )
  @@ -407,11 +402,8 @@
           try
           {
               Logger logger = getLogger();
  -            logger.debug(
  -                "Resolving artifacts from:\n" + "\t{localRepository: " + session.getLocalRepository()
+ "}\n" +
  -                "\t{remoteRepositories: " +
  -                session.getRemoteRepositories() +
  -                "}" );
  +            logger.debug( "Resolving artifacts from:\n" + "\t{localRepository: " + session.getLocalRepository()
+
  +                          "}\n" + "\t{remoteRepositories: " + session.getRemoteRepositories()
+ "}" );
   
               return pluginManager.executeMojo( session, id );
           }
  
  
  

Mime
View raw message