You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/05/28 20:46:31 UTC
[maven-release] branch master updated: [MRELEASE-1079] restore test as it was before MRELEASE-998
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new 6da9fbe8 [MRELEASE-1079] restore test as it was before MRELEASE-998
6da9fbe8 is described below
commit 6da9fbe80d983d640dcc64604915d68bde6d60d3
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat May 28 22:13:53 2022 +0200
[MRELEASE-1079] restore test as it was before MRELEASE-998
---
.../maven/shared/release/config/ReleaseDescriptor.java | 11 ++++++++++-
.../shared/release/phase/RewritePomsForBranchPhase.java | 2 +-
.../shared/release/phase/RewritePomsForReleasePhase.java | 2 +-
maven-release-manager/src/main/mdo/release-descriptor.mdo | 14 ++++++++++++--
4 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
index 48ff5ac9..6ca7c0f0 100644
--- a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
+++ b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
@@ -485,11 +485,20 @@ public interface ReleaseDescriptor
/**
* <p>getOriginalScmInfo.</p>
*
- * @return the original {@code Scm} information.
* @param projectKey the project key {@code String}
+ * @return the original {@code Scm} information.
*/
Scm getOriginalScmInfo( String projectKey );
+ /**
+ * <p>hasOriginalScmInfo.</p>
+ *
+ * @param projectKey the project key {@code String}
+ * @return has original Scm info.
+ */
+ boolean hasOriginalScmInfo( String projectKey );
+
+
// Modifiable
/**
* <p>addDependencyOriginalVersion.</p>
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 20893f72..b66f685a 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
@@ -96,7 +96,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( parentId ) == null )
+ if ( !releaseDescriptor.hasOriginalScmInfo( parentId ) )
{
// 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/RewritePomsForReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
index fa7df321..2217d919 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
@@ -95,7 +95,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( parentId ) == null )
+ if ( !releaseDescriptor.hasOriginalScmInfo( parentId ) )
{
// 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 871637ac..32dfa060 100644
--- a/maven-release-manager/src/main/mdo/release-descriptor.mdo
+++ b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -719,13 +719,23 @@
/**
* Method getOriginalScmInfo.
*
- * @return Map
+ * @return Scm
*/
public org.apache.maven.model.Scm getOriginalScmInfo( String id )
{
return this.originalScmInfo.get( id );
- } //-- java.util.Map<Object, String> getOriginalScmInfo()
+ } //-- Scm getOriginalScmInfo( String)
+ /**
+ * Method hasOriginalScmInfo.
+ *
+ * @return map contains
+ */
+ public boolean hasOriginalScmInfo( String id )
+ {
+ return this.originalScmInfo.containsKey( id );
+ } //-- boolean hasOriginalScmInfo( String )
+
/**
* Method addOriginalScmInfo.
*