Merge branch '6.3.x'

Closes gh-66

Author: rainboyan

.github/workflows/gradle.yml

@@ -57,13 +57,11 @@ jobs:
         env:
           SECRING_FILE: ${{ secrets.SECRING_FILE }}
         run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
-      - name: Publish to Sonatype OSSRH
+      - name: Publish to Maven Central Portal
         id: publish
         env:
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }}
-          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}
+          MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SECRING_FILE: ${{ secrets.SECRING_FILE }}

.github/workflows/release.yml

@@ -69,14 +69,12 @@ jobs:
         env:
           SECRING_FILE: ${{ secrets.SECRING_FILE }}
         run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
-      - name: Publish to Sonatype OSSRH
+      - name: Publish to Maven Central Portal
         id: publish
         if: steps.secring.outcome == 'success'
         env:
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_NEXUS_URL: ${{ secrets.SONATYPE_NEXUS_URL }}
-          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}
+          MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
           SECRING_FILE: ${{ secrets.SECRING_FILE }}

build.gradle

@@ -4,7 +4,15 @@ buildscript {
         gradlePluginPortal()
         if (project.projectVersion.endsWith('-SNAPSHOT')) {
             maven {
-                url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+                name = 'Maven Central Portal Snapshots'
+                url = 'https://central.sonatype.com/repository/maven-snapshots/'
+
+                content {
+                    includeGroup 'org.graceframework'
+                }
+                mavenContent {
+                    snapshotsOnly()
+                }
             }
         }
     }
@@ -32,14 +40,12 @@ apply plugin: 'org.graceframework.grace-doc'
 nexusPublishing {
     repositories {
         sonatype {
-            def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : ''
-            def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
-            def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : ''
-            nexusUrl = uri("https://s01.oss.sonatype.org/service/local/")
-            snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-            username = ossUser
-            password = ossPass
-            stagingProfileId = ossStagingProfileId
+            def mavenUser = System.getenv("MAVEN_CENTRAL_USER") ?: project.hasProperty("mavenCentralUsername") ? project.mavenCentralUsername : ''
+            def mavenPass = System.getenv("MAVEN_CENTRAL_PASSWORD") ?: project.hasProperty("mavenCentralPassword") ? project.mavenCentralPassword : ''
+            nexusUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/")
+            snapshotRepositoryUrl = uri("https://central.sonatype.com/repository/maven-snapshots/")
+            username = mavenUser
+            password = mavenPass
         }
     }
 }
@@ -49,7 +55,15 @@ allprojects {
         mavenCentral()
         if (project.projectVersion.endsWith('-SNAPSHOT')) {
             maven {
-                url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+                name = 'Maven Central Portal Snapshots'
+                url = 'https://central.sonatype.com/repository/maven-snapshots/'
+
+                content {
+                    includeGroup 'org.graceframework'
+                }
+                mavenContent {
+                    snapshotsOnly()
+                }
             }
         }
     }
@@ -108,7 +122,15 @@ subprojects { project->
         mavenCentral()
         if (project.projectVersion.endsWith('-SNAPSHOT')) {
             maven {
-                url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+                name = 'Maven Central Portal Snapshots'
+                url = 'https://central.sonatype.com/repository/maven-snapshots/'
+
+                content {
+                    includeGroup 'org.graceframework'
+                }
+                mavenContent {
+                    snapshotsOnly()
+                }
             }
         }
     }

grace-plugin-scaffolding/build.gradle

@@ -1,3 +1,5 @@
+group = "org.graceframework.plugins"
+
 dependencies {
     api project(":grace-scaffolding-core")
     compileOnly "jakarta.servlet:jakarta.servlet-api"

grace-scaffolding-core/build.gradle

@@ -1,3 +1,5 @@
+group = "org.graceframework"
+
 dependencies {
     implementation "org.graceframework:grace-core"
     implementation "org.graceframework:grace-datastore-core:$gormVersion"