Switch a few core plugins to the new api
diff --git a/pom.xml b/pom.xml
index 9c0b560..7498d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>40-SNAPSHOT</version>
+ <version>39</version>
<relativePath />
</parent>
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 4230b7e..18eef98 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,7 @@
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;
@@ -319,8 +320,8 @@
logInfo("Performing a LOCAL checkout from " + scmUrl);
}
- ReleaseDescriptorBuilder descriptorBuilder = new ReleaseDescriptorBuilder();
- descriptorBuilder.setInteractive(settings.isInteractiveMode());
+ ReleaseDescriptorBuilder releaseDescriptor = new ReleaseDescriptorBuilder();
+ releaseDescriptor.setInteractive(settings.isInteractiveMode());
if (username == null || password == null) {
for (Server server : settings.getServers()) {
@@ -346,12 +347,12 @@
}
}
- descriptorBuilder.setScmPassword(password);
- descriptorBuilder.setScmUsername(username);
+ releaseDescriptor.setScmPassword(password);
+ releaseDescriptor.setScmUsername(username);
- descriptorBuilder.setWorkingDirectory(basedir.getAbsolutePath());
- descriptorBuilder.setLocalCheckout(localCheckout);
- descriptorBuilder.setScmSourceUrl(pubScmUrl);
+ releaseDescriptor.setWorkingDirectory(basedir.getAbsolutePath());
+ releaseDescriptor.setLocalCheckout(localCheckout);
+ releaseDescriptor.setScmSourceUrl(pubScmUrl);
if (providerImplementations != null) {
for (Map.Entry<String, String> providerEntry : providerImplementations.entrySet()) {
@@ -362,12 +363,12 @@
}
}
- ReleaseDescriptor releaseDescriptor = descriptorBuilder.build();
- 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() throws MojoExecutionException {
