This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-998
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 47d745ceb9703720dba4baab4075a7651fb517b9
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sun Jan 21 16:54:03 2018 +0100
Prepare move of ReleasePhase to release-api module
---
maven-release-api/pom.xml | 4 ++++
.../shared/release/ReleaseExecutionException.java | 0
.../maven/shared/release/ReleaseFailureException.java | 0
.../maven/shared/release/env/ReleaseEnvironment.java | 18 ------------------
.../shared/release/env/DefaultReleaseEnvironment.java | 18 ++++++------------
.../shared/release/exec/ForkedMavenExecutorTest.java | 3 +--
.../shared/release/exec/InvokerMavenExecutorTest.java | 3 +--
.../release/phase/RunCompleteGoalsPhaseTest.java | 2 +-
.../shared/release/phase/RunPerformGoalsPhaseTest.java | 2 +-
.../shared/release/phase/RunPrepareGoalsPhaseTest.java | 2 +-
10 files changed, 15 insertions(+), 37 deletions(-)
diff --git a/maven-release-api/pom.xml b/maven-release-api/pom.xml
index e96feff..5e10e2e 100644
--- a/maven-release-api/pom.xml
+++ b/maven-release-api/pom.xml
@@ -41,6 +41,10 @@
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<version>1.0.0.v20140518</version>
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseExecutionException.java
b/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseExecutionException.java
similarity index 100%
rename from
maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseExecutionException.java
rename to
maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseExecutionException.java
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseFailureException.java
b/maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseFailureException.java
similarity index 100%
rename from
maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseFailureException.java
rename to
maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseFailureException.java
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
b/maven-release-api/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
similarity index 73%
rename from
maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
rename to
maven-release-api/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
index dbbf86c..88ef9e2 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
+++
b/maven-release-api/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
@@ -34,36 +34,18 @@ public interface ReleaseEnvironment
String getMavenExecutorId();
- ReleaseEnvironment setMavenExecutorId( String mavenExecutorId );
-
File getLocalRepositoryDirectory();
- ReleaseEnvironment setLocalRepositoryDirectory( File
localRepositoryDirectory );
-
Settings getSettings();
- ReleaseEnvironment setSettings( Settings settings );
-
File getMavenHome();
- ReleaseEnvironment setMavenHome( File mavenHome );
-
File getJavaHome();
- ReleaseEnvironment setJavaHome( File javaHome );
-
/**
*
* @return the locale
* @since 2.4
*/
Locale getLocale();
-
- /**
- * @param locale
- * @return the locale
- * @since 2.4
- */
- ReleaseEnvironment setLocale( Locale locale );
-
}
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
index 6b5659e..3305756 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
@@ -55,15 +55,13 @@ public class DefaultReleaseEnvironment
return settings;
}
- @Override
- public ReleaseEnvironment setMavenHome( File mavenHome )
+ public DefaultReleaseEnvironment setMavenHome( File mavenHome )
{
this.mavenHome = mavenHome;
return this;
}
- @Override
- public ReleaseEnvironment setSettings( Settings settings )
+ public DefaultReleaseEnvironment setSettings( Settings settings )
{
this.settings = settings;
return this;
@@ -75,8 +73,7 @@ public class DefaultReleaseEnvironment
return mavenExecutorId;
}
- @Override
- public ReleaseEnvironment setMavenExecutorId( String mavenExecutorId )
+ public DefaultReleaseEnvironment setMavenExecutorId( String
mavenExecutorId )
{
this.mavenExecutorId = mavenExecutorId;
return this;
@@ -88,8 +85,7 @@ public class DefaultReleaseEnvironment
return javaHome;
}
- @Override
- public ReleaseEnvironment setJavaHome( File javaHome )
+ public DefaultReleaseEnvironment setJavaHome( File javaHome )
{
this.javaHome = javaHome;
return this;
@@ -108,8 +104,7 @@ public class DefaultReleaseEnvironment
return localRepo;
}
- @Override
- public ReleaseEnvironment setLocalRepositoryDirectory( File
localRepositoryDirectory )
+ public DefaultReleaseEnvironment setLocalRepositoryDirectory( File
localRepositoryDirectory )
{
this.localRepositoryDirectory = localRepositoryDirectory;
return this;
@@ -121,8 +116,7 @@ public class DefaultReleaseEnvironment
return locale;
}
- @Override
- public ReleaseEnvironment setLocale( Locale locale )
+ public DefaultReleaseEnvironment setLocale( Locale locale )
{
this.locale = locale;
return this;
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 7ef8d6e..8b65593 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
@@ -41,7 +41,6 @@ import org.apache.maven.settings.Settings;
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.PlexusTestCase;
import org.codehaus.plexus.util.cli.Arg;
import org.codehaus.plexus.util.cli.CommandLineException;
@@ -332,7 +331,7 @@ public class ForkedMavenExecutorTest
proxy.setPassword( "proxy_password" );
settings.addProxy( proxy );
- ReleaseEnvironment releaseEnvironment = new
DefaultReleaseEnvironment();
+ DefaultReleaseEnvironment releaseEnvironment = new
DefaultReleaseEnvironment();
releaseEnvironment.setSettings( settings );
AbstractMavenExecutor executorSpy = spy( executor );
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 3f4789d..57327e2 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
@@ -36,7 +36,6 @@ import
org.apache.maven.shared.invoker.DefaultInvocationRequest;
import org.apache.maven.shared.invoker.InvocationRequest;
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.PlexusTestCase;
import org.codehaus.plexus.logging.Logger;
import org.junit.Test;
@@ -156,7 +155,7 @@ public class InvokerMavenExecutorTest
proxy.setPassword( "proxy_password" );
settings.addProxy( proxy );
- ReleaseEnvironment releaseEnvironment = new
DefaultReleaseEnvironment();
+ DefaultReleaseEnvironment releaseEnvironment = new
DefaultReleaseEnvironment();
releaseEnvironment.setSettings( settings );
releaseEnvironment.setMavenHome( new File( System.getProperty(
"injectedMavenHome" ) ) );
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 9710ddc..efe68a3 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
@@ -57,7 +57,7 @@ public class RunCompleteGoalsPhaseTest
private MavenExecutorWrapper mavenExecutorWrapper;
- private ReleaseEnvironment releaseEnvironment;
+ private DefaultReleaseEnvironment releaseEnvironment;
@Override
public void setUp()
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 f7bcd64..631bcbb 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
@@ -67,7 +67,7 @@ public class RunPerformGoalsPhaseTest
private MavenExecutorWrapper mavenExecutorWrapper;
- private ReleaseEnvironment releaseEnvironment;
+ private DefaultReleaseEnvironment releaseEnvironment;
@Override
public void setUp()
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 6a84ff7..a63d307 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
@@ -57,7 +57,7 @@ public class RunPrepareGoalsPhaseTest
private MavenExecutorWrapper mavenExecutorWrapper;
- private ReleaseEnvironment releaseEnvironment;
+ private DefaultReleaseEnvironment releaseEnvironment;
@Override
public void setUp()
--
To stop receiving notification emails like this one, please contact
rfscho...@apache.org.
