Author: rfscholte
Date: Thu May 5 11:26:18 2016
New Revision: 1742411
URL: http://svn.apache.org/viewvc?rev=1742411&view=rev
Log:
[MRELEASE-703] Migration from obsolete plexus-maven-plugin to
plexus-containers-component-metadata
replace generate-resources with generate-metadata
Modified:
maven/release/trunk/maven-release-manager/pom.xml
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/AbstractMavenExecutor.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/exec/InvokerMavenExecutor.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.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/CheckoutProjectFromScm.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/RunCompleteGoalsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.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/ScmTagPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.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/GitScmTranslator.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml
maven/release/trunk/pom.xml
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Thu May 5 11:26:18 2016
@@ -244,17 +244,26 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <extractors>
+ <extractor>class</extractor>
+ </extractors>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
<executions>
<execution>
- <id>create-component-descriptor</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- <execution>
<id>merge</id>
<configuration>
<output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
@@ -263,7 +272,7 @@
<descriptor>src/main/components-fragment.xml</descriptor>
</descriptors>
</configuration>
- <phase>process-resources</phase>
+ <phase>process-classes</phase>
<goals>
<goal>merge-descriptors</goal>
</goals>
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -34,11 +34,14 @@ import java.util.Set;
import org.apache.maven.model.Scm;
import org.apache.maven.shared.release.scm.IdentifiedScm;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
import org.sonatype.plexus.components.cipher.PlexusCipherException;
import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
+import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
import org.sonatype.plexus.components.sec.dispatcher.SecUtil;
import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity;
@@ -47,8 +50,8 @@ import org.sonatype.plexus.components.se
* Read and write release configuration and state from a properties file.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component
role="org.apache.maven.shared.release.config.ReleaseDescriptorStore"
role-hint="properties"
*/
+@Component( role = ReleaseDescriptorStore.class, hint = "properties" )
public class PropertiesReleaseDescriptorStore
extends AbstractLogEnabled
implements ReleaseDescriptorStore
@@ -57,10 +60,8 @@ public class PropertiesReleaseDescriptor
/**
* When this plugin requires Maven 3.0 as minimum, this component can be
removed and o.a.m.s.c.SettingsDecrypter be
* used instead.
- *
- * @plexus.requirement
role="org.sonatype.plexus.components.sec.dispatcher.SecDispatcher"
role-hint="mng-4384"
*/
-
+ @Requirement( role = SecDispatcher.class, hint = "mng-4384" )
private DefaultSecDispatcher secDispatcher;
public ReleaseDescriptor read( ReleaseDescriptor mergeDescriptor )
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
Thu May 5 11:26:18 2016
@@ -31,6 +31,7 @@ import org.apache.maven.settings.io.xpp3
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
@@ -38,6 +39,7 @@ import org.sonatype.plexus.components.ci
import org.sonatype.plexus.components.cipher.PlexusCipher;
import org.sonatype.plexus.components.cipher.PlexusCipherException;
import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
+import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
import org.sonatype.plexus.components.sec.dispatcher.SecUtil;
import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity;
@@ -54,14 +56,14 @@ public abstract class AbstractMavenExecu
/**
* When this plugin requires Maven 3.0 as minimum, this component can be
removed and o.a.m.s.c.SettingsDecrypter be
* used instead.
- *
- * @plexus.requirement
role="org.sonatype.plexus.components.sec.dispatcher.SecDispatcher"
role-hint="mng-4384"
*/
+ @Requirement( role = SecDispatcher.class, hint = "mng-4384" )
private DefaultSecDispatcher secDispatcher;
/**
- * @plexus.requirement
+ *
*/
+ @Requirement
private PlexusCipher cipher;
protected AbstractMavenExecutor()
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -19,14 +19,15 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.cli.Commandline;
/**
* Create a command line instance.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component
role="org.apache.maven.shared.release.exec.CommandLineFactory"
*/
+@Component( role = CommandLineFactory.class )
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -29,6 +29,8 @@ import java.util.List;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
@@ -38,16 +40,15 @@ import org.codehaus.plexus.util.cli.Comm
* Fork Maven to executed a series of goals.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component role="org.apache.maven.shared.release.exec.MavenExecutor"
role-hint="forked-path"
*/
+@Component( role = MavenExecutor.class, hint = "forked-path" )
public class ForkedMavenExecutor
extends AbstractMavenExecutor
{
/**
* Command line factory.
- *
- * @plexus.requirement
*/
+ @Requirement
private CommandLineFactory commandLineFactory;
/**
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
Thu May 5 11:26:18 2016
@@ -41,15 +41,15 @@ import org.apache.maven.shared.invoker.I
import org.apache.maven.shared.invoker.MavenInvocationException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.cli.CommandLineUtils;
/**
* Fork Maven using the maven-invoker shared library.
- *
- * @plexus.component role="org.apache.maven.shared.release.exec.MavenExecutor"
role-hint="invoker"
*/
+@Component( role = MavenExecutor.class, hint = "invoker" )
@SuppressWarnings( "static-access" )
public class InvokerMavenExecutor
extends AbstractMavenExecutor
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePomsPhase.java
Thu May 5 11:26:18 2016
@@ -29,6 +29,7 @@ import org.apache.maven.shared.release.c
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
+import org.codehaus.plexus.component.annotations.Requirement;
/**
* Abstract release POM phase.
@@ -39,9 +40,8 @@ public abstract class AbstractReleasePom
{
/**
* Tool that gets a configured SCM repository from release configuration.
- *
- * @plexus.requirement
*/
+ @Requirement
private ScmRepositoryConfigurator scmRepositoryConfigurator;
protected ScmRepository getScmRepository( ReleaseDescriptor
releaseDescriptor,
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
Thu May 5 11:26:18 2016
@@ -30,6 +30,7 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
import org.apache.maven.shared.release.exec.MavenExecutorException;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -42,9 +43,8 @@ public abstract class AbstractRunGoalsPh
{
/**
* Component to assist in executing Maven.
- *
- * @plexus.requirement
role="org.apache.maven.shared.release.exec.MavenExecutor"
*/
+ @Requirement( role = MavenExecutor.class )
private Map<String, MavenExecutor> mavenExecutors;
/**
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java
Thu May 5 11:26:18 2016
@@ -27,13 +27,13 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Component;
/**
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
* @version $Id$
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
- * role-hint="verify-completed-prepare-phases"
*/
+@Component( role = ReleasePhase.class, hint =
"verify-completed-prepare-phases" )
public class CheckCompletedPreparePhasesPhase
extends AbstractReleasePhase
{
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -43,6 +43,8 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.versions.DefaultVersionInfo;
import org.apache.maven.shared.release.versions.VersionInfo;
import org.apache.maven.shared.release.versions.VersionParseException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
@@ -52,8 +54,8 @@ import org.codehaus.plexus.components.in
* @author <a href="mailto:br...@apache.org";>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"
*/
+@Component( role = ReleasePhase.class, hint = "check-dependency-snapshots" )
public class CheckDependencySnapshotsPhase
extends AbstractReleasePhase
{
@@ -68,16 +70,14 @@ public class CheckDependencySnapshotsPha
/**
* Component used to prompt for input.
- *
- * @plexus.requirement
*/
+ @Requirement
private Prompter prompter;
/**
* Component used to create artifacts
- *
- * @plexus.requirement
*/
+ @Requirement
private ArtifactFactory artifactFactory;
// Be aware of the difference between usedSnapshots and specifiedSnapshots:
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
Thu May 5 11:26:18 2016
@@ -41,22 +41,23 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
/**
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
* @version $Id$
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="checkout-project-from-scm"
*/
+@Component( role = ReleasePhase.class, hint = "checkout-project-from-scm" )
public class CheckoutProjectFromScm
extends AbstractReleasePhase
{
/**
* Tool that gets a configured SCM repository from release configuration.
- *
- * @plexus.requirement
*/
+ @Requirement
private ScmRepositoryConfigurator scmRepositoryConfigurator;
/** {@inheritDoc} */
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -29,12 +29,13 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.FileUtils;
/**
* @author Edwin Punzalan
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="create-backup-poms"
*/
+@Component( role = ReleasePhase.class, hint = "create-backup-poms" )
public class CreateBackupPomsPhase
extends AbstractBackupPomsPhase
{
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -25,6 +25,7 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Component;
import java.util.List;
@@ -32,8 +33,8 @@ import java.util.List;
* Finalise release preparation so it can be flagged complete..
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="end-release"
*/
+@Component( role = ReleasePhase.class, hint = "end-release" )
public class EndReleasePhase
extends AbstractReleasePhase
{
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -55,6 +55,8 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ScmTranslator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.WriterFactory;
@@ -63,8 +65,8 @@ import org.codehaus.plexus.util.WriterFa
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
* @author <a href="mailto:markhob...@gmail.com";>Mark Hobson</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="generate-release-poms"
*/
+@Component( role = ReleasePhase.class, hint = "generate-release-poms" )
public class GenerateReleasePomsPhase
extends AbstractReleasePomsPhase
{
@@ -72,16 +74,14 @@ public class GenerateReleasePomsPhase
/**
*
- *
- * @plexus.requirement
*/
+ @Requirement
private PathTranslator pathTranslator;
/**
* SCM URL translators mapped by provider name.
- *
- * @plexus.requirement
role="org.apache.maven.shared.release.scm.ScmTranslator"
*/
+ @Requirement( role = ScmTranslator.class )
private Map<String, ScmTranslator> scmTranslators;
/*
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -32,6 +32,8 @@ import org.apache.maven.shared.release.e
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.interpolation.InterpolationException;
@@ -48,23 +50,21 @@ import java.util.Properties;
* Input any variables that were not yet configured.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="input-variables"
*/
+@Component( role = ReleasePhase.class, hint = "input-variables" )
public class InputVariablesPhase
extends AbstractReleasePhase
{
/**
* Component used to prompt for input.
- *
- * @plexus.requirement
*/
+ @Requirement
private Prompter prompter;
/**
* Tool that gets a configured SCM repository from release configuration.
- *
- * @plexus.requirement
*/
+ @Requirement
private ScmRepositoryConfigurator scmRepositoryConfigurator;
void setPrompter( Prompter prompter )
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -36,14 +36,15 @@ import org.apache.maven.shared.release.c
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Remove release POMs.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
* @author <a href="mailto:markhob...@gmail.com";>Mark Hobson</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="remove-release-poms"
*/
+@Component( role = ReleasePhase.class, hint = "remove-release-poms" )
public class RemoveReleasePomsPhase
extends AbstractReleasePomsPhase
{
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -25,13 +25,14 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Component;
import java.util.List;
/**
* @author Edwin Punzalan
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="remove-scm-tag"
*/
+@Component( role = ReleasePhase.class, 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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -36,6 +36,8 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
@@ -44,16 +46,15 @@ import java.util.List;
/**
* @author Edwin Punzalan
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="restore-backup-poms"
*/
+@Component( role = ReleasePhase.class, hint = "restore-backup-poms" )
public class RestoreBackupPomsPhase
extends AbstractBackupPomsPhase
{
/**
* Tool that gets a configured SCM repository from release configuration.
- *
- * @plexus.requirement
*/
+ @Requirement
private ScmRepositoryConfigurator scmRepositoryConfigurator;
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
Thu May 5 11:26:18 2016
@@ -27,14 +27,15 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Run the completion goals for the project to before committing the
continuing development stream.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
* @author <a href="mailto:steph...@apache.org";>Stephen Connolly</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="run-completion-goals"
*/
+@Component( role = ReleasePhase.class, hint = "run-completion-goals" )
public class RunCompleteGoalsPhase
extends AbstractRunGoalsPhase
{
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
Thu May 5 11:26:18 2016
@@ -25,6 +25,7 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.util.PomFinder;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -34,8 +35,8 @@ import java.util.List;
* Run the integration tests for the project to verify that it builds before
committing.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="run-perform-goals"
*/
+@Component( role = ReleasePhase.class, hint = "run-perform-goals" )
public class RunPerformGoalsPhase
extends AbstractRunGoalsPhase
{
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
Thu May 5 11:26:18 2016
@@ -24,6 +24,7 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.component.annotations.Component;
import java.io.File;
import java.util.List;
@@ -32,8 +33,8 @@ import java.util.List;
* Run the integration tests for the project to verify that it builds before
committing.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="run-preparation-goals"
*/
+@Component( role = ReleasePhase.class, hint = "run-preparation-goals" )
public class RunPrepareGoalsPhase
extends AbstractRunGoalsPhase
{
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
Thu May 5 11:26:18 2016
@@ -37,6 +37,8 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import java.io.File;
import java.util.List;
@@ -45,16 +47,15 @@ import java.util.List;
* Branch the SCM repository.
*
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="scm-branch"
*/
+@Component( role = ReleasePhase.class, hint = "scm-branch" )
public class ScmBranchPhase
extends AbstractReleasePhase
{
/**
* Tool that gets a configured SCM repository from release configuration.
- *
- * @plexus.requirement
*/
+ @Requirement
private ScmRepositoryConfigurator scmRepositoryConfigurator;
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -37,6 +37,8 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ScmTranslator;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.SelectorUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -52,23 +54,21 @@ import java.util.Set;
* See if there are any local modifications to the files before proceeding
with SCM operations and the release.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="scm-check-modifications"
*/
+@Component( role = ReleasePhase.class, hint = "scm-check-modifications" )
public class ScmCheckModificationsPhase
extends AbstractReleasePhase
{
/**
* Tool that gets a configured SCM repository from release configuration.
- *
- * @plexus.requirement
*/
+ @Requirement
private ScmRepositoryConfigurator scmRepositoryConfigurator;
/**
* SCM URL translators mapped by provider name.
- *
- * @plexus.requirement
role="org.apache.maven.shared.release.scm.ScmTranslator"
*/
+ @Requirement( role = ScmTranslator.class )
private Map<String, ScmTranslator> scmTranslators;
/**
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -40,21 +40,22 @@ import org.apache.maven.shared.release.s
import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
/**
* Tag the SCM repository after committing the release.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component role="org.apache.maven.shared.release.phase.ReleasePhase"
role-hint="scm-tag"
*/
+@Component( role = ReleasePhase.class, hint = "scm-tag" )
public class ScmTagPhase
extends AbstractReleasePhase
{
/**
* Tool that gets a configured SCM repository from release configuration.
- *
- * @plexus.requirement
*/
+ @Requirement
private ScmRepositoryConfigurator scmRepositoryConfigurator;
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
ReleaseEnvironment releaseEnvironment,
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java
Thu May 5 11:26:18 2016
@@ -25,13 +25,13 @@ import org.apache.maven.shared.release.p
import org.apache.maven.shared.release.policy.version.VersionPolicyResult;
import org.apache.maven.shared.release.versions.DefaultVersionInfo;
import org.apache.maven.shared.release.versions.VersionParseException;
+import org.codehaus.plexus.component.annotations.Component;
/**
*
* @author Robert Scholte
- *
- * @plexus.component
role="org.apache.maven.shared.release.policy.version.VersionPolicy"
role-hint="default"
*/
+@Component( role = VersionPolicy.class, hint = "default" )
public class DefaultVersionPolicy
implements VersionPolicy
{
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -19,12 +19,14 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
+
/**
* ClearCase tag translator.
*
* @author <a href="mailto:a...@degenring.com";>Arne Degenring</a>
- * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator"
role-hint="clearcase"
*/
+@Component( role = ScmTranslator.class, 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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -19,12 +19,14 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
+
/**
* CVS tag translator.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator"
role-hint="cvs"
*/
+@Component( role = ScmTranslator.class, 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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -30,6 +30,8 @@ import org.apache.maven.scm.repository.S
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
@@ -39,25 +41,23 @@ import org.sonatype.plexus.components.se
* Tool that gets a configured SCM repository from release configuration.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component
role="org.apache.maven.shared.release.scm.ScmRepositoryConfigurator"
*/
+@Component( role = ScmRepositoryConfigurator.class, instantiationStrategy =
"singleton" )
public class DefaultScmRepositoryConfigurator
extends AbstractLogEnabled
implements ScmRepositoryConfigurator
{
/**
* The SCM manager.
- *
- * @plexus.requirement
*/
+ @Requirement
private ScmManager scmManager;
/**
* When this plugin requires Maven 3.0 as minimum, this component can be
removed and o.a.m.s.c.SettingsDecrypter be
* used instead.
- *
- * @plexus.requirement role-hint="mng-4384"
*/
+ @Requirement( hint = "mng-4384" )
private SecDispatcher secDispatcher;
public ScmRepository getConfiguredRepository( ReleaseDescriptor
releaseDescriptor, Settings settings )
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java
Thu May 5 11:26:18 2016
@@ -19,9 +19,11 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
+
/**
- * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator"
role-hint="git"
*/
+@Component( role = ScmTranslator.class, hint = "git" )
public class GitScmTranslator
implements ScmTranslator
{
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java
Thu May 5 11:26:18 2016
@@ -19,9 +19,11 @@ package org.apache.maven.shared.release.
* under the License.
*/
+import org.codehaus.plexus.component.annotations.Component;
+
/**
- * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator"
role-hint="hg"
*/
+@Component( role = ScmTranslator.class, hint = "hg" )
public class HgScmTranslator
implements ScmTranslator
{
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java
Thu May 5 11:26:18 2016
@@ -21,12 +21,14 @@ package org.apache.maven.shared.release.
import java.io.File;
+import org.codehaus.plexus.component.annotations.Component;
+
/**
* Jazz tag translator.
*
* @author <a href="mailto:chrisgw...@gmail.com";>Chris Graham</a>
- * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator"
role-hint="jazz"
*/
+@Component( role = ScmTranslator.class, hint = "jazz" )
public class JazzScmTranslator
implements ScmTranslator
{
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?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
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
Thu May 5 11:26:18 2016
@@ -22,13 +22,14 @@ package org.apache.maven.shared.release.
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmTag;
import org.apache.maven.scm.provider.svn.SvnTagBranchUtils;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Subversion tag translator.
*
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
- * @plexus.component role="org.apache.maven.shared.release.scm.ScmTranslator"
role-hint="svn"
*/
+@Component( role = ScmTranslator.class, hint = "svn" )
public class SubversionScmTranslator
implements ScmTranslator
{
Modified:
maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
---
maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml
(original)
+++
maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/pom.xml
Thu May 5 11:26:18 2016
@@ -71,7 +71,6 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.5.5</version>
<executions>
<execution>
<id>process-classes</id>
Modified: maven/release/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1742411&r1=1742410&r2=1742411&view=diff
==============================================================================
--- maven/release/trunk/pom.xml (original)
+++ maven/release/trunk/pom.xml Thu May 5 11:26:18 2016
@@ -109,6 +109,12 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.6</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
