From b20df4e423c4aa162fdff0c4ef49d05d064bd1b3 Mon Sep 17 00:00:00 2001
From: James Daugherty <jdaugherty@jdresources.net>
Date: Thu, 12 Dec 2024 18:48:03 -0500
Subject: [PATCH 1/2] Revert "Move grails-publish to the plugin block"

This reverts commit 7199a25da69e8a79f3ad02f80324efcb0de8d51a.
---
 build.gradle    |  2 +-
 settings.gradle | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1ed3979..fe37078 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,6 @@ buildscript {
 
 plugins {
     id 'com.github.ben-manes.versions' version '0.51.0'
-    id 'org.grails.grails-publish'
 }
 
 version = projectVersion
@@ -18,6 +17,7 @@ group = 'org.grails.plugins'
 apply plugin: 'java-library'
 apply plugin: 'java-test-fixtures'
 apply plugin: 'org.grails.grails-plugin'
+apply plugin: 'org.grails.grails-publish'
 
 tasks.withType(JavaCompile).configureEach {
     options.release = 17
diff --git a/settings.gradle b/settings.gradle
index 36a3763..fadee26 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,13 +1,3 @@
-pluginManagement {
-    repositories {
-        maven { url "https://repo.grails.org/grails/core/" }
-        gradlePluginPortal()
-    }
-    plugins {
-        id "org.grails.grails-publish" version "${grailsGradlePluginVersion}"
-    }
-}
-
 plugins {
     id 'com.gradle.develocity' version '3.18.2'
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'

From 16a7f0d25368842b8cbc330188165c170bb286b9 Mon Sep 17 00:00:00 2001
From: James Daugherty <jdaugherty@jdresources.net>
Date: Thu, 12 Dec 2024 19:32:33 -0500
Subject: [PATCH 2/2] [skip ci] use old variable values

---
 .github/workflows/release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 31266bc..00053ca 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,10 +32,10 @@ jobs:
       - name: "📤 Publish artifacts to Sonatype"
         id: publish
         env:
-          NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_PUBLISH_USERNAME }}
-          NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }}
-          NEXUS_PUBLISH_URL: ${{ secrets.NEXUS_PUBLISH_RELEASE_URL }}
-          NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }}
+          NEXUS_PUBLISH_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          NEXUS_PUBLISH_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          NEXUS_PUBLISH_URL: ${{ secrets.SONATYPE_NEXUS_URL }}
+          NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SECRING_FILE: ${{ secrets.SECRING_FILE }}