diff --git a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java index 112651ba..c953f10f 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java +++ b/buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java @@ -50,14 +50,7 @@ public class SpringSigningPlugin implements Plugin { return project.getGradle().getTaskGraph().hasTask("publishArtifacts"); } }); - String signingKeyId = (String) project.findProperty("signingKeyId"); - String signingKey = (String) project.findProperty("signingKey"); - String signingPassword = (String) project.findProperty("signingPassword"); - if (signingKeyId != null) { - signing.useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword); - } else { - signing.useInMemoryPgpKeys(signingKey, signingPassword); - } + sign(project, signing); project.getPlugins().withType(PublishAllJavaComponentsPlugin.class).all(new Action() { @Override public void execute(PublishAllJavaComponentsPlugin publishingPlugin) { @@ -67,4 +60,18 @@ public class SpringSigningPlugin implements Plugin { } }); } + + private void sign(Project project, SigningExtension signing) { + if (project.hasProperty("signing.keyId")) { + return; // use Gradle defaults + } + String signingKeyId = (String) project.findProperty("signingKeyId"); + String signingKey = (String) project.findProperty("signingKey"); + String signingPassword = (String) project.findProperty("signingPassword"); + if (signingKeyId != null) { + signing.useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword); + } else { + signing.useInMemoryPgpKeys(signingKey, signingPassword); + } + } }