From 92aa2c5d867f1e0079acdff72d8e499059e7dce7 Mon Sep 17 00:00:00 2001
From: Chris Bono <cbono@vmware.com>
Date: Mon, 20 Nov 2023 15:47:18 -0600
Subject: [PATCH] [CI] Move closeOssrhStagingRepository to root project

---
 .github/workflows/ci.yml                                     | 2 +-
 .../org/springframework/pulsar/gradle/RootProjectPlugin.java | 5 +++++
 .../pulsar/gradle/publish/PublishArtifactsPlugin.java        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef285980..194ec93f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,7 +119,7 @@ jobs:
           OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
           OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
         run: |
-          ./gradlew publishArtifacts \
+          ./gradlew publishArtifacts finalizeDeployArtifacts \
               --stacktrace \
               -PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" \
               -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD"
diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/RootProjectPlugin.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/RootProjectPlugin.java
index 1c474f43..ef1a4711 100644
--- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/RootProjectPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/RootProjectPlugin.java
@@ -40,6 +40,11 @@ public class RootProjectPlugin implements Plugin<Project> {
 		pluginManager.apply(ArtifactoryPlugin.class);
 		pluginManager.apply(SonarQubeConventionsPlugin.class);
 		project.getRepositories().mavenCentral();
+
+		Task finalizeDeployArtifacts = project.task("finalizeDeployArtifacts");
+		if (ProjectUtils.isRelease(project) && project.hasProperty("ossrhUsername")) {
+			finalizeDeployArtifacts.dependsOn(project.getTasks().findByName("closeOssrhStagingRepository"));
+		}
 	}
 
 }
diff --git a/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/PublishArtifactsPlugin.java b/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/PublishArtifactsPlugin.java
index fe51c609..67d48dc5 100644
--- a/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/PublishArtifactsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/PublishArtifactsPlugin.java
@@ -13,7 +13,7 @@ public class PublishArtifactsPlugin implements Plugin<Project> {
 			publishArtifacts.setGroup("Publishing");
 			publishArtifacts.setDescription("Publish the artifacts to either Artifactory or Maven Central based on the version");
 			if (ProjectUtils.isRelease(project)) {
-				publishArtifacts.dependsOn("publishToOssrh", "closeOssrhStagingRepository");
+				publishArtifacts.dependsOn("publishToOssrh");
 			}
 			else {
 				publishArtifacts.dependsOn("artifactoryPublish");