diff --git a/release-tools/application-local.template b/release-tools/application-local.template index 479daa1..da0ac98 100644 --- a/release-tools/application-local.template +++ b/release-tools/application-local.template @@ -28,9 +28,9 @@ jira.password= jira.url=https://jira.spring.io # GPG -deployment.gpg.keyname= -deployment.gpg.password= -# deployment.gpg.executable=/usr/local/bin/gpg2 +gpg.keyname= +gpg.password= +gpg.executable=/usr/local/bin/gpg2 # A GitHub token with user:email, read:user and read:org scopes. # User needs to be part of the Spring team on GitHub as well. diff --git a/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java b/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java index a25fe08..fd9dcea 100644 --- a/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java +++ b/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java @@ -355,8 +355,6 @@ class MavenBuildSystem implements BuildSystem { logger.log(module, "Deploying artifacts to Sonatype OSS Nexus…"); - Gpg gpg = this.gpg.isGpgAvailable() ? this.gpg : properties.getGpg(); - CommandLine arguments = CommandLine.of(Goal.CLEAN, Goal.DEPLOY, // profile("ci,release,central"), // SKIP_TESTS, // diff --git a/release-tools/src/main/java/org/springframework/data/release/deployment/DeploymentProperties.java b/release-tools/src/main/java/org/springframework/data/release/deployment/DeploymentProperties.java index 0492cb4..b8294c0 100644 --- a/release-tools/src/main/java/org/springframework/data/release/deployment/DeploymentProperties.java +++ b/release-tools/src/main/java/org/springframework/data/release/deployment/DeploymentProperties.java @@ -20,7 +20,6 @@ import lombok.Data; import java.net.URI; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; import org.springframework.data.release.model.Gpg; import org.springframework.data.release.model.Password; import org.springframework.data.release.utils.HttpBasicCredentials; @@ -66,8 +65,6 @@ public class DeploymentProperties { private String repositoryPrefix = ""; - private Gpg gpg; - public String getStagingRepository() { return repositoryPrefix.concat(stagingRepository); } @@ -76,11 +73,6 @@ public class DeploymentProperties { return repositoryPrefix.concat(distributionRepository); } - @DeprecatedConfigurationProperty(reason = "Moved to gpg.", replacement = "gpg") - public Gpg getGpg() { - return gpg; - } - /** * Returns the URI of the staging repository. * diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Gpg.java b/release-tools/src/main/java/org/springframework/data/release/model/Gpg.java index 3d7bad1..d0a538f 100644 --- a/release-tools/src/main/java/org/springframework/data/release/model/Gpg.java +++ b/release-tools/src/main/java/org/springframework/data/release/model/Gpg.java @@ -29,7 +29,9 @@ import org.springframework.util.StringUtils; @Component @ConfigurationProperties(prefix = "gpg") public class Gpg { + private String keyname, executable; + private Password password; public boolean isGpgAvailable() {