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/04 19:17:54 UTC
[maven-release] 03/05: releaseDescriptor.getOriginalScmInfo(
projectId ) is checked twice, so 1 can be removed.
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 c3608eeb26546b7819c1ffbc81fddc358311513c
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Mar 3 17:13:55 2018 +0100
releaseDescriptor.getOriginalScmInfo( projectId ) is checked twice, so 1 can be removed.
---
.../phase/RewritePomsForDevelopmentPhase.java | 7 -----
.../phase/RewritePomsForDevelopmentPhaseTest.java | 30 ----------------------
2 files changed, 37 deletions(-)
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 cb65866..eb5ff4d 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
@@ -56,13 +56,6 @@ public class RewritePomsForDevelopmentPhase
Scm scmRoot = modelTarget.getScm();
if ( scmRoot != null )
{
- // check containsKey, not == null, as we store null as a value
- if ( releaseDescriptor.getOriginalScmInfo( projectId ) == null )
- {
- throw new ReleaseExecutionException(
- "Unable to find original SCM info for '" + project.getName() + "'" );
- }
-
ScmTranslator translator = getScmTranslators().get( scmRepository.getProvider() );
if ( translator != null )
{
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
index cea16c5..d8b9330 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
@@ -22,7 +22,6 @@ package org.apache.maven.shared.release.phase;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
@@ -32,7 +31,6 @@ import java.util.List;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Scm;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
import org.apache.maven.shared.release.config.ReleaseUtils;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
@@ -155,34 +153,6 @@ public class RewritePomsForDevelopmentPhaseTest
assertFalse( testFile.exists() );
}
- @Test
- public void testRewriteBasicPomUnmappedScm()
- throws Exception
- {
- List<MavenProject> reactorProjects = prepareReactorProjects( "basic-pom", true );
-
- ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder() {
- public ReleaseDescriptorBuilder addOriginalScmInfo(String key, Scm value) {
- // do nothing
- return this;
- };
- };
- builder = createDescriptorFromProjects( builder, reactorProjects );
-
- mapNextVersion( builder, "groupId:artifactId" );
-
- try
- {
- phase.execute( ReleaseUtils.buildReleaseDescriptor( builder ), new DefaultReleaseEnvironment(), reactorProjects );
-
- fail( "Expected failure" );
- }
- catch ( ReleaseExecutionException e )
- {
- verifyReactorProjects( "basic-pom", true );
- }
- }
-
@Override
protected String readTestProjectFile( String fileName )
throws IOException
--
To stop receiving notification emails like this one, please contact
rfscholte@apache.org.