From f7478a2f07e91b451f3a6a680e0bdff578b43c60 Mon Sep 17 00:00:00 2001
From: cfmlprojects <cfml@cfmlprojects.org>
Date: Sun, 1 Oct 2023 20:28:31 -0600
Subject: [PATCH] maven artifact test

---
 .github/workflows/build-master.yml    |  2 +-
 .github/workflows/publish-release.yml |  2 +-
 build.gradle                          | 17 ++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
index 78da3f1..fbd0506 100644
--- a/.github/workflows/build-master.yml
+++ b/.github/workflows/build-master.yml
@@ -27,7 +27,7 @@ jobs:
           MAVENCENTRALPASSWORD: ${{ secrets.MAVENCENTRALPASSWORD }}
           SIGNINGKEY: ${{ secrets.SIGNINGKEY }}
           SIGNINGPASSWORD: ${{ secrets.SIGNINGPASSWORD }}
-        run: ./gradlew publishShadowPublicationToSonatypeRepository
+        run: ./gradlew build
 
   release-notes:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 251ca21..0e54016 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -29,4 +29,4 @@ jobs:
           SIGNINGPASSWORD: ${{ secrets.SIGNINGPASSWORD }}
 
       - name: Execute Gradle build
-        run: ./gradlew publishShadowPublicationToSonatypeRepository
\ No newline at end of file
+        run: ./gradlew publishToSonatype closeAndReleaseStagingRepository
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 0ad17ff..43c862a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,7 @@ plugins {
     id('net.gradleutil.gradle-conf') version('1.1.18')
     id "org.ajoberstar.grgit" version "5.2.0"
     id "org.ajoberstar.git-publish" version "3.0.0"
-    id "de.marcphilipp.nexus-publish" version "0.3.0"
-    id "io.codearte.nexus-staging" version "0.21.2"
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0-rc-1"
     id 'idea'
     id 'signing'
 }
@@ -21,7 +20,7 @@ group = 'org.cfmlprojects'
 description = 'Daevil Gradle build script'
 archivesBaseName = 'daevil'
 
-version = '1.0.3'
+version = '1.0.4-SNAPSHOT'
 
 sourceCompatibility = 11
 targetCompatibility = 11
@@ -258,11 +257,6 @@ idea {
     }
 }
 
-nexusStaging {
-    packageGroup = "org.cfmlprojects"
-    numberOfRetries = 40 // we've seen extremely long delays in closing repositories
-}
-
 
 publishing {
     publications {
@@ -310,8 +304,13 @@ publishing {
 }
 
 nexusPublishing {
+    packageGroup = "org.cfmlprojects"
+    connectTimeout = Duration.ofSeconds(60)
     clientTimeout = java.time.Duration.ofMinutes(2)
-    // we've seen extremely long delays in creating repositories
+    transitionCheckOptions {
+        maxRetries.set(40)
+        delayBetween.set(java.time.Duration.ofMillis(3000))
+    }
     repositories {
         sonatype {
             if (!shouldSkipSigning()) {