From 361e6afe4fa5764fde6d892359df9120c36f8615 Mon Sep 17 00:00:00 2001
From: Chris Bono <cbono@vmware.com>
Date: Tue, 25 Apr 2023 21:16:07 -0500
Subject: [PATCH] [CI] refactor ArtifactoryPlugin

* Limit publications to only MavenPublishPlugin
---
 .../gradle/convention/ArtifactoryPlugin.groovy      | 13 +++++++++----
 spring-pulsar-docs/build.gradle                     |  3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy
index 4ed74561..4c7fe8cb 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy
@@ -17,6 +17,7 @@ package io.spring.gradle.convention
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 
 import org.springframework.pulsar.gradle.ProjectUtils
 
@@ -38,10 +39,14 @@ class ArtifactoryPlugin implements Plugin<Project> {
 						password = artifactoryPassword
 					}
 				}
-				defaults {
-					publications('mavenJava')
-					properties {
-						mavenJava '*:*:*:docs@zip', 'zip.name': 'spring-pulsar', 'zip.displayname': 'Spring Pulsar', 'zip.type': 'docs', 'zip.deployed': false
+			}
+		}
+
+		project.plugins.withType(MavenPublishPlugin) {
+			project.artifactory {
+				publish {
+					defaults {
+						publications('mavenJava')
 					}
 				}
 			}
diff --git a/spring-pulsar-docs/build.gradle b/spring-pulsar-docs/build.gradle
index c5a28d12..4968bcfd 100644
--- a/spring-pulsar-docs/build.gradle
+++ b/spring-pulsar-docs/build.gradle
@@ -182,6 +182,9 @@ publishing {
 
 artifactoryPublish {
 	publications(publishing.publications.mavenJava)
+	properties {
+		mavenJava '*:*:*:docs@zip', 'zip.name': 'spring-pulsar', 'zip.displayname': 'Spring Pulsar', 'zip.type': 'docs', 'zip.deployed': false
+	}
 }
 
 tasks.register('deployDocs') {