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 99fafd5a422494763d10107145b4f56f99827be3
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Tue Feb 6 18:42:01 2018 +0100
Change access to origialScmInfo
---
.../shared/release/config/ReleaseDescriptorBuilder.java | 1 -
.../apache/maven/shared/release/config/ReleaseUtils.java | 2 +-
.../shared/release/phase/RewritePomsForBranchPhase.java | 2 +-
.../release/phase/RewritePomsForDevelopmentPhase.java | 7 ++-----
.../shared/release/phase/RewritePomsForReleasePhase.java | 2 +-
.../src/main/mdo/release-descriptor.mdo | 16 ++++++++--------
.../phase/RewritePomsForDevelopmentPhaseTest.java | 1 -
.../basic-pom-inherited-scm/pom.xml | 5 -----
8 files changed, 13 insertions(+), 23 deletions(-)
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
index 98b602a..1e7fc1e 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
@@ -52,7 +52,6 @@ public class ReleaseDescriptorBuilder
// TODO Auto-generated method stub
}
-
}
private final BuilderReleaseDescriptor releaseDescriptor;
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
index c22e921..ee2295a 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
@@ -277,7 +277,7 @@ public class ReleaseUtils
{
String key = property.substring( "project.scm.".length(),
index );
- if ( !builder.build().getOriginalScmInfo().containsKey(
key ) )
+ if ( builder.build().getOriginalScmInfo( key ) == null )
{
if ( properties.getProperty( "project.scm." + key +
".empty" ) != null )
{
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 d58d911..586e97d 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
@@ -79,7 +79,7 @@ public class RewritePomsForBranchPhase
// If the SCM element is not present, only add it if the
parent was not mapped (ie, it's external to
// the release process and so has not been modified, so
the values will not be correct on the tag),
String parentId = ArtifactUtils.versionlessKey(
parent.getGroupId(), parent.getArtifactId() );
- if ( !releaseDescriptor.getOriginalScmInfo().containsKey(
parentId ) )
+ if ( releaseDescriptor.getOriginalScmInfo( parentId ) ==
null )
{
// we need to add it, since it has changed from the
inherited value
scmRoot = new Scm();
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 d65d283..cb65866 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,8 +19,6 @@ package org.apache.maven.shared.release.phase;
* under the License.
*/
-import java.util.Map;
-
import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
import org.apache.maven.project.MavenProject;
@@ -58,9 +56,8 @@ public class RewritePomsForDevelopmentPhase
Scm scmRoot = modelTarget.getScm();
if ( scmRoot != null )
{
- Map<String, Scm> originalScmInfo =
releaseDescriptor.getOriginalScmInfo();
// check containsKey, not == null, as we store null as a value
- if ( !originalScmInfo.containsKey( projectId ) )
+ if ( releaseDescriptor.getOriginalScmInfo( projectId ) == null
)
{
throw new ReleaseExecutionException(
"Unable to find original SCM info for '" +
project.getName() + "'" );
@@ -69,7 +66,7 @@ public class RewritePomsForDevelopmentPhase
ScmTranslator translator = getScmTranslators().get(
scmRepository.getProvider() );
if ( translator != null )
{
- Scm scm = originalScmInfo.get( projectId );
+ Scm scm = releaseDescriptor.getOriginalScmInfo( projectId
);
if ( scm != null )
{
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 bcf2254..dc774a1 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
@@ -77,7 +77,7 @@ public class RewritePomsForReleasePhase
// If the SCM element is not present, only add it if the
parent was not mapped (ie, it's external to
// the release process and so has not been modified, so
the values will not be correct on the tag),
String parentId = ArtifactUtils.versionlessKey(
parent.getGroupId(), parent.getArtifactId() );
- if ( !releaseDescriptor.getOriginalScmInfo().containsKey(
parentId ) )
+ if ( releaseDescriptor.getOriginalScmInfo( parentId ) ==
null )
{
// we need to add it, since it has changed from the
inherited value
Scm scmTarget = new Scm();
diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo
b/maven-release-manager/src/main/mdo/release-descriptor.mdo
index e716c8d..3060125 100644
--- a/maven-release-manager/src/main/mdo/release-descriptor.mdo
+++ b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -554,7 +554,7 @@
/**
* Field originalScmInfo.
*/
- private java.util.Map<String, org.apache.maven.model.Scm> originalScmInfo;
+ private java.util.Map<String, org.apache.maven.model.Scm> originalScmInfo
= new java.util.HashMap<>();
java.util.Map<String, ReleaseStageVersions> getProjectVersions()
@@ -562,6 +562,11 @@
return projectVersions;
}
+ java.util.Map<String, org.apache.maven.model.Scm> getOriginalScmInfo()
+ {
+ return originalScmInfo;
+ }
+
/**
* Method getResolvedSnapshotDependencies.
*
@@ -632,14 +637,9 @@
*
* @return Map
*/
- public java.util.Map<String, org.apache.maven.model.Scm>
getOriginalScmInfo()
+ public org.apache.maven.model.Scm getOriginalScmInfo( String id )
{
- if ( this.originalScmInfo == null )
- {
- this.originalScmInfo = new java.util.HashMap<>();
- }
-
- return this.originalScmInfo;
+ return this.originalScmInfo.get( id );
} //-- java.util.Map<Object, String> getOriginalScmInfo()
/**
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 0f3045d..cea16c5 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
@@ -329,7 +329,6 @@ public class RewritePomsForDevelopmentPhaseTest
builder.addDevelopmentVersion( "groupId:subproject1", NEXT_VERSION );
builder.addReleaseVersion( "groupId:subsubproject", RELEASE_VERSION );
builder.addDevelopmentVersion( "groupId:subsubproject", NEXT_VERSION );
- builder.addOriginalScmInfo( "groupId:artifactId", null );
Scm scm = new Scm();
scm.setConnection(
"scm:svn:file://localhost/tmp/scm-repo/trunk/subproject1" );
scm.setDeveloperConnection(
"scm:svn:file://localhost/tmp/scm-repo/trunk/subproject1" );
diff --git
a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml
b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml
index 95ed5b8..ff02627 100644
---
a/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml
+++
b/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-inherited-scm/pom.xml
@@ -37,9 +37,4 @@
<module>subproject1</module>
</modules>
- <scm>
-
<connection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</connection>
-
<developerConnection>scm:svn:file://localhost/tmp/scm-repo/tags/release-label</developerConnection>
- <url>file://localhost/tmp/scm-repo/tags/release-label</url>
- </scm>
</project>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
rfscho...@apache.org.
