[maven-scm-publish-plugin] branch mvn4 updated: Switch a few core plugins to the new api

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git


The following commit(s) were added to refs/heads/mvn4 by this push:
     new 49a54ce  Switch a few core plugins to the new api
49a54ce is described below

commit 49a54ce84e4f237184d39ff72335caf815e21a03
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Feb 24 17:00:57 2022 +0100

    Switch a few core plugins to the new api
---
 pom.xml                                                        |  2 +-
 .../maven/plugins/scmpublish/AbstractScmPublishMojo.java       | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6c4dbf2..74c7b6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.release</groupId>
       <artifactId>maven-release-manager</artifactId>
-      <version>2.5.3</version>
+      <version>3.0.0-M6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git 
a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java 
b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
index 9ee3f70..3af513d 100644
--- 
a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
+++ 
b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
@@ -62,6 +62,8 @@ import org.apache.maven.settings.crypto.SettingsDecrypter;
 import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
 import org.apache.maven.settings.crypto.SettingsDecryptionResult;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
+import org.apache.maven.shared.release.config.ReleaseUtils;
 import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.apache.maven.shared.utils.logging.MessageUtils;
 
@@ -321,7 +323,7 @@ public abstract class AbstractScmPublishMojo
             logInfo( "Performing a LOCAL checkout from " + scmUrl );
         }
 
-        ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+        ReleaseDescriptorBuilder releaseDescriptor = new 
ReleaseDescriptorBuilder();
         releaseDescriptor.setInteractive( settings.isInteractiveMode() );
 
         if ( username == null || password == null )
@@ -371,11 +373,13 @@ public abstract class AbstractScmPublishMojo
             }
         }
 
-        scmRepository = scmRepositoryConfigurator.getConfiguredRepository( 
releaseDescriptor, settings );
+        ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor( 
releaseDescriptor );
+
+        scmRepository = scmRepositoryConfigurator.getConfiguredRepository( 
descriptor, settings );
 
         scmProvider = scmRepositoryConfigurator.getRepositoryProvider( 
scmRepository );
 
-        return releaseDescriptor;
+        return descriptor;
     }
 
     protected void checkoutExisting()