From c8b0849bad958bcc8d3c372c0968c52baa738319 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Sat, 4 Mar 2023 17:39:14 +0100
Subject: [PATCH] [MSCMPUB-57] Upgrade misc deps maven-shared-utils to 3.3.4
 commons-land to 3.12.0 maven-release-manager to 3.0.0-M7
 org.apache.maven.scm:* to 2.0.0-M3

---
 pom.xml                                       | 30 ++++++++++++++++---
 .../scmpublish/AbstractScmPublishMojo.java    | 16 +++++-----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5c2fcb9..33b006b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <scmVersion>1.11.2</scmVersion>
+    <scmVersion>2.0.0-M3</scmVersion>
     <mavenVersion>3.2.5</mavenVersion>
     <javaVersion>8</javaVersion>
 
@@ -79,7 +79,23 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.release</groupId>
       <artifactId>maven-release-manager</artifactId>
-      <version>2.5.3</version>
+      <version>3.0.0-M7</version>
+    </dependency>
+    <!-- remove with maven-release-manager upgrade -->
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <version>2.9.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-common</artifactId>
+      <version>2.9.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-osgi</artifactId>
+      <version>2.9.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -104,12 +120,18 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-shared-utils</artifactId>
-      <version>3.3.3</version>
+      <version>3.3.4</version>
+    </dependency>
+    <!-- remove with maven-shared-utils upgrade -->
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.1</version>
+      <version>3.12.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</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 d4689f9..4230b7e 100644
--- a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
+++ b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
@@ -61,6 +61,7 @@
 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.scm.ScmRepositoryConfigurator;
 import org.apache.maven.shared.utils.logging.MessageUtils;
 
@@ -318,8 +319,8 @@ private ReleaseDescriptor setupScm() throws ScmRepositoryException, NoSuchScmPro
             logInfo("Performing a LOCAL checkout from " + scmUrl);
         }
 
-        ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
-        releaseDescriptor.setInteractive(settings.isInteractiveMode());
+        ReleaseDescriptorBuilder descriptorBuilder = new ReleaseDescriptorBuilder();
+        descriptorBuilder.setInteractive(settings.isInteractiveMode());
 
         if (username == null || password == null) {
             for (Server server : settings.getServers()) {
@@ -345,12 +346,12 @@ private ReleaseDescriptor setupScm() throws ScmRepositoryException, NoSuchScmPro
             }
         }
 
-        releaseDescriptor.setScmPassword(password);
-        releaseDescriptor.setScmUsername(username);
+        descriptorBuilder.setScmPassword(password);
+        descriptorBuilder.setScmUsername(username);
 
-        releaseDescriptor.setWorkingDirectory(basedir.getAbsolutePath());
-        releaseDescriptor.setLocalCheckout(localCheckout);
-        releaseDescriptor.setScmSourceUrl(pubScmUrl);
+        descriptorBuilder.setWorkingDirectory(basedir.getAbsolutePath());
+        descriptorBuilder.setLocalCheckout(localCheckout);
+        descriptorBuilder.setScmSourceUrl(pubScmUrl);
 
         if (providerImplementations != null) {
             for (Map.Entry<String, String> providerEntry : providerImplementations.entrySet()) {
@@ -361,6 +362,7 @@ private ReleaseDescriptor setupScm() throws ScmRepositoryException, NoSuchScmPro
             }
         }
 
+        ReleaseDescriptor releaseDescriptor = descriptorBuilder.build();
         scmRepository = scmRepositoryConfigurator.getConfiguredRepository(releaseDescriptor, settings);
 
         scmProvider = scmRepositoryConfigurator.getRepositoryProvider(scmRepository);