You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/01/15 21:18:51 UTC
[maven-release] branch master updated (69831b6 -> 94dee2a)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git.
from 69831b6 [MRELEASE-992] Deprecated maven flag --no-plugin-updates shows warnings in the console output
new 80f49d9 Replace ROLE name with class
new de5c863 Apply multi-catch
new 94dee2a Remove more deprecated/overloaded methods
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../config/PropertiesReleaseDescriptorStore.java | 20 +--
.../release/config/ReleaseDescriptorStore.java | 5 -
.../shared/release/exec/AbstractMavenExecutor.java | 57 +-------
.../shared/release/exec/CommandLineFactory.java | 5 -
.../maven/shared/release/exec/MavenExecutor.java | 57 --------
.../shared/release/phase/AbstractReleasePhase.java | 23 ---
.../release/phase/AbstractRunGoalsPhase.java | 13 --
.../phase/CheckDependencySnapshotsPhase.java | 6 +-
.../shared/release/phase/MapVersionsPhase.java | 6 +-
.../maven/shared/release/phase/ReleasePhase.java | 38 -----
.../release/scm/ScmRepositoryConfigurator.java | 5 -
.../maven/shared/release/scm/ScmTranslator.java | 5 -
.../release/transform/jdom/JDomModelETL.java | 6 +-
.../shared/release/DefaultReleaseManagerTest.java | 72 +++++-----
.../PropertiesReleaseDescriptorStoreTest.java | 4 +-
.../release/exec/AbstractMavenExecutorTest.java | 15 +-
.../release/exec/CommandLineFactoryTest.java | 2 +-
.../release/exec/ForkedMavenExecutorTest.java | 17 +--
.../release/exec/InvokerMavenExecutorTest.java | 6 +-
.../release/phase/AbstractBackupPomsPhaseTest.java | 5 +-
...tractEditModeRewritingReleasePhaseTestCase.java | 4 +-
.../AbstractRewritingReleasePhaseTestCase.java | 8 +-
.../phase/BranchInputVariablesPhaseTest.java | 2 +-
.../phase/CheckDependencySnapshotsPhaseTest.java | 46 +++---
.../shared/release/phase/CheckPomPhaseTest.java | 2 +-
.../release/phase/CheckoutProjectFromScmTest.java | 12 +-
.../release/phase/CreateBackupPomsPhaseTest.java | 2 +-
.../shared/release/phase/EndReleasePhaseTest.java | 2 +-
.../phase/GenerateReleasePomsPhaseTest.java | 2 +-
.../release/phase/InputVariablesPhaseTest.java | 2 +-
.../shared/release/phase/MapVersionsPhaseTest.java | 160 ++++++++++-----------
.../shared/release/phase/ReleasePhaseStub.java | 25 ----
.../release/phase/RemoveReleasePomsPhaseTest.java | 12 +-
.../release/phase/RestoreBackupPomsPhaseTest.java | 2 +-
.../release/phase/RunCompleteGoalsPhaseTest.java | 2 +-
.../release/phase/RunPerformGoalsPhaseTest.java | 12 +-
.../release/phase/RunPrepareGoalsPhaseTest.java | 2 +-
.../shared/release/phase/ScmBranchPhaseTest.java | 20 +--
.../phase/ScmCheckModificationsPhaseTest.java | 12 +-
.../phase/ScmCommitDevelopmentPhaseTest.java | 6 +-
.../phase/ScmCommitPreparationPhaseTest.java | 28 ++--
.../shared/release/phase/ScmTagPhaseTest.java | 20 +--
.../scm/DefaultScmRepositoryConfiguratorTest.java | 2 +-
.../shared/release/stubs/MavenExecutorWrapper.java | 24 ----
.../maven/shared/release/util/PomFinderTest.java | 4 +-
45 files changed, 250 insertions(+), 530 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <co...@maven.apache.org>'].
[maven-release] 02/03: Apply multi-catch
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit de5c863786e1ceb0c19e350417f7128d5b738e8d
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Jan 15 21:22:36 2018 +0100
Apply multi-catch
---
.../config/PropertiesReleaseDescriptorStore.java | 20 ++-------------
.../shared/release/exec/AbstractMavenExecutor.java | 30 +++-------------------
.../phase/CheckDependencySnapshotsPhase.java | 6 +----
.../shared/release/phase/MapVersionsPhase.java | 6 +----
.../release/transform/jdom/JDomModelETL.java | 6 +----
5 files changed, 8 insertions(+), 60 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
index 673ca9b..7256ce3 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -144,15 +144,7 @@ public class PropertiesReleaseDescriptorStore
{
password = encryptAndDecorate( password );
}
- catch ( IllegalStateException e )
- {
- getLogger().debug( e.getMessage() );
- }
- catch ( SecDispatcherException e )
- {
- getLogger().debug( e.getMessage() );
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
getLogger().debug( e.getMessage() );
}
@@ -169,15 +161,7 @@ public class PropertiesReleaseDescriptorStore
{
passPhrase = encryptAndDecorate( passPhrase );
}
- catch ( IllegalStateException e )
- {
- getLogger().debug( e.getMessage() );
- }
- catch ( SecDispatcherException e )
- {
- getLogger().debug( e.getMessage() );
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
getLogger().debug( e.getMessage() );
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
index 2f5a954..3ad1ce7 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
@@ -147,15 +147,7 @@ public abstract class AbstractMavenExecutor
{
server.setPassword( encryptAndDecorate( password ) );
}
- catch ( IllegalStateException e )
- {
- // ignore
- }
- catch ( SecDispatcherException e )
- {
- // ignore
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
// ignore
}
@@ -168,15 +160,7 @@ public abstract class AbstractMavenExecutor
{
server.setPassphrase( encryptAndDecorate( passphrase ) );
}
- catch ( IllegalStateException e )
- {
- // ignore
- }
- catch ( SecDispatcherException e )
- {
- // ignore
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
// ignore
}
@@ -192,15 +176,7 @@ public abstract class AbstractMavenExecutor
{
proxy.setPassword( encryptAndDecorate( password ) );
}
- catch ( IllegalStateException e )
- {
- // ignore
- }
- catch ( SecDispatcherException e )
- {
- // ignore
- }
- catch ( PlexusCipherException e )
+ catch ( IllegalStateException | SecDispatcherException | PlexusCipherException e )
{
// ignore
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
index 36fc403..8f90cdf 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
@@ -402,11 +402,7 @@ public class CheckDependencySnapshotsPhase
releaseDescriptor.getResolvedSnapshotDependencies().putAll( resolvedSnapshots );
}
}
- catch ( PrompterException e )
- {
- throw new ReleaseExecutionException( e.getMessage(), e );
- }
- catch ( VersionParseException e )
+ catch ( PrompterException | VersionParseException e )
{
throw new ReleaseExecutionException( e.getMessage(), e );
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
index 443d9fd..eedf50a 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
@@ -283,11 +283,7 @@ public class MapVersionsPhase
}
}
}
- catch ( PolicyException e )
- {
- throw new ReleaseExecutionException( e.getMessage(), e );
- }
- catch ( VersionParseException e )
+ catch ( PolicyException | VersionParseException e )
{
throw new ReleaseExecutionException( e.getMessage(), e );
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
index a40d03d..68063a5 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
@@ -141,11 +141,7 @@ public class JDomModelETL implements ModelETL
}
}
}
- catch ( JDOMException e )
- {
- throw new ReleaseExecutionException( "Error reading POM: " + e.getMessage(), e );
- }
- catch ( IOException e )
+ catch ( JDOMException | IOException e )
{
throw new ReleaseExecutionException( "Error reading POM: " + e.getMessage(), e );
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-release] 01/03: Replace ROLE name with class
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 80f49d9399a026507ff3b158ee6a3e2d18aa27d7
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Jan 15 20:52:38 2018 +0100
Replace ROLE name with class
---
.../release/config/ReleaseDescriptorStore.java | 5 -
.../shared/release/exec/CommandLineFactory.java | 5 -
.../maven/shared/release/exec/MavenExecutor.java | 5 -
.../maven/shared/release/phase/ReleasePhase.java | 5 -
.../release/scm/ScmRepositoryConfigurator.java | 5 -
.../maven/shared/release/scm/ScmTranslator.java | 5 -
.../shared/release/DefaultReleaseManagerTest.java | 72 +++++-----
.../PropertiesReleaseDescriptorStoreTest.java | 4 +-
.../release/exec/CommandLineFactoryTest.java | 2 +-
.../release/exec/ForkedMavenExecutorTest.java | 4 +-
.../release/exec/InvokerMavenExecutorTest.java | 4 +-
...tractEditModeRewritingReleasePhaseTestCase.java | 4 +-
.../AbstractRewritingReleasePhaseTestCase.java | 8 +-
.../phase/BranchInputVariablesPhaseTest.java | 2 +-
.../phase/CheckDependencySnapshotsPhaseTest.java | 46 +++---
.../shared/release/phase/CheckPomPhaseTest.java | 2 +-
.../release/phase/CheckoutProjectFromScmTest.java | 12 +-
.../release/phase/CreateBackupPomsPhaseTest.java | 2 +-
.../shared/release/phase/EndReleasePhaseTest.java | 2 +-
.../phase/GenerateReleasePomsPhaseTest.java | 2 +-
.../release/phase/InputVariablesPhaseTest.java | 2 +-
.../shared/release/phase/MapVersionsPhaseTest.java | 160 ++++++++++-----------
.../release/phase/RemoveReleasePomsPhaseTest.java | 12 +-
.../release/phase/RestoreBackupPomsPhaseTest.java | 2 +-
.../release/phase/RunCompleteGoalsPhaseTest.java | 2 +-
.../release/phase/RunPerformGoalsPhaseTest.java | 12 +-
.../release/phase/RunPrepareGoalsPhaseTest.java | 2 +-
.../shared/release/phase/ScmBranchPhaseTest.java | 20 +--
.../phase/ScmCheckModificationsPhaseTest.java | 12 +-
.../phase/ScmCommitDevelopmentPhaseTest.java | 6 +-
.../phase/ScmCommitPreparationPhaseTest.java | 28 ++--
.../shared/release/phase/ScmTagPhaseTest.java | 20 +--
.../scm/DefaultScmRepositoryConfiguratorTest.java | 2 +-
.../maven/shared/release/util/PomFinderTest.java | 4 +-
34 files changed, 225 insertions(+), 255 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
index 174cb4c..5b1e8c4 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
@@ -27,11 +27,6 @@ package org.apache.maven.shared.release.config;
public interface ReleaseDescriptorStore
{
/**
- * The Plexus role.
- */
- String ROLE = ReleaseDescriptorStore.class.getName();
-
- /**
* Read a configuration.
*
* @param mergeDescriptor configuration to merge with the loaded configuration. Some values are used as defaults,
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
index e8c3618..3699f68 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
@@ -29,11 +29,6 @@ import org.codehaus.plexus.util.cli.Commandline;
public interface CommandLineFactory
{
/**
- * Plexus role.
- */
- String ROLE = CommandLineFactory.class.getName();
-
- /**
* Create a command line object with default environment for the given executable.
*
* @param executable the executable
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
index 0875dd1..3fa7bec 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
@@ -32,11 +32,6 @@ import java.io.File;
public interface MavenExecutor
{
/**
- * Plexus Role.
- */
- String ROLE = MavenExecutor.class.getName();
-
- /**
* Execute goals using Maven.
*
* @param workingDirectory the directory to execute in
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
index 7cb1e6b..eef87b7 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
@@ -37,11 +37,6 @@ import java.util.List;
public interface ReleasePhase
{
/**
- * The Plexus role.
- */
- String ROLE = ReleasePhase.class.getName();
-
- /**
* Execute the phase.
*
* @param releaseDescriptor the configuration to use
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmRepositoryConfigurator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmRepositoryConfigurator.java
index 4c47ec0..6281d63 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmRepositoryConfigurator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmRepositoryConfigurator.java
@@ -34,11 +34,6 @@ import org.apache.maven.shared.release.config.ReleaseDescriptor;
public interface ScmRepositoryConfigurator
{
/**
- * The Plexus role.
- */
- String ROLE = ScmRepositoryConfigurator.class.getName();
-
- /**
* Construct a configured SCM repository from a release configuration.
*
* @param releaseDescriptor the configuration to insert into the repository
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmTranslator.java
index c94e40f..f735edd 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmTranslator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmTranslator.java
@@ -28,11 +28,6 @@ package org.apache.maven.shared.release.scm;
public interface ScmTranslator
{
/**
- * Plexus Role.
- */
- String ROLE = ScmTranslator.class.getName();
-
- /**
* Take an URL and find the correct replacement URL for a given branch.
*
* @param url the source URL
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
index 891934e..d68f9f6 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
@@ -72,7 +72,7 @@ public class DefaultReleaseManagerTest
{
super.setUp();
- configStore = (ReleaseDescriptorStoreStub) lookup( ReleaseDescriptorStore.ROLE, "stub" );
+ configStore = (ReleaseDescriptorStoreStub) lookup( ReleaseDescriptorStore.class, "stub" );
}
public void testPrepareNoCompletedPhase()
@@ -89,13 +89,13 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( prepareRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertTrue( "step1 executed", phase.isExecuted() );
assertFalse( "step1 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertTrue( "step2 executed", phase.isExecuted() );
assertFalse( "step2 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertTrue( "step3 executed", phase.isExecuted() );
assertFalse( "step3 not simulated", phase.isSimulated() );
}
@@ -114,13 +114,13 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( prepareRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertFalse( "step1 not executed", phase.isExecuted() );
assertFalse( "step1 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertTrue( "step2 executed", phase.isExecuted() );
assertFalse( "step2 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertTrue( "step3 executed", phase.isExecuted() );
assertFalse( "step3 not simulated", phase.isSimulated() );
}
@@ -141,13 +141,13 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( prepareRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertFalse( "step1 executed", phase.isExecuted() );
assertFalse( "step1 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertTrue( "step2 executed", phase.isExecuted() );
assertFalse( "step2 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertTrue( "step3 executed", phase.isExecuted() );
assertFalse( "step3 not simulated", phase.isSimulated() );
}
@@ -166,13 +166,13 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( prepareRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertFalse( "step1 not executed", phase.isExecuted() );
assertFalse( "step1 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertFalse( "step2 not executed", phase.isExecuted() );
assertFalse( "step2 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertFalse( "step3 not executed", phase.isExecuted() );
assertFalse( "step3 not simulated", phase.isSimulated() );
}
@@ -191,13 +191,13 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( prepareRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertTrue( "step1 executed", phase.isExecuted() );
assertFalse( "step1 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertTrue( "step2 executed", phase.isExecuted() );
assertFalse( "step2 not simulated", phase.isSimulated() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertTrue( "step3 executed", phase.isExecuted() );
assertFalse( "step3 not simulated", phase.isSimulated() );
}
@@ -218,13 +218,13 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( prepareRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertTrue( "step1 simulated", phase.isSimulated() );
assertFalse( "step1 not executed", phase.isExecuted() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertTrue( "step2 simulated", phase.isSimulated() );
assertFalse( "step2 not executed", phase.isExecuted() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertTrue( "step3 simulated", phase.isSimulated() );
assertFalse( "step3 not executed", phase.isExecuted() );
}
@@ -245,13 +245,13 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( prepareRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertFalse( "step1 not simulated", phase.isSimulated() );
assertFalse( "step1 not executed", phase.isExecuted() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertTrue( "step2 simulated", phase.isSimulated() );
assertFalse( "step2 not executed", phase.isExecuted() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertTrue( "step3 simulated", phase.isSimulated() );
assertFalse( "step3 not executed", phase.isExecuted() );
}
@@ -272,13 +272,13 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( prepareRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertFalse( "step1 not simulated", phase.isSimulated() );
assertFalse( "step1 not executed", phase.isExecuted() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertFalse( "step2 not simulated", phase.isSimulated() );
assertFalse( "step2 not executed", phase.isExecuted() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertFalse( "step3 not simulated", phase.isSimulated() );
assertFalse( "step3 not executed", phase.isExecuted() );
}
@@ -299,13 +299,13 @@ public class DefaultReleaseManagerTest
releaseManager.prepare( prepareRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertTrue( "step1 simulated", phase.isSimulated() );
assertFalse( "step1 not executed", phase.isExecuted() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertTrue( "step2 simulated", phase.isSimulated() );
assertFalse( "step2 not executed", phase.isExecuted() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertTrue( "step3 simulated", phase.isSimulated() );
assertFalse( "step3 not executed", phase.isExecuted() );
}
@@ -427,16 +427,16 @@ public class DefaultReleaseManagerTest
releaseManager.clean( cleanRequest );
// verify
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step1" );
assertTrue( "step1 not cleaned", phase.isCleaned() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step2" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step2" );
assertTrue( "step2 not cleaned", phase.isCleaned() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "step3" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "step3" );
assertTrue( "step3 not cleaned", phase.isCleaned() );
- phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "branch1" );
+ phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "branch1" );
assertTrue( "branch1 not cleaned", phase.isCleaned() );
verify( configStoreMock ).delete( releaseDescriptor );
@@ -622,7 +622,7 @@ public class DefaultReleaseManagerTest
any(CommandParameters.class)) )
.thenThrow( new ScmException( "..." ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
ReleasePerformRequest performRequest = new ReleasePerformRequest();
@@ -658,7 +658,7 @@ public class DefaultReleaseManagerTest
File checkoutDirectory = getTestFile( "target/checkout-directory" );
releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() );
- ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
+ ScmManager scmManager = (ScmManager) lookup( ScmManager.class );
ScmProviderStub providerStub =
(ScmProviderStub) scmManager.getProviderByUrl( releaseDescriptor.getScmSourceUrl() );
@@ -717,7 +717,7 @@ public class DefaultReleaseManagerTest
releaseManager.rollback( rollbackRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "rollbackPhase1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "rollbackPhase1" );
assertTrue( "rollbackPhase1 executed", phase.isExecuted() );
}
@@ -734,7 +734,7 @@ public class DefaultReleaseManagerTest
releaseManager.updateVersions( updateVersionsRequest );
- ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "updateVersionsPhase1" );
+ ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.class, "updateVersionsPhase1" );
assertTrue( "updateVersionsPhase1 executed", phase.isExecuted() );
}
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
index e8030f5..0b93bbf 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
@@ -44,8 +44,8 @@ public class PropertiesReleaseDescriptorStoreTest
throws Exception
{
super.setUp();
- store = (PropertiesReleaseDescriptorStore) lookup( ReleaseDescriptorStore.ROLE, "properties" );
- secDispatcher = (SecDispatcher) lookup( SecDispatcher.ROLE, "mng-4384" );
+ store = (PropertiesReleaseDescriptorStore) lookup( ReleaseDescriptorStore.class, "properties" );
+ secDispatcher = (SecDispatcher) lookup( SecDispatcher.class, "mng-4384" );
}
public void testReadFromFile()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
index a979c1f..f041b46 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
@@ -38,7 +38,7 @@ public class CommandLineFactoryTest
{
super.setUp();
- factory = (CommandLineFactory) lookup( CommandLineFactory.ROLE );
+ factory = (CommandLineFactory) lookup( CommandLineFactory.class );
}
public void testCreation()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
index d6cc66d..ddf4878 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
@@ -67,9 +67,9 @@ public class ForkedMavenExecutorTest
{
super.setUp();
- executor = (ForkedMavenExecutor) lookup( MavenExecutor.ROLE, "forked-path" );
+ executor = (ForkedMavenExecutor) lookup( MavenExecutor.class, "forked-path" );
- secDispatcher = (SecDispatcher) lookup( SecDispatcher.ROLE, "mng-4384" );
+ secDispatcher = (SecDispatcher) lookup( SecDispatcher.class, "mng-4384" );
}
public void testExecution()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
index 9b8b1ea..c11f400 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
@@ -57,9 +57,9 @@ public class InvokerMavenExecutorTest
{
super.setUp();
- executor = (InvokerMavenExecutor) lookup( MavenExecutor.ROLE, "invoker" );
+ executor = (InvokerMavenExecutor) lookup( MavenExecutor.class, "invoker" );
- secDispatcher = (SecDispatcher) lookup( SecDispatcher.ROLE, "mng-4384" );
+ secDispatcher = (SecDispatcher) lookup( SecDispatcher.class, "mng-4384" );
}
@Test
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
index ca8aca5..9d510cc 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractEditModeRewritingReleasePhaseTestCase.java
@@ -86,7 +86,7 @@ public abstract class AbstractEditModeRewritingReleasePhaseTestCase
ScmManagerStub scmManager = new ScmManagerStub();
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup( ScmRepositoryConfigurator.ROLE, "default" );
+ (DefaultScmRepositoryConfigurator) lookup( ScmRepositoryConfigurator.class, "default" );
configurator.setScmManager( scmManager );
ScmProviderStub providerStub = (ScmProviderStub) scmManager.getProviderByUrl( config.getScmSourceUrl() );
@@ -120,7 +120,7 @@ public abstract class AbstractEditModeRewritingReleasePhaseTestCase
ScmManagerStub scmManager = new ScmManagerStub();
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup( ScmRepositoryConfigurator.ROLE, "default" );
+ (DefaultScmRepositoryConfigurator) lookup( ScmRepositoryConfigurator.class, "default" );
configurator.setScmManager( scmManager );
scmManager.setScmProvider( scmProviderMock );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
index cfcf496..903cf93 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
@@ -81,7 +81,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
throws Exception
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, getRoleHint() );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, getRoleHint() );
if( phase instanceof AbstractRewritePomsPhase)
{
@@ -518,7 +518,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
ScmManagerStub scmManager = new ScmManagerStub();
DefaultScmRepositoryConfigurator configurator =
- (DefaultScmRepositoryConfigurator) lookup( ScmRepositoryConfigurator.ROLE );
+ (DefaultScmRepositoryConfigurator) lookup( ScmRepositoryConfigurator.class );
configurator.setScmManager( scmManager );
scmManager.setScmProvider( scmProviderMock );
@@ -559,7 +559,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
config.setScmSourceUrl( "scm:svn:fail" );
mapNextVersion( config, "groupId:artifactId" );
- ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
+ ScmManager scmManager = (ScmManager) lookup( ScmManager.class );
if ( scmManager instanceof ScmManagerStub )
{
((ScmManagerStub) scmManager ).setException( new ScmRepositoryException( "..." ) );
@@ -588,7 +588,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
config.setScmSourceUrl( "scm:fail:path" );
mapNextVersion( config, "groupId:artifactId" );
- ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
+ ScmManager scmManager = (ScmManager) lookup( ScmManager.class );
if ( scmManager instanceof ScmManagerStub )
{
((ScmManagerStub) scmManager ).setException( new NoSuchScmProviderException( "..." ) );;
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java
index 8dbe5bb..d0e69f8 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java
@@ -57,7 +57,7 @@ public class BranchInputVariablesPhaseTest
throws Exception
{
super.setUp();
- phase = (InputVariablesPhase) lookup( ReleasePhase.ROLE, "branch-input-variables" );
+ phase = (InputVariablesPhase) lookup( ReleasePhase.class, "branch-input-variables" );
}
@Test
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
index 215513b..7781d0a 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
@@ -67,7 +67,7 @@ public class CheckDependencySnapshotsPhaseTest
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
}
@Test
@@ -90,7 +90,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "no-snapshot-range-dependencies" );
@@ -158,7 +158,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
@@ -195,7 +195,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
@@ -212,7 +212,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
@@ -229,7 +229,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
@@ -266,7 +266,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "snapshot-release-plugin" );
@@ -308,7 +308,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-differing-snapshot-dependencies" );
@@ -488,7 +488,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
@@ -532,7 +532,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
@@ -563,7 +563,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
@@ -593,7 +593,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-dependencies" );
@@ -623,7 +623,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-all" );
@@ -658,7 +658,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects =
@@ -707,7 +707,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects =
@@ -775,7 +775,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-report-plugins" );
@@ -812,7 +812,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects =
@@ -925,7 +925,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-managed-snapshot-plugin" );
@@ -962,7 +962,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-plugins" );
@@ -999,7 +999,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "internal-and-external-snapshot-plugins" );
@@ -1036,7 +1036,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-parent/child" );
@@ -1073,7 +1073,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-parent/child" );
@@ -1119,7 +1119,7 @@ public class CheckDependencySnapshotsPhaseTest
throws Exception
{
CheckDependencySnapshotsPhase phase =
- (CheckDependencySnapshotsPhase) lookup( ReleasePhase.ROLE, "check-dependency-snapshots" );
+ (CheckDependencySnapshotsPhase) lookup( ReleasePhase.class, "check-dependency-snapshots" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createDescriptorFromProjects( "external-snapshot-extension" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java
index 6dffbfa..3e3eac4 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java
@@ -46,7 +46,7 @@ public class CheckPomPhaseTest
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "check-poms" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "check-poms" );
}
public void testCorrectlyConfigured()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
index 84c8aba..8f714aa 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
@@ -65,7 +65,7 @@ public class CheckoutProjectFromScmTest
{
super.setUp();
- phase = (CheckoutProjectFromScm) lookup( ReleasePhase.ROLE, "checkout-project-from-scm" );
+ phase = (CheckoutProjectFromScm) lookup( ReleasePhase.class, "checkout-project-from-scm" );
}
@Test
@@ -90,7 +90,7 @@ public class CheckoutProjectFromScmTest
any( CommandParameters.class)))
.thenReturn( new CheckOutScmResult( "",null ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
@@ -132,7 +132,7 @@ public class CheckoutProjectFromScmTest
any(CommandParameters.class)))
.thenReturn( new CheckOutScmResult( "", null ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
@@ -175,7 +175,7 @@ public class CheckoutProjectFromScmTest
any( CommandParameters.class )) )
.thenReturn( new CheckOutScmResult( "",null ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
@@ -205,7 +205,7 @@ public class CheckoutProjectFromScmTest
releaseDescriptor.setScmSourceUrl( "scm-url" );
releaseDescriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new NoSuchScmProviderException( "..." ) );
String dir = "scm-commit/single-pom";
@@ -235,7 +235,7 @@ public class CheckoutProjectFromScmTest
releaseDescriptor.setScmSourceUrl( "scm-url" );
releaseDescriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new ScmRepositoryException( "..." ) );
String dir = "scm-commit/single-pom";
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
index 2cbd15b..2ffa781 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
@@ -41,7 +41,7 @@ public class CreateBackupPomsPhaseTest
ReleasePhase getReleasePhase()
throws Exception
{
- return (ReleasePhase) lookup( ReleasePhase.ROLE, "create-backup-poms" );
+ return (ReleasePhase) lookup( ReleasePhase.class, "create-backup-poms" );
}
@Test
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/EndReleasePhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/EndReleasePhaseTest.java
index 7bcf445..1c17c64 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/EndReleasePhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/EndReleasePhaseTest.java
@@ -45,7 +45,7 @@ public class EndReleasePhaseTest
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "end-release" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "end-release" );
}
@Test
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
index 5cf97fd..d261323 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
@@ -201,7 +201,7 @@ public class GenerateReleasePomsPhaseTest
argThat( new IsScmFileSetEquals( fileSet ) ) ) ).thenReturn( new AddScmResult( "...",
Collections.singletonList( new ScmFile( Maven.POMv4, ScmFileStatus.ADDED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
return reactorProjects;
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
index de0f56f..8342fbd 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
@@ -56,7 +56,7 @@ public class InputVariablesPhaseTest
throws Exception
{
super.setUp();
- phase = (InputVariablesPhase) lookup( ReleasePhase.ROLE, "input-variables" );
+ phase = (InputVariablesPhase) lookup( ReleasePhase.class, "input-variables" );
}
@Test
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
index 4ca94aa..8feb4aa 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
@@ -94,7 +94,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
MavenProject project = createProject( "artifactId", "1.0-SNAPSHOT" );
when( mockPrompter.prompt( startsWith( "What is the release version for \"" + project.getName() + "\"?" ),
@@ -121,7 +121,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
MavenProject project = createProject( "artifactId", "1.0-SNAPSHOT" );
when( mockPrompter.prompt( startsWith( "What is the release version for \"" + project.getName() + "\"?" ),
@@ -148,7 +148,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
MavenProject project = createProject( "artifactId", "1.0-SNAPSHOT" );
when( mockPrompter.prompt( startsWith( "What is the release version for \"" + project.getName() + "\"?" ),
@@ -188,7 +188,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
MavenProject project = createProject( "artifactId", "SNAPSHOT" );
when( mockPrompter.prompt( startsWith( "What is the release version for \"" + project.getName() + "\"?" ),
@@ -231,7 +231,7 @@ public class MapVersionsPhaseTest
// prepare
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "SNAPSHOT" ) );
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.addReleaseVersion( "groupId:artifactId", "2.0" );
@@ -262,7 +262,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0-SNAPSHOT" ) );
@@ -282,7 +282,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0-SNAPSHOT" ) );
@@ -302,7 +302,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
MavenProject project = createProject( "artifactId", "1.0" );
when( mockPrompter.prompt( startsWith( "What is the new development version for \"" + project.getName()
@@ -342,7 +342,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
MavenProject project = createProject( "artifactId", "1.0" );
phase.setPrompter( mockPrompter );
@@ -376,7 +376,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
phase.setPrompter( mockPrompter );
@@ -412,7 +412,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
phase.setPrompter( mockPrompter );
@@ -446,7 +446,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
when( mockPrompter.prompt( isA( String.class ),
isA( String.class ) ) ).thenThrow( new PrompterException( "..." ) );
@@ -492,7 +492,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
MavenProject project = createProject( "artifactId", "foo" );
when( mockPrompter.prompt( startsWith( "What is the new development version for \"" + project.getName()
@@ -528,7 +528,7 @@ public class MapVersionsPhaseTest
public void testAdjustVersionNonInteractive()
throws Exception
{
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "foo" ) );
@@ -566,7 +566,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -588,7 +588,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -610,7 +610,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -633,7 +633,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -656,7 +656,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -678,7 +678,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -700,7 +700,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -721,7 +721,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -742,7 +742,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -764,7 +764,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -786,7 +786,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -807,7 +807,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -828,7 +828,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -850,7 +850,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -872,7 +872,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -894,7 +894,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -916,7 +916,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -939,7 +939,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -962,7 +962,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -985,7 +985,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1008,7 +1008,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1031,7 +1031,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1054,7 +1054,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1077,7 +1077,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1100,7 +1100,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1124,7 +1124,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1148,7 +1148,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1177,7 +1177,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1206,7 +1206,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1233,7 +1233,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1260,7 +1260,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1285,7 +1285,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1310,7 +1310,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1334,7 +1334,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1358,7 +1358,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1387,7 +1387,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1416,7 +1416,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1450,7 +1450,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1484,7 +1484,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1514,7 +1514,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1544,7 +1544,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1571,7 +1571,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1598,7 +1598,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1620,7 +1620,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1642,7 +1642,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1664,7 +1664,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1688,7 +1688,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1710,7 +1710,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1732,7 +1732,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1754,7 +1754,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1776,7 +1776,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1802,7 +1802,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_BRANCH_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_BRANCH_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2" ) );
@@ -1828,7 +1828,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1852,7 +1852,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.2-SNAPSHOT" ) );
@@ -1876,7 +1876,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = new ArrayList<>();
Collections.addAll( reactorProjects, createProject( "artifactId", "1.2-SNAPSHOT" ),
@@ -1902,7 +1902,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = new ArrayList<>();
Collections.addAll( reactorProjects, createProject( "artifactId", "1.2-SNAPSHOT" ),
@@ -1928,7 +1928,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects =
Collections.singletonList( createProject( "artifactId", "1.2.1-SNAPSHOT" ) );
@@ -1952,7 +1952,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects =
Collections.singletonList( createProject( "artifactId", "1.2.1-SNAPSHOT" ) );
@@ -1976,7 +1976,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects =
Collections.singletonList( createProject( "artifactId", "1.2.1-SNAPSHOT" ) );
@@ -2000,7 +2000,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// verify
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects =
Collections.singletonList( createProject( "artifactId", "1.2.1-SNAPSHOT" ) );
@@ -2024,9 +2024,9 @@ public class MapVersionsPhaseTest
public void testUnusualVersions1()
throws Exception
{
- MapVersionsPhase mapReleasephase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase mapReleasephase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
MapVersionsPhase mapDevelopmentphase =
- (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects =
Collections.singletonList( createProject( "artifactId", "MYB_200909-SNAPSHOT" ) );
@@ -2053,7 +2053,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "bar", "1.11-SNAPSHOT" ) );
@@ -2078,7 +2078,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_DEVELOPMENT_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "bar", "1.11-SNAPSHOT" ) );
@@ -2102,7 +2102,7 @@ public class MapVersionsPhaseTest
throws Exception
{
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "bar", "1.11-SNAPSHOT" ) );
@@ -2132,7 +2132,7 @@ public class MapVersionsPhaseTest
expectedException.expectCause( CoreMatchers.isA( PolicyException.class ) );
// prepare
- MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
+ MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.class, TEST_MAP_RELEASE_VERSIONS );
List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0-SNAPSHOT" ) );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
index 447bf7a..54caabe 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
@@ -66,7 +66,7 @@ public class RemoveReleasePomsPhaseTest
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "remove-release-poms" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "remove-release-poms" );
}
@Test
@@ -87,7 +87,7 @@ public class RemoveReleasePomsPhaseTest
Collections.singletonList( new ScmFile( Maven.POMv4,
ScmFileStatus.DELETED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -123,7 +123,7 @@ public class RemoveReleasePomsPhaseTest
Collections.singletonList( new ScmFile( Maven.POMv4,
ScmFileStatus.DELETED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -145,7 +145,7 @@ public class RemoveReleasePomsPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -167,7 +167,7 @@ public class RemoveReleasePomsPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -203,7 +203,7 @@ public class RemoveReleasePomsPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
index 9b8c219..e6ae373 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
@@ -44,7 +44,7 @@ public class RestoreBackupPomsPhaseTest
ReleasePhase getReleasePhase()
throws Exception
{
- return (ReleasePhase) lookup( ReleasePhase.ROLE, "restore-backup-poms" );
+ return (ReleasePhase) lookup( ReleasePhase.class, "restore-backup-poms" );
}
@Test
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
index 2c394e3..9710ddc 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
@@ -65,7 +65,7 @@ public class RunCompleteGoalsPhaseTest
{
super.setUp();
- phase = (RunCompleteGoalsPhase) lookup( ReleasePhase.ROLE, "run-completion-goals" );
+ phase = (RunCompleteGoalsPhase) lookup( ReleasePhase.class, "run-completion-goals" );
mavenExecutorWrapper = (MavenExecutorWrapper) lookup( "org.apache.maven.shared.release.exec.MavenExecutor", "wrapper" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
index 0447e12..f7bcd64 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
@@ -75,7 +75,7 @@ public class RunPerformGoalsPhaseTest
{
super.setUp();
- phase = (RunPerformGoalsPhase) lookup( ReleasePhase.ROLE, "run-perform-goals" );
+ phase = (RunPerformGoalsPhase) lookup( ReleasePhase.class, "run-perform-goals" );
mavenExecutorWrapper = (MavenExecutorWrapper) lookup( "org.apache.maven.shared.release.exec.MavenExecutor", "wrapper" );
@@ -179,7 +179,7 @@ public class RunPerformGoalsPhaseTest
isA( CommandParameters.class )))
.thenReturn( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
releaseDescriptor.setUseReleaseProfile( false );
@@ -222,7 +222,7 @@ public class RunPerformGoalsPhaseTest
isA( CommandParameters.class )) )
.thenReturn( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -263,7 +263,7 @@ public class RunPerformGoalsPhaseTest
isA( CommandParameters.class )) )
.thenReturn( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
releaseDescriptor.setUseReleaseProfile( false );
@@ -307,7 +307,7 @@ public class RunPerformGoalsPhaseTest
isA( CommandParameters.class )) )
.thenReturn( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -348,7 +348,7 @@ public class RunPerformGoalsPhaseTest
isA( CommandParameters.class )) )
.thenReturn( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
releaseDescriptor.setCompletedPhase( "end-release" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
index 3f548e4..6a84ff7 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
@@ -65,7 +65,7 @@ public class RunPrepareGoalsPhaseTest
{
super.setUp();
- phase = (RunPrepareGoalsPhase) lookup( ReleasePhase.ROLE, "run-preparation-goals" );
+ phase = (RunPrepareGoalsPhase) lookup( ReleasePhase.class, "run-preparation-goals" );
mavenExecutorWrapper = (MavenExecutorWrapper) lookup( "org.apache.maven.shared.release.exec.MavenExecutor", "wrapper" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
index f9f3f81..748c2a6 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
@@ -74,7 +74,7 @@ public class ScmBranchPhaseTest
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-branch" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "scm-branch" );
}
public static String getPath( File file )
@@ -104,7 +104,7 @@ public class ScmBranchPhaseTest
argThat( new IsScmBranchParametersEquals( new ScmBranchParameters( "[my prefix] copy for branch release-label" ) ) ) ) ).thenReturn( new BranchScmResult( "...",
Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -147,7 +147,7 @@ public class ScmBranchPhaseTest
Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
@@ -188,7 +188,7 @@ public class ScmBranchPhaseTest
Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( "scm:svn:" + scmUrl, repository );
@@ -225,7 +225,7 @@ public class ScmBranchPhaseTest
Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// exeucte
@@ -269,7 +269,7 @@ public class ScmBranchPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -306,7 +306,7 @@ public class ScmBranchPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new NoSuchScmProviderException( "..." ) );
// execute
@@ -331,7 +331,7 @@ public class ScmBranchPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new ScmRepositoryException( "..." ) );
// execute
@@ -361,7 +361,7 @@ public class ScmBranchPhaseTest
when( scmProviderMock.branch( isA( ScmRepository.class ), isA( ScmFileSet.class ), isA( String.class ),
isA( ScmBranchParameters.class ) ) ).thenThrow( new ScmException( "..." ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -389,7 +389,7 @@ public class ScmBranchPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
+ ScmManager scmManager = (ScmManager) lookup( ScmManager.class );
ScmProviderStub providerStub =
(ScmProviderStub) scmManager.getProviderByUrl( releaseDescriptor.getScmSourceUrl() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
index 6b02adb..e6fad03 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
@@ -74,7 +74,7 @@ public class ScmCheckModificationsPhaseTest
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-check-modifications" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "scm-check-modifications" );
}
@Test
@@ -86,7 +86,7 @@ public class ScmCheckModificationsPhaseTest
releaseDescriptor.setScmSourceUrl( "scm-url" );
releaseDescriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new NoSuchScmProviderException( "..." ) );
// execute
@@ -123,7 +123,7 @@ public class ScmCheckModificationsPhaseTest
releaseDescriptor.setScmSourceUrl( "scm-url" );
releaseDescriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new ScmRepositoryException( "..." ) );
// execute
@@ -163,7 +163,7 @@ public class ScmCheckModificationsPhaseTest
when( scmProviderMock.status( isA( ScmRepository.class ),
isA( ScmFileSet.class ) ) ).thenThrow( new ScmException( "..." ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -200,7 +200,7 @@ public class ScmCheckModificationsPhaseTest
{
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
+ ScmManager scmManager = (ScmManager) lookup( ScmManager.class );
ScmProviderStub providerStub =
(ScmProviderStub) scmManager.getProviderByUrl( releaseDescriptor.getScmSourceUrl() );
@@ -413,7 +413,7 @@ public class ScmCheckModificationsPhaseTest
private void setChangedFiles( ReleaseDescriptor releaseDescriptor, List<String> changedFiles )
throws Exception
{
- ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
+ ScmManager scmManager = (ScmManager) lookup( ScmManager.class );
ScmProviderStub providerStub =
(ScmProviderStub) scmManager.getProviderByUrl( releaseDescriptor.getScmSourceUrl() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
index 10eb976..fc67417 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
@@ -74,7 +74,7 @@ public class ScmCommitDevelopmentPhaseTest
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-commit-development" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "scm-commit-development" );
reactorProjects = createReactorProjects();
rootProject = ReleaseUtil.getRootProject( reactorProjects );
@@ -143,7 +143,7 @@ public class ScmCommitDevelopmentPhaseTest
eq( message ) ) ).thenReturn( new CheckInScmResult( "...",
Collections.singletonList( new ScmFile( rootProject.getFile().getPath(),
ScmFileStatus.CHECKED_IN ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
}
@@ -160,7 +160,7 @@ public class ScmCommitDevelopmentPhaseTest
throws Exception
{
scmProviderMock = mock( ScmProvider.class );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
}
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
index e5beb58..c1d562e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
@@ -77,7 +77,7 @@ public class ScmCommitPreparationPhaseTest
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-commit-release" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "scm-commit-release" );
}
@Test
@@ -90,7 +90,7 @@ public class ScmCommitPreparationPhaseTest
public void testResolvesCorrectBranchImplementation()
throws Exception
{
- assertTrue( lookup( ReleasePhase.ROLE, "scm-commit-branch" ) instanceof ScmCommitPreparationPhase );
+ assertTrue( lookup( ReleasePhase.class, "scm-commit-branch" ) instanceof ScmCommitPreparationPhase );
}
@Test
@@ -115,7 +115,7 @@ public class ScmCommitPreparationPhaseTest
Collections.singletonList( new ScmFile( rootProject.getFile().getPath(),
ScmFileStatus.CHECKED_IN ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -155,7 +155,7 @@ public class ScmCommitPreparationPhaseTest
+ "release-label" ) ) ).thenReturn( new CheckInScmResult( "...",
Collections.singletonList( new ScmFile( rootProject.getFile().getPath(),
ScmFileStatus.CHECKED_IN ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -172,7 +172,7 @@ public class ScmCommitPreparationPhaseTest
throws Exception
{
// prepare
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-commit-development" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "scm-commit-development" );
ReleaseDescriptor descriptor = new ReleaseDescriptor();
List<MavenProject> reactorProjects = createReactorProjects();
@@ -190,7 +190,7 @@ public class ScmCommitPreparationPhaseTest
Collections.singletonList( new ScmFile( rootProject.getFile().getPath(),
ScmFileStatus.CHECKED_IN ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -247,7 +247,7 @@ public class ScmCommitPreparationPhaseTest
Collections.singletonList( new ScmFile( rootProject.getFile().getPath(),
ScmFileStatus.CHECKED_IN ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -272,7 +272,7 @@ public class ScmCommitPreparationPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
phase.simulate( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
@@ -307,7 +307,7 @@ public class ScmCommitPreparationPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new NoSuchScmProviderException( "..." ) );
// execute
try
@@ -331,7 +331,7 @@ public class ScmCommitPreparationPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new ScmRepositoryException( "..." ) );
// execute
@@ -360,7 +360,7 @@ public class ScmCommitPreparationPhaseTest
when( scmProviderMock.checkIn( isA( ScmRepository.class ), isA( ScmFileSet.class ), isNull( ScmVersion.class ),
isA( String.class ) ) ).thenThrow( new ScmException( "..." ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -388,7 +388,7 @@ public class ScmCommitPreparationPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
+ ScmManager scmManager = (ScmManager) lookup( ScmManager.class );
ScmProviderStub providerStub =
(ScmProviderStub) scmManager.getProviderByUrl( releaseDescriptor.getScmSourceUrl() );
@@ -418,7 +418,7 @@ public class ScmCommitPreparationPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
try
@@ -449,7 +449,7 @@ public class ScmCommitPreparationPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
phase.execute( descriptor, new DefaultReleaseEnvironment(), reactorProjects );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
index 283a63e..8f31526 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
@@ -74,7 +74,7 @@ public class ScmTagPhaseTest
{
super.setUp();
- phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "scm-tag" );
+ phase = (ReleasePhase) lookup( ReleasePhase.class, "scm-tag" );
}
public static String getPath( File file )
@@ -104,7 +104,7 @@ public class ScmTagPhaseTest
argThat( new IsScmTagParametersEquals( new ScmTagParameters( "[my prefix] copy for tag release-label" ) ) ) ) ).thenReturn( new TagScmResult( "...",
Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -146,7 +146,7 @@ public class ScmTagPhaseTest
Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( scmUrl, repository );
@@ -187,7 +187,7 @@ public class ScmTagPhaseTest
Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
stub.addScmRepositoryForUrl( "scm:svn:" + scmUrl, repository );
@@ -224,7 +224,7 @@ public class ScmTagPhaseTest
Collections.singletonList( new ScmFile( getPath( rootProject.getFile() ),
ScmFileStatus.TAGGED ) ) ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// exeucte
@@ -268,7 +268,7 @@ public class ScmTagPhaseTest
ScmProvider scmProviderMock = mock( ScmProvider.class );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -305,7 +305,7 @@ public class ScmTagPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new NoSuchScmProviderException( "..." ) );
// execute
@@ -330,7 +330,7 @@ public class ScmTagPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.class );
scmManagerStub.setException( new ScmRepositoryException( "..." ) );
// execute
@@ -359,7 +359,7 @@ public class ScmTagPhaseTest
when( scmProviderMock.tag( isA( ScmRepository.class ), isA( ScmFileSet.class ), isA( String.class ),
isA( ScmTagParameters.class ) ) ).thenThrow( new ScmException( "..." ) );
- ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.ROLE );
+ ScmManagerStub stub = (ScmManagerStub) lookup( ScmManager.class );
stub.setScmProvider( scmProviderMock );
// execute
@@ -387,7 +387,7 @@ public class ScmTagPhaseTest
List<MavenProject> reactorProjects = createReactorProjects();
ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
- ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
+ ScmManager scmManager = (ScmManager) lookup( ScmManager.class );
ScmProviderStub providerStub =
(ScmProviderStub) scmManager.getProviderByUrl( releaseDescriptor.getScmSourceUrl() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
index ec4308b..e57c23d 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
@@ -48,7 +48,7 @@ public class DefaultScmRepositoryConfiguratorTest
{
super.setUp();
- scmRepositoryConfigurator = (ScmRepositoryConfigurator) lookup( ScmRepositoryConfigurator.ROLE );
+ scmRepositoryConfigurator = (ScmRepositoryConfigurator) lookup( ScmRepositoryConfigurator.class );
}
public void testGetConfiguredRepository()
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
index 79bfeba..826379b 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
@@ -38,8 +38,8 @@ public class PomFinderTest extends PlexusTestCase
protected void setUp() throws Exception
{
super.setUp();
- LoggerManager lm = (LoggerManager) lookup(LoggerManager.ROLE);
- logger = lm.getLoggerForComponent(LoggerManager.ROLE); //X TODO use a better ROLE!
+ LoggerManager lm = (LoggerManager) lookup(LoggerManager.class);
+ logger = lm.getLoggerForComponent(LoggerManager.ROLE); //X TODO use a better class!
}
public void testPomFinderParser() throws Exception
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.
[maven-release] 03/03: Remove more deprecated/overloaded methods
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 94dee2aca4dc916c968a69cacf8f3cc137f7bfb0
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Jan 15 22:18:40 2018 +0100
Remove more deprecated/overloaded methods
---
.../shared/release/exec/AbstractMavenExecutor.java | 27 -----------
.../maven/shared/release/exec/MavenExecutor.java | 52 ----------------------
.../shared/release/phase/AbstractReleasePhase.java | 23 ----------
.../release/phase/AbstractRunGoalsPhase.java | 13 ------
.../maven/shared/release/phase/ReleasePhase.java | 33 --------------
.../release/exec/AbstractMavenExecutorTest.java | 15 ++++---
.../release/exec/ForkedMavenExecutorTest.java | 13 +++---
.../release/exec/InvokerMavenExecutorTest.java | 2 +-
.../release/phase/AbstractBackupPomsPhaseTest.java | 5 +--
.../shared/release/phase/ReleasePhaseStub.java | 25 -----------
.../shared/release/stubs/MavenExecutorWrapper.java | 24 ----------
11 files changed, 17 insertions(+), 215 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
index 3ad1ce7..e70fa0e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
@@ -29,7 +29,6 @@ import org.apache.maven.settings.Settings;
import org.apache.maven.settings.SettingsUtils;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
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;
@@ -71,32 +70,6 @@ public abstract class AbstractMavenExecutor
}
@Override
- public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
- String pomFileName, ReleaseResult result )
- throws MavenExecutorException
- {
- executeGoals( workingDirectory, goals, new DefaultReleaseEnvironment(), interactive, additionalArguments,
- pomFileName, result );
- }
-
- @Override
- public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
- ReleaseResult result )
- throws MavenExecutorException
- {
- executeGoals( workingDirectory, goals, new DefaultReleaseEnvironment(), interactive, additionalArguments,
- result );
- }
-
- @Override
- public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
- boolean interactive, String arguments, ReleaseResult result )
- throws MavenExecutorException
- {
- executeGoals( workingDirectory, goals, releaseEnvironment, interactive, arguments, null, result );
- }
-
- @Override
public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
boolean interactive, String additionalArguments, String pomFileName,
ReleaseResult result )
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
index 3fa7bec..e1fe9f5 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
@@ -46,56 +46,4 @@ public interface MavenExecutor
void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
boolean interactive, String additionalArguments, String pomFileName, ReleaseResult result )
throws MavenExecutorException;
-
- /**
- * Execute goals using Maven.
- *
- * @param workingDirectory the directory to execute in
- * @param goals the goals to run (space delimited)
- * @param releaseEnvironment the environmental settings, maven-home, etc used for this release
- * @param interactive whether to execute in interactive mode, or the default batch mode
- * @param additionalArguments additional arguments to pass to the Maven command
- * @param result holds all results of the execution
- * @throws MavenExecutorException if an error occurred executing Maven
- */
- void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
- boolean interactive, String additionalArguments, ReleaseResult result )
- throws MavenExecutorException;
-
- /**
- * Execute goals using Maven.
- *
- * @param workingDirectory the directory to execute in
- * @param goals the goals to run (space delimited)
- * @param interactive whether to execute in interactive mode, or the default batch mode
- * @param additionalArguments additional arguments to pass to the Maven command
- * @param pomFileName the file name of the POM to execute on
- * @param result holds all results of the execution
- * @throws MavenExecutorException if an error occurred executing Maven
- *
- * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String, String,
- * ReleaseResult)} instead
- */
- @Deprecated
- void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
- String pomFileName, ReleaseResult result )
- throws MavenExecutorException;
-
- /**
- * Execute goals using Maven.
- *
- * @param workingDirectory the directory to execute in
- * @param goals the goals to run (space delimited)
- * @param interactive whether to execute in interactive mode, or the default batch mode
- * @param additionalArguments additional arguments to pass to the Maven command
- * @param result holds all results of the execution
- * @throws MavenExecutorException if an error occurred executing Maven
- *
- * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String,
- * ReleaseResult)} instead
- */
- @Deprecated
- void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
- ReleaseResult result )
- throws MavenExecutorException;
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
index 39a35e1..a533a98 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
@@ -20,12 +20,7 @@ package org.apache.maven.shared.release.phase;
*/
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.shared.release.env.DefaultReleaseEnvironment;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.util.List;
@@ -54,24 +49,6 @@ public abstract class AbstractReleasePhase
return getReleaseResultSuccess();
}
- @Override
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException, ReleaseFailureException
- {
- return execute( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects );
- }
-
- @Override
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
- Settings settings,
- List<MavenProject> reactorProjects )
- throws ReleaseExecutionException, ReleaseFailureException
- {
- return simulate( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects );
- }
-
protected void logInfo( ReleaseResult result, String message )
{
result.appendInfo( message );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
index 43b5add..7f43212 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
import org.apache.maven.shared.release.exec.MavenExecutor;
import org.apache.maven.shared.release.exec.MavenExecutorException;
@@ -46,18 +45,6 @@ public abstract class AbstractRunGoalsPhase
@Requirement( role = MavenExecutor.class )
private Map<String, MavenExecutor> mavenExecutors;
- /**
- * @deprecated Use {@link AbstractRunGoalsPhase#execute(ReleaseDescriptor, ReleaseEnvironment, File, String)}
- * instead.
- */
- @Deprecated
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, File workingDirectory,
- String additionalArguments )
- throws ReleaseExecutionException
- {
- return execute( releaseDescriptor, new DefaultReleaseEnvironment(), workingDirectory, additionalArguments );
- }
-
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
File workingDirectory, String additionalArguments )
throws ReleaseExecutionException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
index eef87b7..d925ec6 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
@@ -20,7 +20,6 @@ package org.apache.maven.shared.release.phase;
*/
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;
@@ -65,38 +64,6 @@ public interface ReleasePhase
throws ReleaseExecutionException, ReleaseFailureException;
/**
- * Execute the phase.
- *
- * @param releaseDescriptor the configuration to use
- * @param settings the settings.xml configuration
- * @param reactorProjects the reactor projects
- * @throws ReleaseExecutionException an exception during the execution of the phase
- * @throws ReleaseFailureException a failure during the execution of the phase
- * @return the release result
- *
- * @deprecated Use {@link ReleasePhase#execute(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
- */
- @Deprecated
- ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
- throws ReleaseExecutionException, ReleaseFailureException;
-
- /**
- * Simulate the phase, but don't make any changes to the project.
- *
- * @param releaseDescriptor the configuration to use
- * @param settings the settings.xml configuration
- * @param reactorProjects the reactor projects
- * @throws ReleaseExecutionException an exception during the execution of the phase
- * @throws ReleaseFailureException a failure during the execution of the phase
- * @return the release result
- *
- * @deprecated Use {@link ReleasePhase#simulate(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
- */
- @Deprecated
- ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
- throws ReleaseExecutionException, ReleaseFailureException;
-
- /**
* Clean up after a phase if it leaves any additional files in the checkout.
*
* @param reactorProjects the reactor projects
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java
index 559497a..5b7f904 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java
@@ -34,6 +34,7 @@ import java.util.List;
import junit.framework.TestCase;
import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
public class AbstractMavenExecutorTest
@@ -45,48 +46,48 @@ public class AbstractMavenExecutorTest
{
AbstractMavenExecutor executor = spy( new AbstractMavenExecutorSpy() );
- executor.executeGoals( null, null, true, null, null );
+ executor.executeGoals( null, (String) null, new DefaultReleaseEnvironment(), true, null, null, null );
verify( executor ).executeGoals( isNull( File.class ), eq( new ArrayList<String>() ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
- executor.executeGoals( null, " clean verify ", true, null, null );
+ executor.executeGoals( null, " clean verify ", new DefaultReleaseEnvironment(), true, null, null, null );
verify( executor ).executeGoals( isNull( File.class ),
eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
- executor.executeGoals( null, ",clean,verify,", true, null, null );
+ executor.executeGoals( null, ",clean,verify,", new DefaultReleaseEnvironment(), true, null, null, null );
verify( executor ).executeGoals( isNull( File.class ),
eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
- executor.executeGoals( null, "\nclean\nverify\n", true, null, null );
+ executor.executeGoals( null, "\nclean\nverify\n", new DefaultReleaseEnvironment(), true, null, null, null );
verify( executor ).executeGoals( isNull( File.class ),
eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
- executor.executeGoals( null, "\rclean\rverify\r", true, null, null );
+ executor.executeGoals( null, "\rclean\rverify\r", new DefaultReleaseEnvironment(), true, null, null, null );
verify( executor ).executeGoals( isNull( File.class ),
eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
- executor.executeGoals( null, "\r\nclean\r\nverify\r\n", true, null, null );
+ executor.executeGoals( null, "\r\nclean\r\nverify\r\n", new DefaultReleaseEnvironment(), true, null, null, null );
verify( executor ).executeGoals( isNull( File.class ),
eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
isNull( String.class ), isNull( ReleaseResult.class ) );
reset( executor );
- executor.executeGoals( null, "\tclean\tverify\t", true, null, null );
+ executor.executeGoals( null, "\tclean\tverify\t", new DefaultReleaseEnvironment(), true, null, null, null );
verify( executor ).executeGoals( isNull( File.class ),
eq( Arrays.asList( "clean", "verify" ) ),
isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
index ddf4878..7ef8d6e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
@@ -95,7 +95,8 @@ public class ForkedMavenExecutorTest
executor.setCommandLineFactory( commandLineFactoryMock );
// execute
- executor.executeGoals( workingDirectory, "clean integration-test", false, null, new ReleaseResult() );
+ executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, null,
+ null, new ReleaseResult() );
// verify
verify( mockProcess ).getInputStream();
@@ -137,7 +138,7 @@ public class ForkedMavenExecutorTest
executor.setCommandLineFactory( commandLineFactoryMock );
// execute
- executor.executeGoals( workingDirectory, "clean integration-test", false, null, "my-pom.xml",
+ executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, null, "my-pom.xml",
new ReleaseResult() );
// verify
verify( mockProcess ).getInputStream();
@@ -182,7 +183,7 @@ public class ForkedMavenExecutorTest
// execute
String arguments = "-DperformRelease=true -Dmaven.test.skip=true";
- executor.executeGoals( workingDirectory, "clean integration-test", false, arguments, new ReleaseResult() );
+ executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, arguments, null, new ReleaseResult() );
// verify
verify( mockProcess ).getInputStream();
@@ -229,7 +230,7 @@ public class ForkedMavenExecutorTest
// execute
try
{
- executor.executeGoals( workingDirectory, "clean integration-test", false, null, new ReleaseResult() );
+ executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, null, null, new ReleaseResult() );
fail( "Should have thrown an exception" );
}
@@ -277,7 +278,7 @@ public class ForkedMavenExecutorTest
// execute
try
{
- executor.executeGoals( workingDirectory, "clean integration-test", false, null, new ReleaseResult() );
+ executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, null, null, new ReleaseResult() );
fail( "Should have thrown an exception" );
}
@@ -341,7 +342,7 @@ public class ForkedMavenExecutorTest
when( executorSpy.getSettingsWriter() ).thenReturn( settingsWriter );
- executorSpy.executeGoals( workingDirectory, "validate", releaseEnvironment, false, null, new ReleaseResult() );
+ executorSpy.executeGoals( workingDirectory, "validate", releaseEnvironment, false, null, null, new ReleaseResult() );
verify( settingsWriter ).write( isA( Writer.class ), encryptedSettings.capture() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
index c11f400..3f4789d 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
@@ -171,7 +171,7 @@ public class InvokerMavenExecutorTest
try
{
- executorSpy.executeGoals( workingDirectory, "validate", releaseEnvironment, false, null, new ReleaseResult() );
+ executorSpy.executeGoals( workingDirectory, "validate", releaseEnvironment, false, null, null, new ReleaseResult() );
}
catch ( MavenExecutorException e )
{
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
index 8300e3a..ce8e00e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
@@ -27,7 +27,6 @@ import org.codehaus.plexus.util.ReaderFactory;
import java.io.File;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -65,10 +64,8 @@ public abstract class AbstractBackupPomsPhaseTest
reactorProjects.add( mainProject );
- for ( Iterator modules = mainProject.getModel().getModules().iterator(); modules.hasNext(); )
+ for ( String module : mainProject.getModel().getModules() )
{
- String module = modules.next().toString();
-
File modulePom = new File( projectPath + "/" + module, pomFilename );
MavenProject subproject = createMavenProject( modulePom );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
index 4423dd0..69b3f8e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
@@ -20,7 +20,6 @@ package org.apache.maven.shared.release.phase;
*/
import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
@@ -51,30 +50,6 @@ public class ReleasePhaseStub
private boolean cleaned;
@Override
- public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
- {
- ReleaseResult result = new ReleaseResult();
-
- executed = true;
-
- result.setResultCode( ReleaseResult.SUCCESS );
-
- return result;
- }
-
- @Override
- public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
- {
- ReleaseResult result = new ReleaseResult();
-
- simulated = true;
-
- result.setResultCode( ReleaseResult.SUCCESS );
-
- return result;
- }
-
- @Override
public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
{
ReleaseResult result = new ReleaseResult();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java
index 209ae95..af71c61 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java
@@ -44,28 +44,4 @@ public class MavenExecutorWrapper implements MavenExecutor
executor.executeGoals( workingDirectory, goals, releaseEnvironment, interactive, additionalArguments,
pomFileName, result );
}
-
- @Override
- public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
- boolean interactive, String additionalArguments, ReleaseResult result )
- throws MavenExecutorException
- {
- executor.executeGoals( workingDirectory, goals, releaseEnvironment, interactive, additionalArguments, result );
- }
-
- @Override
- public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
- String pomFileName, ReleaseResult result )
- throws MavenExecutorException
- {
- executor.executeGoals( workingDirectory, goals, interactive, additionalArguments, pomFileName, result );
- }
-
- @Override
- public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
- ReleaseResult result )
- throws MavenExecutorException
- {
- executor.executeGoals( workingDirectory, goals, interactive, additionalArguments, result );
- }
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.