You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2025/11/28 13:27:02 UTC
(maven-release) 01/01: sign deprecation
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 f76f12472e101690651dea99a3f93621421f29bb
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Fri Nov 28 07:26:50 2025 -0600
sign deprecation
---
.../release/phase/GenerateReleasePomsPhase.java | 4 +--
.../maven/shared/release/phase/ScmTagPhase.java | 6 +++-
.../release/transform/jdom2/JDomModelETL.java | 4 +--
.../maven/shared/release/util/PomFinder.java | 33 +++++++++++-----------
.../release/phase/IsScmTagParametersEquals.java | 4 +--
.../shared/release/phase/ScmTagPhaseTest.java | 3 +-
6 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
index 287131d0..bd0a29b1 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -65,7 +65,7 @@ import org.apache.maven.shared.release.scm.ReleaseScmCommandException;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.release.scm.ScmTranslator;
import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.codehaus.plexus.util.WriterFactory;
+import org.codehaus.plexus.util.xml.XmlStreamWriter;
import static java.util.Objects.requireNonNull;
@@ -174,7 +174,7 @@ public class GenerateReleasePomsPhase extends AbstractReleasePomsPhase implement
throw new ReleaseExecutionException("Cannot generate release POM : pom file is null");
}
- try (Writer fileWriter = WriterFactory.newXmlWriter(releasePomFile)) {
+ try (Writer fileWriter = new XmlStreamWriter(releasePomFile)) {
pomWriter.write(fileWriter, releasePom);
} catch (IOException exception) {
throw new ReleaseExecutionException("Cannot generate release POM", exception);
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/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java
index 640f574e..acce9b2b 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java
@@ -33,7 +33,7 @@ import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.transform.ModelETL;
import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.codehaus.plexus.util.WriterFactory;
+import org.codehaus.plexus.util.xml.XmlStreamWriter;
import org.jdom2.CDATA;
import org.jdom2.Comment;
import org.jdom2.Document;
@@ -205,7 +205,7 @@ public class JDomModelETL implements ModelETL {
}
}
- try (Writer writer = WriterFactory.newXmlWriter(pomFile)) {
+ try (Writer writer = new XmlStreamWriter(pomFile)) {
if (intro != null) {
writer.write(intro);
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
index 817d9f11..23729989 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
@@ -20,12 +20,12 @@ package org.apache.maven.shared.release.util;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.slf4j.Logger;
@@ -165,25 +165,24 @@ public class PomFinder {
MavenXpp3Reader reader = new MavenXpp3Reader();
- Model model;
- try (XmlStreamReader xmlReader = ReaderFactory.newXmlReader(pomFile)) {
- model = reader.read(xmlReader);
- }
+ try (InputStream in = Files.newInputStream(pomFile.toPath())) {
+ Model model = reader.read(in);
- if (model != null) {
- pomInfo = new PomInfo();
- pomInfo.setArtifactId(model.getArtifactId());
- pomInfo.setGroupId(model.getGroupId());
+ if (model != null) {
+ pomInfo = new PomInfo();
+ pomInfo.setArtifactId(model.getArtifactId());
+ pomInfo.setGroupId(model.getGroupId());
- Parent parent = model.getParent();
- if (parent != null) {
- pomInfo.setParentArtifactId(parent.getArtifactId());
- pomInfo.setParentGroupId(parent.getGroupId());
- }
+ Parent parent = model.getParent();
+ if (parent != null) {
+ pomInfo.setParentArtifactId(parent.getArtifactId());
+ pomInfo.setParentGroupId(parent.getGroupId());
+ }
- pomInfo.setFileName(pomFile.getName());
+ pomInfo.setFileName(pomFile.getName());
+ }
+ return pomInfo;
}
- return pomInfo;
}
/**
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:olamy@apache.org">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());