Skip to content

Commit 9a40fda

Browse files
committed
[Build] Attempt to sign docs to allow release (take2)
1 parent add81ef commit 9a40fda

File tree

4 files changed

+17
-23
lines changed

4 files changed

+17
-23
lines changed

buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.boot.gradle.JavaConventionsPlugin;
2727
import org.springframework.boot.gradle.optional.OptionalDependenciesPlugin;
2828
import org.springframework.pulsar.gradle.docs.asciidoc.AsciidoctorConventionsPlugin;
29-
import org.springframework.pulsar.gradle.publish.PublishAllJavaComponentsPlugin;
3029
import org.springframework.pulsar.gradle.publish.SpringPublishPlugin;
3130

3231
/**
@@ -44,7 +43,6 @@ public void apply(final Project project) {
4443
pluginManager.apply(JavaConventionsPlugin.class);
4544
pluginManager.apply(AsciidoctorConventionsPlugin.class);
4645
pluginManager.apply(SpringPublishPlugin.class);
47-
pluginManager.apply(PublishAllJavaComponentsPlugin.class);
4846
pluginManager.apply(OptionalDependenciesPlugin.class);
4947
}
5048
}

buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringModulePlugin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import org.gradle.api.Project;
2020
import org.gradle.api.plugins.PluginManager;
2121

22+
import org.springframework.pulsar.gradle.publish.PublishAllJavaComponentsPlugin;
23+
2224
/**
2325
* @author Chris Bono
2426
*/
@@ -28,6 +30,7 @@ public class SpringModulePlugin extends SpringDocsModulePlugin {
2830
public void apply(final Project project) {
2931
super.apply(project);
3032
PluginManager pluginManager = project.getPluginManager();
33+
pluginManager.apply(PublishAllJavaComponentsPlugin.class);
3134
pluginManager.apply(JacocoConventionsPlugin.class);
3235
}
3336
}

spring-pulsar-docs/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,17 @@ publishing {
190190
artifactoryPublish {
191191
publications(publishing.publications.mavenJava)
192192
}
193+
194+
signing {
195+
required { project.hasProperty("signing.keyId") || project.hasProperty("signingKey") && gradle.taskGraph.hasTask("publishArtifacts") }
196+
def signingKeyId = (String) project.findProperty("signing.keyId");
197+
def signingKey = (String) project.findProperty("signingKey");
198+
def signingPassword = (String) project.findProperty("signingPassword");
199+
if (signingKeyId != null) {
200+
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword);
201+
}
202+
else {
203+
useInMemoryPgpKeys(signingKey, signingPassword);
204+
}
205+
sign publishing.publications.mavenJava
206+
}

spring-pulsar-docs/src/main/java/org/springframework/pulsar/docs/Placeholder.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)