Skip to content

Commit 8de6698

Browse files
committed
Add support for signing.keyId
1 parent 943477c commit 8de6698

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

Diff for: buildSrc/src/main/java/org/springframework/gradle/maven/SpringSigningPlugin.java

+15-8
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,7 @@ public Boolean call() throws Exception {
5050
return project.getGradle().getTaskGraph().hasTask("publishArtifacts");
5151
}
5252
});
53-
String signingKeyId = (String) project.findProperty("signingKeyId");
54-
String signingKey = (String) project.findProperty("signingKey");
55-
String signingPassword = (String) project.findProperty("signingPassword");
56-
if (signingKeyId != null) {
57-
signing.useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword);
58-
} else {
59-
signing.useInMemoryPgpKeys(signingKey, signingPassword);
60-
}
53+
sign(project, signing);
6154
project.getPlugins().withType(PublishAllJavaComponentsPlugin.class).all(new Action<PublishAllJavaComponentsPlugin>() {
6255
@Override
6356
public void execute(PublishAllJavaComponentsPlugin publishingPlugin) {
@@ -67,4 +60,18 @@ public void execute(PublishAllJavaComponentsPlugin publishingPlugin) {
6760
}
6861
});
6962
}
63+
64+
private void sign(Project project, SigningExtension signing) {
65+
if (project.hasProperty("signing.keyId")) {
66+
return; // use Gradle defaults
67+
}
68+
String signingKeyId = (String) project.findProperty("signingKeyId");
69+
String signingKey = (String) project.findProperty("signingKey");
70+
String signingPassword = (String) project.findProperty("signingPassword");
71+
if (signingKeyId != null) {
72+
signing.useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword);
73+
} else {
74+
signing.useInMemoryPgpKeys(signingKey, signingPassword);
75+
}
76+
}
7077
}

0 commit comments

Comments
 (0)