Merge pull request #561 from jdaugherty/6.0.x

switch to grails-publish
grails · Dec 3, 2024 · 7b3c5ac · 7b3c5ac
2 parents 7fe25b7 + 8e9a410
commit 7b3c5ac
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -45,8 +45,9 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-          ORG_GRADLE_PROJECT_artifactoryPublishUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ORG_GRADLE_PROJECT_artifactoryPublishPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
+          MAVEN_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PUBLISH_PASSWORD }}
+          MAVEN_PUBLISH_URL: ${{ secrets.MAVEN_PUBLISH_SNAPSHOT_URL }}
         with:
           arguments: |
             -Dorg.gradle.internal.publish.checksums.insecure=true

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,9 +35,10 @@ jobs:
         id: publish
         uses: gradle/gradle-build-action@v3
         env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
-          ORG_GRADLE_PROJECT_sonatypeStagingProfileId: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_PUBLISH_USERNAME }}
+          NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }}
+          NEXUS_PUBLISH_NEXUS_URL: ${{ secrets.NEXUS_PUBLISH_RELEASE_URL }}
+          NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SECRING_FILE: ${{ secrets.SECRING_FILE }}

diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,5 @@
-import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository
-import org.grails.gradle.plugin.publishing.RepositoryType
-
 buildscript {
     repositories {
-        mavenLocal()
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://repo.grails.org/grails/core" }
     }
@@ -57,7 +53,6 @@ subprojects { Project project ->
     ext.set('isProfile', project.name.endsWith('-profile'))
 
     repositories {
-        mavenLocal()
         mavenCentral()
         maven { url "https://repo.grails.org/grails/core" }
     }
@@ -123,7 +118,6 @@ subprojects { Project project ->
             title = "Spring Security REST plugin"
             desc = "Grails plugin to implement token-based, RESTful authentication using Spring Security"
             developers = [alvarosanchez:"Alvaro Sanchez-Mariscal", jameskleeh: "James Kleeh", jdaugherty: "James Daugherty"]
-            snapshotRepoType = RepositoryType.ARTIFACTORY
         }
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -5,4 +5,4 @@ gradlePublishPlugin=2.0.0
 springSecurityCoreVersion=7.0.0-SNAPSHOT
 pac4jVersion=6.0.6
 jackson.version=2.18.0
-artifactoryPublishUrl=https://repo.grails.org/grails/libs-snapshots-local
+mavenPublishUrl=https://repo.grails.org/grails/plugins3-snapshots-local
diff --git a/spring-security-rest-testapp-profile/gradle.properties b/spring-security-rest-testapp-profile/gradle.properties
@@ -1 +1 @@
-artifactoryPublishUrl=https://repo.grails.org/grails/plugins3-snapshots-local
+mavenPublishUrl=https://repo.grails.org/grails/libs-snapshots-local
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		artifactoryPublishUrl=https://repo.grails.org/grails/plugins3-snapshots-local
		mavenPublishUrl=https://repo.grails.org/grails/libs-snapshots-local