This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch feature-A in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 4abc34570ab59e78e6953b1c9a5f010534ec7c99 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Fri Nov 28 07:28:46 2025 -0600 sign deprecation --- .../java/org/apache/maven/shared/release/phase/ScmTagPhase.java | 6 +++++- .../apache/maven/shared/release/phase/IsScmTagParametersEquals.java | 4 ++-- .../java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java index 9ec739f9..6113e7da 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java @@ -26,6 +26,7 @@ import java.io.File; import java.util.List; import org.apache.maven.project.MavenProject; +import org.apache.maven.scm.CommandParameters; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmTagParameters; @@ -115,7 +116,10 @@ public class ScmTagPhase extends AbstractReleasePhase { ScmTagParameters scmTagParameters = new ScmTagParameters(releaseDescriptor.getScmCommentPrefix() + "copy for tag " + tagName); scmTagParameters.setRemoteTagging(releaseDescriptor.isRemoteTagging()); - scmTagParameters.setSign(releaseDescriptor.isScmSignTags()); + scmTagParameters.setSignOption( + releaseDescriptor.isScmSignTags() + ? CommandParameters.SignOption.FORCE_SIGN + : CommandParameters.SignOption.DEFAULT); scmTagParameters.setScmRevision(releaseDescriptor.getScmReleasedPomRevision()); scmTagParameters.setPinExternals(releaseDescriptor.isPinExternals()); if (getLogger().isDebugEnabled()) { diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java index 267e7493..1904b38c 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java @@ -22,7 +22,7 @@ import org.apache.maven.scm.ScmTagParameters; import org.mockito.ArgumentMatcher; /** - * Mockito constraint to compare tags since it has no equals method. + * Mockito constraint to compare tags since ScmTagParameters has no equals method. * * @author <a href="mailto:[email protected]";>olamy</a> */ @@ -39,6 +39,6 @@ public class IsScmTagParametersEquals implements ArgumentMatcher<ScmTagParameter return stp.getMessage().equals(this.scmTagParameters.getMessage()) && stp.isRemoteTagging() == this.scmTagParameters.isRemoteTagging() && stp.isPinExternals() == this.scmTagParameters.isPinExternals() - && stp.isSign() == this.scmTagParameters.isSign(); + && stp.getSignOption() == this.scmTagParameters.getSignOption(); } } diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java index 4c33ac0e..fec4e3ea 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.List; import org.apache.maven.project.MavenProject; +import org.apache.maven.scm.CommandParameters; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; @@ -102,7 +103,7 @@ class ScmTagPhaseTest extends AbstractReleaseTestCase { builder.setScmSignTags(true); ScmTagParameters expectedTagParameters = new ScmTagParameters("[my prefix] copy for tag release-label"); - expectedTagParameters.setSign(true); + expectedTagParameters.setSignOption(CommandParameters.SignOption.FORCE_SIGN); ScmFileSet fileSet = new ScmFileSet(rootProject.getFile().getParentFile());
