From 1e445e2b1ef0d43d92e9e0652df5950e171caa55 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Sat, 30 Sep 2023 22:35:14 -0500 Subject: [PATCH] [CI] Add plugin for unpublished Spring modules --- buildSrc/build.gradle | 4 +++ .../gradle/AbstractSpringModulePlugin.java | 1 - .../pulsar/gradle/SpringDocsModulePlugin.java | 4 ++- .../pulsar/gradle/SpringModulePlugin.java | 2 ++ .../gradle/SpringUnpublishedModulePlugin.java | 29 +++++++++++++++++++ integration-tests/integration-tests.gradle | 10 +------ spring-pulsar-test/spring-pulsar-test.gradle | 10 +------ 7 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringUnpublishedModulePlugin.java diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 9369cc7a..fddb1523 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -88,6 +88,10 @@ gradlePlugin { id = "org.springframework.pulsar.spring-module" implementationClass = "org.springframework.pulsar.gradle.SpringModulePlugin" } + springUnpublishedModulePlugin { + id = "org.springframework.pulsar.spring-unpublished-module" + implementationClass = "org.springframework.pulsar.gradle.SpringUnpublishedModulePlugin" + } sonarQubeConventionsPlugin { id = "org.springframework.pulsar.sonarqube" implementationClass = "org.springframework.pulsar.gradle.check.SonarQubeConventionsPlugin" diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/AbstractSpringModulePlugin.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/AbstractSpringModulePlugin.java index 09347bb9..f574cc78 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/AbstractSpringModulePlugin.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/AbstractSpringModulePlugin.java @@ -38,7 +38,6 @@ public abstract class AbstractSpringModulePlugin implements Plugin { pluginManager.apply(JavaPlugin.class); pluginManager.apply(JavaLibraryPlugin.class); pluginManager.apply(RepositoryConventionPlugin.class); - pluginManager.apply(SpringMavenPlugin.class); pluginManager.apply(JavaConventionsPlugin.class); pluginManager.apply(OptionalDependenciesPlugin.class); additionalPlugins(project); 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 ba31a1fa..2fbbbe6e 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringDocsModulePlugin.java @@ -19,7 +19,7 @@ package org.springframework.pulsar.gradle; import org.gradle.api.Project; import org.gradle.api.plugins.PluginManager; -import org.springframework.pulsar.gradle.docs.AsciidoctorConventionsPlugin; +import org.springframework.pulsar.gradle.publish.SpringMavenPlugin; /** * @author Chris Bono @@ -28,5 +28,7 @@ public class SpringDocsModulePlugin extends AbstractSpringModulePlugin { @Override protected void additionalPlugins(Project project) { + PluginManager pluginManager = project.getPluginManager(); + pluginManager.apply(SpringMavenPlugin.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 719ac130..b543d2cb 100644 --- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringModulePlugin.java +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringModulePlugin.java @@ -21,6 +21,7 @@ import org.gradle.api.plugins.PluginManager; import org.springframework.pulsar.gradle.check.JacocoConventionsPlugin; import org.springframework.pulsar.gradle.publish.PublishAllJavaComponentsPlugin; +import org.springframework.pulsar.gradle.publish.SpringMavenPlugin; /** * @author Chris Bono @@ -30,6 +31,7 @@ public class SpringModulePlugin extends AbstractSpringModulePlugin { @Override protected void additionalPlugins(Project project) { PluginManager pluginManager = project.getPluginManager(); + pluginManager.apply(SpringMavenPlugin.class); pluginManager.apply(PublishAllJavaComponentsPlugin.class); pluginManager.apply(JacocoConventionsPlugin.class); } diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringUnpublishedModulePlugin.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringUnpublishedModulePlugin.java new file mode 100644 index 00000000..3f6cb065 --- /dev/null +++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/SpringUnpublishedModulePlugin.java @@ -0,0 +1,29 @@ +/* + * Copyright 2022-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.gradle; + +import org.gradle.api.Project; + +/** + * @author Chris Bono + */ +public class SpringUnpublishedModulePlugin extends AbstractSpringModulePlugin { + + @Override + protected void additionalPlugins(Project project) { + } +} diff --git a/integration-tests/integration-tests.gradle b/integration-tests/integration-tests.gradle index 257788e6..a169ce8e 100644 --- a/integration-tests/integration-tests.gradle +++ b/integration-tests/integration-tests.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.pulsar.spring-module' + id 'org.springframework.pulsar.spring-unpublished-module' id "de.undercouch.download" version "5.3.0" id 'spring-pulsar.integration-test-conventions' } @@ -56,11 +56,3 @@ task downloadRabbitConnector { project.afterEvaluate { integrationTest.dependsOn downloadRabbitConnector } - -project.afterEvaluate { - project.tasks.publishArtifacts.enabled(false) - project.tasks.artifactoryPublish.enabled(false) - project.tasks.publishToOssrh.enabled(false) - project.tasks.publishMavenJavaPublicationToOssrhRepository.enabled(false) - project.tasks.publishAllPublicationsToOssrhRepository.enabled(false) -} diff --git a/spring-pulsar-test/spring-pulsar-test.gradle b/spring-pulsar-test/spring-pulsar-test.gradle index 574fae9e..b88d13a3 100644 --- a/spring-pulsar-test/spring-pulsar-test.gradle +++ b/spring-pulsar-test/spring-pulsar-test.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.pulsar.spring-module' + id 'org.springframework.pulsar.spring-unpublished-module' } description = 'Spring Pulsar Test Module' @@ -9,11 +9,3 @@ dependencies { implementation 'org.testcontainers:pulsar' implementation 'org.testcontainers:junit-jupiter' } - -project.afterEvaluate { - project.tasks.publishArtifacts.enabled(false) - project.tasks.artifactoryPublish.enabled(false) - project.tasks.publishToOssrh.enabled(false) - project.tasks.publishMavenJavaPublicationToOssrhRepository.enabled(false) - project.tasks.publishAllPublicationsToOssrhRepository.enabled(false) -}