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/03/19 22:33:54 UTC
[maven-release] 02/02: Pass commonBasedir as Path
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch Paths
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit c8680b22866e8d2d5c8b0d4e5a2954992e80b92e
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Mar 19 23:33:45 2018 +0100
Pass commonBasedir as Path
---
.../maven/shared/release/phase/AbstractRewritePomsPhase.java | 11 ++++++-----
.../maven/shared/release/phase/RewritePomVersionsPhase.java | 4 +++-
.../maven/shared/release/phase/RewritePomsForBranchPhase.java | 7 ++++---
.../shared/release/phase/RewritePomsForDevelopmentPhase.java | 4 +++-
.../shared/release/phase/RewritePomsForReleasePhase.java | 7 ++++---
5 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index ebbce14..6a8a116 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -21,6 +21,7 @@ package org.apache.maven.shared.release.phase;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -167,10 +168,10 @@ public abstract class AbstractRewritePomsPhase
List<MavenProject> reactorProjects, boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
- String commonBasedir;
+ Path commonBasedir;
try
{
- commonBasedir = ReleaseUtil.getCommonBasedir( reactorProjects ).toString();
+ commonBasedir = ReleaseUtil.getCommonBasedir( reactorProjects );
}
catch ( IOException e )
{
@@ -187,7 +188,7 @@ public abstract class AbstractRewritePomsPhase
}
private void transformProject( MavenProject project, ReleaseDescriptor releaseDescriptor,
- ReleaseEnvironment releaseEnvironment, String commonBasedir,
+ ReleaseEnvironment releaseEnvironment, Path commonBasedir,
boolean simulate, ReleaseResult result )
throws ReleaseExecutionException, ReleaseFailureException
{
@@ -242,7 +243,7 @@ public abstract class AbstractRewritePomsPhase
}
private void transformDocument( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
- String commonBasedir, ScmRepository scmRepository,
+ Path commonBasedir, ScmRepository scmRepository,
ReleaseResult result, boolean simulate )
throws ReleaseExecutionException, ReleaseFailureException
{
@@ -566,7 +567,7 @@ public abstract class AbstractRewritePomsPhase
protected abstract void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
String projectId, ScmRepository scmRepository,
- ReleaseResult result, String commonBasedir )
+ ReleaseResult result, Path commonBasedir )
throws ReleaseExecutionException;
/**
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
index 0ef834e..2bbd7b6 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
@@ -19,6 +19,8 @@ package org.apache.maven.shared.release.phase;
* under the License.
*/
+import java.nio.file.Path;
+
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
import org.apache.maven.scm.repository.ScmRepository;
@@ -45,7 +47,7 @@ public class RewritePomVersionsPhase
@Override
protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
String projectId, ScmRepository scmRepository, ReleaseResult result,
- String commonBasedir )
+ Path commonBasedir )
throws ReleaseExecutionException
{
// We are only updating versions no mods to scm needed
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
index 586e97d..57f4407 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
@@ -20,6 +20,7 @@ package org.apache.maven.shared.release.phase;
*/
import java.io.IOException;
+import java.nio.file.Path;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Model;
@@ -52,7 +53,7 @@ public class RewritePomsForBranchPhase
@Override
protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
String projectId, ScmRepository scmRepository, ReleaseResult result,
- String commonBasedir )
+ Path commonBasedir )
throws ReleaseExecutionException
{
// If SCM is null in original model, it is inherited, no mods needed
@@ -105,7 +106,7 @@ public class RewritePomsForBranchPhase
}
private boolean translateScm( MavenProject project, ReleaseDescriptor releaseDescriptor, Scm scmTarget,
- ScmRepository scmRepository, ReleaseResult relResult, String commonBasedir )
+ ScmRepository scmRepository, ReleaseResult relResult, Path commonBasedir )
throws IOException
{
ScmTranslator translator = getScmTranslators().get( scmRepository.getProvider() );
@@ -132,7 +133,7 @@ public class RewritePomsForBranchPhase
: project.getBasedir().getAbsolutePath();
int count =
- ReleaseUtil.getBaseWorkingDirectoryParentCount( commonBasedir, workingDirectory );
+ ReleaseUtil.getBaseWorkingDirectoryParentCount( commonBasedir.toString(), workingDirectory );
if ( scm.getConnection() != null )
{
String rootUrl = ReleaseUtil.realignScmUrl( count, scm.getConnection() );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
index eb5ff4d..3c6aa82 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
@@ -19,6 +19,8 @@ package org.apache.maven.shared.release.phase;
* under the License.
*/
+import java.nio.file.Path;
+
import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
import org.apache.maven.project.MavenProject;
@@ -47,7 +49,7 @@ public class RewritePomsForDevelopmentPhase
@Override
protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
String projectId, ScmRepository scmRepository, ReleaseResult result,
- String commonBasedir )
+ Path commonBasedir )
throws ReleaseExecutionException
{
// If SCM is null in original model, it is inherited, no mods needed
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
index dc774a1..8041391 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
@@ -20,6 +20,7 @@ package org.apache.maven.shared.release.phase;
*/
import java.io.IOException;
+import java.nio.file.Path;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Model;
@@ -51,7 +52,7 @@ public class RewritePomsForReleasePhase
@Override
protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
String projectId, ScmRepository scmRepository, ReleaseResult result,
- String commonBasedir )
+ Path commonBasedir )
throws ReleaseExecutionException
{
// If SCM is null in original model, it is inherited, no mods needed
@@ -103,7 +104,7 @@ public class RewritePomsForReleasePhase
}
private boolean translateScm( MavenProject project, ReleaseDescriptor releaseDescriptor, Scm scmTarget,
- ScmRepository scmRepository, ReleaseResult relResult, String commonBasedir )
+ ScmRepository scmRepository, ReleaseResult relResult, Path commonBasedir )
throws IOException
{
ScmTranslator translator = getScmTranslators().get( scmRepository.getProvider() );
@@ -129,7 +130,7 @@ public class RewritePomsForReleasePhase
ReleaseUtil.isSymlink( project.getBasedir() ) ? project.getBasedir().getCanonicalPath()
: project.getBasedir().getAbsolutePath();
int count =
- ReleaseUtil.getBaseWorkingDirectoryParentCount( commonBasedir, workingDirectory );
+ ReleaseUtil.getBaseWorkingDirectoryParentCount( commonBasedir.toString(), workingDirectory );
if ( scm.getConnection() != null )
{
String rootUrl = ReleaseUtil.realignScmUrl( count, scm.getConnection() );
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.