continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r538626 - in /maven/continuum/trunk/continuum-release: pom.xml src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java src/main/resources/META-INF/plexus/components.xml
Date Wed, 16 May 2007 15:11:13 GMT
Author: evenisse
Date: Wed May 16 08:11:12 2007
New Revision: 538626

URL: http://svn.apache.org/viewvc?view=rev&rev=538626
Log:
Update to the latest release manager

Modified:
    maven/continuum/trunk/continuum-release/pom.xml
    maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
    maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml

Modified: maven/continuum/trunk/continuum-release/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/pom.xml?view=diff&rev=538626&r1=538625&r2=538626
==============================================================================
--- maven/continuum/trunk/continuum-release/pom.xml (original)
+++ maven/continuum/trunk/continuum-release/pom.xml Wed May 16 08:11:12 2007
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.maven.release</groupId>
       <artifactId>maven-release-manager</artifactId>
-      <version>1.0-alpha-1</version>
+      <version>1.0-alpha-3-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>classworlds</groupId>

Modified: maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java?view=diff&rev=538626&r1=538625&r2=538626
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
(original)
+++ maven/continuum/trunk/continuum-release/src/main/java/org/apache/maven/continuum/release/executors/PerformReleaseTaskExecutor.java
Wed May 16 08:11:12 2007
@@ -19,41 +19,37 @@
  * under the License.
  */
 
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.continuum.release.ContinuumReleaseException;
 import org.apache.maven.continuum.release.tasks.PerformReleaseProjectTask;
 import org.apache.maven.continuum.release.tasks.ReleaseProjectTask;
-import org.apache.maven.continuum.release.ContinuumReleaseException;
-import org.apache.maven.shared.release.ReleaseManagerListener;
-import org.apache.maven.shared.release.ReleaseResult;
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.project.ProjectSorter;
+import org.apache.maven.profiles.DefaultProfileManager;
+import org.apache.maven.profiles.ProfileManager;
 import org.apache.maven.project.DuplicateProjectException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ProjectSorter;
 import org.apache.maven.settings.Settings;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileManager;
-import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
-import org.codehaus.plexus.util.dag.CycleDetectedException;
+import org.apache.maven.shared.release.ReleaseManagerListener;
+import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
+import org.codehaus.plexus.util.dag.CycleDetectedException;
 
+import java.io.File;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Iterator;
-import java.io.File;
+import java.util.List;
 
 /**
- *
- *
  * @author Edwin Punzalan
  */
 public class PerformReleaseTaskExecutor
@@ -77,13 +73,13 @@
         ReleaseManagerListener listener = performTask.getListener();
 
         ReleaseDescriptor descriptor = performTask.getDescriptor();
+        descriptor.setUseReleaseProfile( performTask.isUseReleaseProfile() );
+        descriptor.setPerformGoals( performTask.getGoals() );
+        descriptor.setCheckoutDirectory( performTask.getBuildDirectory().getAbsolutePath()
);
 
         List reactorProjects = getReactorProjects( performTask );
 
-        ReleaseResult result =
-            releaseManager.performWithResult( descriptor, settings, reactorProjects,
-                                                    performTask.getBuildDirectory(), performTask.getGoals(),
-                                                    performTask.isUseReleaseProfile(), listener
);
+        ReleaseResult result = releaseManager.performWithResult( descriptor, settings, reactorProjects,
listener );
 
         //override to show the actual start time
         result.setStartTime( getStartTime() );
@@ -131,18 +127,18 @@
         MavenProject project;
         try
         {
-            project = projectBuilder.build( getProjectDescriptorFile( descriptor ),
-                                            getLocalRepository(), getProfileManager( settings
) );
+            project = projectBuilder.build( getProjectDescriptorFile( descriptor ), getLocalRepository(),
+                                            getProfileManager( settings ) );
 
             reactorProjects.add( project );
-            
+
             addModules( reactorProjects, project );
         }
         catch ( ProjectBuildingException e )
         {
             throw new ContinuumReleaseException( "Failed to build project.", e );
         }
-        
+
         try
         {
             reactorProjects = new ProjectSorter( reactorProjects ).getSortedProjects();
@@ -162,20 +158,20 @@
     private void addModules( List reactorProjects, MavenProject project )
         throws ContinuumReleaseException
     {
-        for( Iterator modules = project.getModules().iterator(); modules.hasNext(); )
+        for ( Iterator modules = project.getModules().iterator(); modules.hasNext(); )
         {
             String moduleDir = modules.next().toString();
 
             File pomFile = new File( project.getBasedir(), moduleDir + "/pom.xml" );
-            System.out.println( pomFile.getAbsolutePath());
+            System.out.println( pomFile.getAbsolutePath() );
 
             try
             {
-                MavenProject reactorProject = projectBuilder.build( pomFile, getLocalRepository(),
-                                                                    getProfileManager( settings
) );
+                MavenProject reactorProject =
+                    projectBuilder.build( pomFile, getLocalRepository(), getProfileManager(
settings ) );
 
                 reactorProjects.add( reactorProject );
-                
+
                 addModules( reactorProjects, reactorProject );
             }
             catch ( ProjectBuildingException e )
@@ -201,7 +197,7 @@
     private ArtifactRepository getLocalRepository()
     {
         return new DefaultArtifactRepository( "local-repository", "file://" + settings.getLocalRepository(),
-                                                                                   new DefaultRepositoryLayout()
);
+                                              new DefaultRepositoryLayout() );
     }
 
     private ProfileManager getProfileManager( Settings settings )

Modified: maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=538626&r1=538625&r2=538626
==============================================================================
--- maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-release/src/main/resources/META-INF/plexus/components.xml
Wed May 16 08:11:12 2007
@@ -243,9 +243,6 @@
         <requirement>
           <role>org.apache.maven.shared.release.scm.ScmRepositoryConfigurator</role>
         </requirement>
-        <requirement>
-          <role>org.apache.maven.shared.release.exec.MavenExecutor</role>
-        </requirement>
       </requirements>
       <configuration>
         <preparePhases>
@@ -269,12 +266,9 @@
           <phase>end-release</phase>
         </preparePhases>
         <performPhases>
-          <phase>verify-release-configuration</phase>
           <phase>verify-completed-prepare-phases</phase>
-          <phase>configure-repositories</phase>
           <phase>checkout-project-from-scm</phase>
-          <phase>build-project</phase>
-          <phase>cleanup</phase>
+          <phase>run-perform-goals</phase>
         </performPhases>
         <rollbackPhases>
           <phase>generate-reactor-projects</phase>



Mime
View raw message