From 9a40fdac66cc9feb7224fcedd9ea706fbd13a3fd Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Wed, 14 Dec 2022 22:51:11 -0600 Subject: [PATCH] [Build] Attempt to sign docs to allow release (take2) --- .../pulsar/gradle/SpringDocsModulePlugin.java | 2 -- .../pulsar/gradle/SpringModulePlugin.java | 3 +++ spring-pulsar-docs/build.gradle | 14 +++++++++++++ .../pulsar/docs/Placeholder.java | 21 ------------------- 4 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 spring-pulsar-docs/src/main/java/org/springframework/pulsar/docs/Placeholder.java diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java index c6f22152..11885677 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java @@ -26,7 +26,6 @@ import org.gradle.api.plugins.PluginManager; import org.springframework.boot.gradle.JavaConventionsPlugin; import org.springframework.boot.gradle.optional.OptionalDependenciesPlugin; import org.springframework.pulsar.gradle.docs.asciidoc.AsciidoctorConventionsPlugin; -import org.springframework.pulsar.gradle.publish.PublishAllJavaComponentsPlugin; import org.springframework.pulsar.gradle.publish.SpringPublishPlugin; /** @@ -44,7 +43,6 @@ public class SpringDocsModulePlugin implements Plugin { pluginManager.apply(JavaConventionsPlugin.class); pluginManager.apply(AsciidoctorConventionsPlugin.class); pluginManager.apply(SpringPublishPlugin.class); - pluginManager.apply(PublishAllJavaComponentsPlugin.class); pluginManager.apply(OptionalDependenciesPlugin.class); } } diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringModulePlugin.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringModulePlugin.java index 8df72a79..b155cc0f 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringModulePlugin.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringModulePlugin.java @@ -19,6 +19,8 @@ package org.springframework.pulsar.gradle; import org.gradle.api.Project; import org.gradle.api.plugins.PluginManager; +import org.springframework.pulsar.gradle.publish.PublishAllJavaComponentsPlugin; + /** * @author Chris Bono */ @@ -28,6 +30,7 @@ public class SpringModulePlugin extends SpringDocsModulePlugin { public void apply(final Project project) { super.apply(project); PluginManager pluginManager = project.getPluginManager(); + pluginManager.apply(PublishAllJavaComponentsPlugin.class); pluginManager.apply(JacocoConventionsPlugin.class); } } diff --git a/spring-pulsar-docs/build.gradle b/spring-pulsar-docs/build.gradle index 30cb6c24..dd4de9ca 100644 --- a/spring-pulsar-docs/build.gradle +++ b/spring-pulsar-docs/build.gradle @@ -190,3 +190,17 @@ publishing { artifactoryPublish { publications(publishing.publications.mavenJava) } + +signing { + required { project.hasProperty("signing.keyId") || project.hasProperty("signingKey") && gradle.taskGraph.hasTask("publishArtifacts") } + def signingKeyId = (String) project.findProperty("signing.keyId"); + def signingKey = (String) project.findProperty("signingKey"); + def signingPassword = (String) project.findProperty("signingPassword"); + if (signingKeyId != null) { + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword); + } + else { + useInMemoryPgpKeys(signingKey, signingPassword); + } + sign publishing.publications.mavenJava +} diff --git a/spring-pulsar-docs/src/main/java/org/springframework/pulsar/docs/Placeholder.java b/spring-pulsar-docs/src/main/java/org/springframework/pulsar/docs/Placeholder.java deleted file mode 100644 index bfe7501c..00000000 --- a/spring-pulsar-docs/src/main/java/org/springframework/pulsar/docs/Placeholder.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2022 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.pulsar.docs; - -public class Placeholder { - -}