Author: evenisse
Date: Mon Apr 30 08:11:42 2007
New Revision: 533770
URL: http://svn.apache.org/viewvc?view=rev&rev=533770
Log:
Generate component descriptor when it is possible
Modified:
maven/release/trunk/maven-release-manager/pom.xml
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunGoalsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Mon Apr 30 08:11:42 2007
@@ -217,6 +217,33 @@
<model>src/main/mdo/release-descriptor.mdo</model>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.3</version>
+ <executions>
+ <execution>
+ <id>generate</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>merge</id>
+ <!--
+ <configuration>
+ <descriptors>
+
<descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
+
<descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ -->
+ <goals>
+ <goal>merge-descriptors</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
Mon Apr 30 08:11:42 2007
@@ -322,11 +322,8 @@
logInfo( result, "Checking out the project to perform the release ..."
);
- updateListener( listener, "verify-release-configuration", PHASE_START
);
-
ReleaseDescriptor config = loadReleaseDescriptor( releaseDescriptor,
listener );
- updateListener( listener, "verify-release-configuration", PHASE_END );
updateListener( listener, "verify-completed-prepare-phases",
PHASE_START );
// if we stopped mid-way through preparation - don't perform
@@ -350,6 +347,7 @@
}
updateListener( listener, "verify-completed-prepare-phases", PHASE_END
);
+
updateListener( listener, "configure-repositories", PHASE_START );
ScmRepository repository;
@@ -431,7 +429,8 @@
try
{
- File workingDirectory =
determineWorkingDirectory(checkoutDirectory,
scmResult.getRelativePathProjectDirectory());
+ File workingDirectory =
+ determineWorkingDirectory( checkoutDirectory,
scmResult.getRelativePathProjectDirectory() );
mavenExecutor.executeGoals( workingDirectory, goals,
config.isInteractive(), additionalArguments,
config.getPomFileName(), result );
}
@@ -455,15 +454,13 @@
* Determines the path of the working directory. By default, this is the
* checkout directory. For some SCMs, the project root directory is not the
* checkout directory itself, but a SCM-specific subdirectory.
- *
- * @param checkoutDirectory
- * The checkout directory as java.io.File
- * @param relativePathProjectDirectory
- * The relative path of the project directory within the
checkout
- * directory or ""
+ *
+ * @param checkoutDirectory The checkout directory as
java.io.File
+ * @param relativePathProjectDirectory The relative path of the project
directory within the checkout
+ * directory or ""
* @return The working directory
*/
- protected File determineWorkingDirectory( File checkoutDirectory, String
relativePathProjectDirectory)
+ protected File determineWorkingDirectory( File checkoutDirectory, String
relativePathProjectDirectory )
{
if ( StringUtils.isNotEmpty( relativePathProjectDirectory ) )
{
@@ -481,7 +478,10 @@
{
try
{
- return configStore.read( releaseDescriptor );
+ updateListener( listener, "verify-release-configuration",
PHASE_START );
+ ReleaseDescriptor descriptor = configStore.read( releaseDescriptor
);
+ updateListener( listener, "verify-release-configuration",
PHASE_END );
+ return descriptor;
}
catch ( ReleaseDescriptorStoreException e )
{
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
Mon Apr 30 08:11:42 2007
@@ -41,6 +41,7 @@
* Read and write release configuration and state from a properties file.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component
role="org.apache.maven.shared.release.config.ReleaseDescriptorStore"
role-hint="properties"
*/
public class PropertiesReleaseDescriptorStore
extends AbstractLogEnabled
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
Mon Apr 30 08:11:42 2007
@@ -25,6 +25,7 @@
* Create a command line instance.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component
role="org.apache.maven.shared.release.exec.CommandLineFactory"
*/
public class DefaultCommandLineFactory
implements CommandLineFactory
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
Mon Apr 30 08:11:42 2007
@@ -33,6 +33,7 @@
* Fork Maven to executed a series of goals.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.exec.MavenExecutor"
*/
public class ForkedMavenExecutor
extends AbstractLogEnabled
@@ -40,6 +41,8 @@
{
/**
* Command line factory.
+ *
+ * @plexus.requirement
*/
private CommandLineFactory commandLineFactory;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Mon Apr 30 08:11:42 2007
@@ -51,6 +51,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @todo plugins with no version will be resolved to RELEASE which is not a
snapshot, but remains unresolved to this point. This is a potential hole in the
check, and should be revisited after the release pom writing is done and
resolving versions to verify whether it is.
* @todo plugins injected by the lifecycle are not tested here. They will be
injected with a RELEASE version so are covered under the above point.
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="check-dependency-snapshots"
*/
public class CheckDependencySnapshotsPhase
extends AbstractReleasePhase
@@ -77,11 +78,15 @@
/**
* Component used to prompt for input.
+ *
+ * @plexus.requirement
*/
private Prompter prompter;
/**
* Component used to create artifacts
+ *
+ * @plexus.requirement
*/
private ArtifactFactory artifactFactory;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
Mon Apr 30 08:11:42 2007
@@ -40,12 +40,15 @@
* Phase that checks the validity of the POM before release.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="check-poms"
*/
public class CheckPomPhase
extends AbstractReleasePhase
{
/**
* Retrieve an SCM repository, useful for validating an URL.
+ *
+ * @plexus.requirement
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
Mon Apr 30 08:11:42 2007
@@ -19,20 +19,21 @@
* under the License.
*/
-import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
+import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
-import java.util.List;
-import java.util.Iterator;
import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
/**
* @author Edwin Punzalan
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="create-backup-poms"
*/
public class CreateBackupPomsPhase
extends AbstractBackupPomsPhase
@@ -45,7 +46,7 @@
//remove previous backups, if any
clean( reactorProjects );
- for( Iterator projects = reactorProjects.iterator();
projects.hasNext(); )
+ for ( Iterator projects = reactorProjects.iterator();
projects.hasNext(); )
{
MavenProject project = (MavenProject) projects.next();
@@ -61,7 +62,7 @@
{
ReleaseResult result = new ReleaseResult();
- for( Iterator projects = reactorProjects.iterator();
projects.hasNext(); )
+ for ( Iterator projects = reactorProjects.iterator();
projects.hasNext(); )
{
MavenProject project = (MavenProject) projects.next();
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
Mon Apr 30 08:11:42 2007
@@ -31,11 +31,11 @@
* Finalise release preparation so it can be flagged complete..
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="end-release"
*/
public class EndReleasePhase
extends AbstractReleasePhase
{
-
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
Settings settings, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
{
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
Mon Apr 30 08:11:42 2007
@@ -30,6 +30,7 @@
* Generate release POMs.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="generate-release-poms"
*/
public class GenerateReleasePomsPhase
extends AbstractReleasePhase
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
Mon Apr 30 08:11:42 2007
@@ -41,17 +41,22 @@
* Input any variables that were not yet configured.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="input-variables"
*/
public class InputVariablesPhase
extends AbstractReleasePhase
{
/**
* Component used to prompt for input.
+ *
+ * @plexus.requirement
*/
private Prompter prompter;
/**
* Tool that gets a configured SCM repository from release configuration.
+ *
+ * @plexus.requirement
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
Mon Apr 30 08:11:42 2007
@@ -30,6 +30,7 @@
* Remove release POMs.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="remove-release-poms"
*/
public class RemoveReleasePomsPhase
extends AbstractReleasePhase
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
Mon Apr 30 08:11:42 2007
@@ -1,10 +1,10 @@
package org.apache.maven.shared.release.phase;
-import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
+import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.settings.Settings;
import java.util.List;
@@ -29,6 +29,7 @@
/**
* @author Edwin Punzalan
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="remove-scm-tag"
*/
public class RemoveScmTagPhase
extends AbstractReleasePhase
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
Mon Apr 30 08:11:42 2007
@@ -19,21 +19,22 @@
* under the License.
*/
-import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
+import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.FileUtils;
-import java.util.List;
-import java.util.Iterator;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
/**
* @author Edwin Punzalan
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="restore-backup-poms"
*/
public class RestoreBackupPomsPhase
extends AbstractBackupPomsPhase
@@ -43,7 +44,7 @@
{
ReleaseResult result = new ReleaseResult();
- for( Iterator projects = reactorProjects.iterator();
projects.hasNext(); )
+ for ( Iterator projects = reactorProjects.iterator();
projects.hasNext(); )
{
MavenProject project = (MavenProject) projects.next();
@@ -68,8 +69,8 @@
if ( !pomBackup.exists() )
{
- throw new ReleaseExecutionException( "Cannot restore from a
missing backup POM: " +
- pomBackup.getAbsolutePath() );
+ throw new ReleaseExecutionException(
+ "Cannot restore from a missing backup POM: " +
pomBackup.getAbsolutePath() );
}
try
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunGoalsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunGoalsPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunGoalsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunGoalsPhase.java
Mon Apr 30 08:11:42 2007
@@ -34,12 +34,15 @@
* Run the integration tests for the project to verify that it builds before
committing.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="run-preparation-goals"
*/
public class RunGoalsPhase
extends AbstractReleasePhase
{
/**
* Component to assist in executing Maven.
+ *
+ * @plexus.requirement
*/
private MavenExecutor mavenExecutor;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
Mon Apr 30 08:11:42 2007
@@ -47,12 +47,15 @@
* See if there are any local modifications to the files before proceeding
with SCM operations and the release.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="scm-check-modifications"
*/
public class ScmCheckModificationsPhase
extends AbstractReleasePhase
{
/**
* Tool that gets a configured SCM repository from release configuration.
+ *
+ * @plexus.requirement
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
@@ -61,9 +64,8 @@
*
* @todo proper construction of filenames, especially release properties
*/
- private Set excludedFiles = new HashSet( Arrays.asList(
- new String[]{"pom.xml", "pom.xml.backup", "pom.xml.tag",
"pom.xml.next", "release.properties",
- "pom.xml.releaseBackup"} ) );
+ private Set excludedFiles = new HashSet( Arrays.asList( new
String[]{"pom.xml", "pom.xml.backup", "pom.xml.tag",
+ "pom.xml.next", "release.properties", "pom.xml.releaseBackup"} ) );
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
Settings settings, List reactorProjects )
throws ReleaseExecutionException, ReleaseFailureException
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java
Mon Apr 30 08:11:42 2007
@@ -112,8 +112,7 @@
return relResult;
}
- private void checkin( ScmProvider provider, ScmRepository repository,
ScmFileSet fileSet,
- String message )
+ private void checkin( ScmProvider provider, ScmRepository repository,
ScmFileSet fileSet, String message )
throws ReleaseExecutionException, ReleaseScmCommandException
{
CheckInScmResult result;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
Mon Apr 30 08:11:42 2007
@@ -42,12 +42,15 @@
* Tag the SCM repository after committing the release.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="scm-tag"
*/
public class ScmTagPhase
extends AbstractReleasePhase
{
/**
* Tool that gets a configured SCM repository from release configuration.
+ *
+ * @plexus.requirement
*/
private ScmRepositoryConfigurator scmRepositoryConfigurator;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java
Mon Apr 30 08:11:42 2007
@@ -23,6 +23,7 @@
* ClearCase tag translator.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Arne Degenring</a>
+ * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator"
role-hint="clearcase"
*/
public class ClearCaseScmTranslator
implements ScmTranslator
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java
Mon Apr 30 08:11:42 2007
@@ -23,6 +23,7 @@
* Subversion tag translator.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator"
role-hint="cvs"
*/
public class CvsScmTranslator
implements ScmTranslator
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
Mon Apr 30 08:11:42 2007
@@ -37,6 +37,7 @@
* Tool that gets a configured SCM repository from release configuration.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component
role="org.apache.maven.shared.release.scm.ScmRepositoryConfigurator"
*/
public class DefaultScmRepositoryConfigurator
extends AbstractLogEnabled
@@ -44,6 +45,8 @@
{
/**
* The SCM manager.
+ *
+ * @plexus.requirement
*/
private ScmManager scmManager;
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
Mon Apr 30 08:11:42 2007
@@ -26,6 +26,7 @@
* Subversion tag translator.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator"
role-hint="svn"
*/
public class SubversionScmTranslator
implements ScmTranslator
Modified:
maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=533770&r1=533769&r2=533770
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml
Mon Apr 30 08:11:42 2007
@@ -61,7 +61,6 @@
<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>
@@ -77,30 +76,6 @@
</component>
<component>
<role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>check-poms</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.CheckPomPhase</implementation>
- <requirements>
- <requirement>
-
<role>org.apache.maven.shared.release.scm.ScmRepositoryConfigurator</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>input-variables</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.InputVariablesPhase</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.components.interactivity.Prompter</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
-
<role>org.apache.maven.shared.release.scm.ScmRepositoryConfigurator</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
<role-hint>map-release-versions</role-hint>
<implementation>org.apache.maven.shared.release.phase.MapVersionsPhase</implementation>
<configuration>
@@ -129,30 +104,6 @@
</component>
<component>
<role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>scm-check-modifications</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.ScmCheckModificationsPhase</implementation>
- <requirements>
- <requirement>
-
<role>org.apache.maven.shared.release.scm.ScmRepositoryConfigurator</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>check-dependency-snapshots</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.CheckDependencySnapshotsPhase</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.components.interactivity.Prompter</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
<role-hint>rewrite-poms-for-release</role-hint>
<implementation>org.apache.maven.shared.release.phase.RewritePomsForReleasePhase</implementation>
<configuration>
@@ -170,26 +121,6 @@
</component>
<component>
<role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>generate-release-poms</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.GenerateReleasePomsPhase</implementation>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>remove-release-poms</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.RemoveReleasePomsPhase</implementation>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>run-preparation-goals</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.RunGoalsPhase</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.shared.release.exec.MavenExecutor</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
<role-hint>scm-commit-release</role-hint>
<implementation>org.apache.maven.shared.release.phase.ScmCommitPhase</implementation>
<requirements>
@@ -216,16 +147,6 @@
</component>
<component>
<role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>scm-tag</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.ScmTagPhase</implementation>
- <requirements>
- <requirement>
-
<role>org.apache.maven.shared.release.scm.ScmRepositoryConfigurator</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
<role-hint>rewrite-poms-for-development</role-hint>
<implementation>org.apache.maven.shared.release.phase.RewritePomsForDevelopmentPhase</implementation>
<configuration>
@@ -240,68 +161,6 @@
<field-name>scmTranslators</field-name>
</requirement>
</requirements>
- </component>
- <component>
-
<role>org.apache.maven.shared.release.config.ReleaseDescriptorStore</role>
- <role-hint>properties</role-hint>
-
<implementation>org.apache.maven.shared.release.config.PropertiesReleaseDescriptorStore</implementation>
- </component>
- <component>
-
<role>org.apache.maven.shared.release.scm.ScmRepositoryConfigurator</role>
-
<implementation>org.apache.maven.shared.release.scm.DefaultScmRepositoryConfigurator</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.scm.manager.ScmManager</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.shared.release.scm.ScmTranslator</role>
- <role-hint>svn</role-hint>
-
<implementation>org.apache.maven.shared.release.scm.SubversionScmTranslator</implementation>
- </component>
- <component>
- <role>org.apache.maven.shared.release.scm.ScmTranslator</role>
- <role-hint>cvs</role-hint>
-
<implementation>org.apache.maven.shared.release.scm.CvsScmTranslator</implementation>
- </component>
- <component>
- <role>org.apache.maven.shared.release.scm.ScmTranslator</role>
- <role-hint>clearcase</role-hint>
-
<implementation>org.apache.maven.shared.release.scm.ClearCaseScmTranslator</implementation>
- </component>
- <component>
- <role>org.apache.maven.shared.release.exec.MavenExecutor</role>
-
<implementation>org.apache.maven.shared.release.exec.ForkedMavenExecutor</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.shared.release.exec.CommandLineFactory</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.shared.release.exec.CommandLineFactory</role>
-
<implementation>org.apache.maven.shared.release.exec.DefaultCommandLineFactory</implementation>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>end-release</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.EndReleasePhase</implementation>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>create-backup-poms</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.CreateBackupPomsPhase</implementation>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>restore-backup-poms</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.RestoreBackupPomsPhase</implementation>
- </component>
- <component>
- <role>org.apache.maven.shared.release.phase.ReleasePhase</role>
- <role-hint>remove-scm-tag</role-hint>
-
<implementation>org.apache.maven.shared.release.phase.RemoveScmTagPhase</implementation>
</component>
<component>
<role>org.apache.maven.shared.release.phase.ReleasePhase</role>
