From de859835130f0b19886bb2148956c6d1e69b394c Mon Sep 17 00:00:00 2001
From: mburkert3 <mburkert@sonatype.com>
Date: Tue, 17 Dec 2024 21:55:39 -0500
Subject: [PATCH] Fix double deployment of unwanted plugin marker to Maven
 Central

---
 .github/workflows/release.yml |  5 +++++
 build.gradle                  | 11 +++++++++++
 gradle.properties             |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0303886..f236599 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,6 +37,11 @@ jobs:
       - name: Clean Deployment
         run: ./gradlew clean publish -Dorg.gradle.daemon=false
 
+      - name: Cleanup Unwanted Artifacts
+        run: |
+          echo "Removing unwanted scanPluginMarkerMaven artifacts"
+          rm -rf build/publications/scanPluginMarkerMaven
+
       - name: Release with JReleaser
         run: ./gradlew jreleaserFullRelease -Dorg.gradle.daemon=false --stacktrace -x test -x integrationTest
         env:
diff --git a/build.gradle b/build.gradle
index 694e5cf..c861568 100644
--- a/build.gradle
+++ b/build.gradle
@@ -183,5 +183,16 @@ jreleaser {
   }
 }
 
+// Remove unwanted "scan" directory after publishing
+tasks.register('cleanupUnwantedArtifacts') {
+  doLast {
+    def unwantedDir = file("build/staging-deploy/org/sonatype/gradle/plugins/scan")
+    if (unwantedDir.exists()) {
+      println "Removing unwanted directory: $unwantedDir"
+      delete unwantedDir
+    }
+  }
+}
 afterReleaseBuild.dependsOn publish
+publish.finalizedBy cleanupUnwantedArtifacts
 // publish.finalizedBy publishPlugins
diff --git a/gradle.properties b/gradle.properties
index e25e365..9b5022b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,5 +15,5 @@
 #
 
 group=org.sonatype.gradle.plugins
-version=3.0.0-SNAPSHOT
+version=3.1.0-SNAPSHOT
 release.useAutomaticVersion=true