You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/26 17:12:51 UTC
[maven-release] branch master updated (b36d8642 -> e4abd0ff)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
from b36d8642 [MRELEASE-1093] adapt IT check to new output
new dbdae87e Use System.lineSeparator()
new e4abd0ff Use class-based lookup
The 2 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:
.../maven/shared/release/phase/AbstractReleaseTestCase.java | 9 ++++-----
.../shared/release/phase/ScmCommitPreparationPhaseTest.java | 6 +++---
2 files changed, 7 insertions(+), 8 deletions(-)
[maven-release] 01/02: Use System.lineSeparator()
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit dbdae87e98046ea5655e1d5b4630e369a5031821
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu May 26 19:11:53 2022 +0200
Use System.lineSeparator()
---
.../maven/shared/release/phase/AbstractReleaseTestCase.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
index be529f41..a4cca42e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
@@ -38,7 +38,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import org.apache.commons.lang.SystemUtils;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -84,7 +83,7 @@ public abstract class AbstractReleaseTestCase
protected ProjectBuilder projectBuilder;
protected ArtifactRepository localRepository;
-
+
private ArtifactFactory artifactFactory;
protected ReleasePhase phase;
@@ -96,7 +95,7 @@ public abstract class AbstractReleaseTestCase
super.setUp();
projectBuilder = lookup( ProjectBuilder.class );
- artifactFactory = lookup( ArtifactFactory.class );
+ artifactFactory = lookup( ArtifactFactory.class );
ArtifactRepositoryLayout layout = lookup( ArtifactRepositoryLayout.class, "default" );
String localRepoPath = getTestFile( "target/local-repository" ).getAbsolutePath().replace( '\\', '/' );
@@ -113,7 +112,7 @@ public abstract class AbstractReleaseTestCase
{
return createReactorProjects( path, path, subpath );
}
-
+
protected ReleaseDescriptorBuilder createReleaseDescriptorBuilder( List<MavenProject> reactorProjects )
{
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
@@ -305,7 +304,7 @@ public abstract class AbstractReleaseTestCase
throws IOException
{
StringBuffer sb = new StringBuffer( "Check the transformed POM " + actualFile );
- sb.append( SystemUtils.LINE_SEPARATOR );
+ sb.append( System.lineSeparator() );
final String remoteRepositoryURL = getRemoteRepositoryURL();
[maven-release] 02/02: Use class-based lookup
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit e4abd0ff9b4a3417faaf9928790e089deca1246b
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu May 26 19:12:44 2022 +0200
Use class-based lookup
---
.../maven/shared/release/phase/ScmCommitPreparationPhaseTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 ba500676..f040bac2 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
@@ -151,7 +151,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
@@ -264,7 +264,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
@@ -548,4 +548,4 @@ public class ScmCommitPreparationPhaseTest
builder.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
return builder;
}
-}
\ No newline at end of file
+}