Merge pull request #1057 from matrei/matrei/merge-security-repos

Merge Grails Spring Security Plugin repositories

Author: matrei

.github/workflows/gradle.yml

@@ -1,4 +1,4 @@
-name: Java CI
+name: "Java CI"
 on:
   push:
     branches:
@@ -15,87 +15,70 @@ env:
 
 jobs:
   core-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
-      - uses: actions/setup-java@v4
-        with: { java-version: 17, distribution: liberica }
-      - name: Run Tests
-        uses: gradle/actions/setup-gradle@v3
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@v4
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@v4
         with:
-          arguments: |
-            check 
-            --refresh-dependencies
-            --continue
-
+          java-version: 17
+          distribution: liberica
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+      - name: "🏃‍♂️ Run Tests"
+        run: ./gradlew check --max-workers=2 --refresh-dependencies --continue
   functional-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         test-config: [ 'static', 'annotation', 'requestmap', 'basic', 'basicCacheUsers', 'misc', 'putWithParams', 'bcrypt', 'issue503' ]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with: { java-version: 17, distribution: liberica }
-      - name: Run Tests
-        uses: gradle/actions/setup-gradle@v3
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@v4
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@v4
         with:
-          arguments: |
-            examples-functional-test-app:check 
-            -DTESTCONFIG=${{ matrix.test-config }}
-
+          java-version: 17
+          distribution: liberica
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+      - name: "🏃‍♂️ Run Different Config Functional Tests"
+        run: ./gradlew core-examples-functional-test-app:check -DTESTCONFIG=${{ matrix.test-config }}
   build:
     if: github.event_name == 'push'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
-      - uses: actions/setup-java@v4
-        with: { java-version: 17, distribution: liberica }
-      - name: Run Build
-        id: build
-        uses: gradle/actions/setup-gradle@v3
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@v4
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@v4
         with:
-          arguments: |
-            spring-security-core:build 
-            --refresh-dependencies
-            -x javadoc
-
-      - name: Publish Snapshot artifacts to Artifactory (repo.grails.org)
-        uses: gradle/actions/setup-gradle@v3
-        if: success()
-        env:
-          ORG_GRADLE_PROJECT_artifactoryUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ORG_GRADLE_PROJECT_artifactoryPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          java-version: 17
+          distribution: liberica
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@v4
         with:
-          arguments: |
-            -Dorg.gradle.internal.publish.checksums.insecure=true 
-            spring-security-core:publish
-            -x javadoc            
-
-      - name: Generate Snapshot Documentation
-        if: success()
-        uses: gradle/actions/setup-gradle@v3
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+      - name: "📤 Publish Snapshot artifacts to Artifactory (repo.grails.org)"
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-        with:
-          arguments: spring-security-core:docs
-
-      - name: Publish Snapshot Documentation to Github Pages
-        if: success()
-        uses: grails/github-pages-deploy-action@grails
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GRADLE_PUBLISH_RELEASE: 'false'
+          MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
+          MAVEN_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PUBLISH_PASSWORD }}
+        run: ./gradlew --no-build-cache publish
+      - name: "🔨 Generate Snapshot Documentation"
+        run: ./gradlew aggregateDocs
+      - name: "📤 Publish Snapshot Documentation to Github Pages"
+        uses: grails/github-pages-deploy-action@v3
         env:
           BRANCH: gh-pages
           COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
           COMMIT_NAME: ${{ env.GIT_USER_NAME }}
-          FOLDER: plugin/build/docs
+          FOLDER: build/docs
           GH_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/release.yml

@@ -1,68 +1,60 @@
-name: Release
+name: "Release"
 on:
   release:
     types: [published]
 env:
-  GIT_USER_NAME: 'grails-build'
-  GIT_USER_EMAIL: '[email protected]'
+  GIT_USER_NAME: grails-build
+  GIT_USER_EMAIL: [email protected]
 jobs:
   release:
-    runs-on: ubuntu-latest
-    env:
-      GIT_USER_NAME: 'grails-build'
-      GIT_USER_EMAIL: '[email protected]'
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@v4
       - name: "☕️ Setup JDK"
         uses: actions/setup-java@v4
         with:
-          distribution: liberica
           java-version: 17
+          distribution: liberica
+      - name: "🐘 Setup Gradle"
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: "📝 Store the current release version"
         id: release_version
         run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
-      - name: Run pre-release
-        uses: grails/github-actions/pre-release@main
-      - name: Generate secring file
+      - name: "⚙️ Run pre-release"
+        uses: grails/github-actions/pre-release@v3
+      - name: "🔐 Generate key file for artifact signing"
         env:
           SECRING_FILE: ${{ secrets.SECRING_FILE }}
         run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
-      - name: Publish to Sonatype
-        id: publish_to_sonatype
-        uses: gradle/actions/setup-gradle@v3
+      - name: "📤 Publish to Sonatype - close and release staging repository"
         env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
-          ORG_GRADLE_PROJECT_sonatypeStagingProfileId: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
-          ORG_GRADLE_PROJECT_sonatypeNexusUrl: ${{ secrets.SONATYPE_NEXUS_URL }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GRAILS_PUBLISH_RELEASE: 'true'
+          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 }}
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
-          SECRING_FILE: ${{ secrets.SECRING_FILE }}
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-        with:
-          arguments: |
-            -U 
-            -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg 
-            publishToSonatype 
-            closeAndReleaseSonatypeStagingRepository
-      - name: Generate Documentation
-        if: success()
-        uses: gradle/actions/setup-gradle@v3
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-        with:
-          arguments: docs
-      - name: Publish Documentation to Github Pages
-        if: success()
-        uses: grails/github-pages-deploy-action@grails
+        run: >
+          ./gradlew --refresh-dependencies
+          -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg
+          publishToSonatype
+          closeAndReleaseSonatypeStagingRepository
+      - name: "🔨 Build Documentation"
+        run: ./gradlew aggregateDocs
+      - name: "📤 Publish Documentation to Github Pages"
+        uses: grails/github-pages-deploy-action@v3
         env:
           BRANCH: gh-pages
           COMMIT_EMAIL: ${{ env.GIT_USER_EMAIL }}
           COMMIT_NAME: ${{ env.GIT_USER_NAME }}
-          FOLDER: plugin/build/docs
+          FOLDER: build/docs
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          SKIP_SNAPSHOT: ${{ contains(steps.release_version.outputs.release_version, 'M') }}
+          SKIP_SNAPSHOT: ${{ contains(steps.release_version.outputs.release_version, 'M') || contains(steps.release_version.outputs.release_version, 'RC') }}
           VERSION: ${{ steps.release_version.outputs.release_version }}
-      - name: Run post-release
-        if: steps.publish_to_sonatype.outcome == 'success'
-        uses: grails/github-actions/post-release@main
+      - name: "⚙️ Run post-release"
+        uses: grails/github-actions/post-release@v3

README.md

@@ -3,7 +3,7 @@
 Grails Spring Security Core Plugin
 ==================================
 
-See [documentation](https://grails-plugins.github.io/grails-spring-security-core/) for further information.
+See [documentation](https://grails.github.io/grails-spring-security-core/latest/guide) for further information.
 
 ### Branch structure 
 

build.gradle

@@ -1,45 +1,40 @@
-import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository
+import org.asciidoctor.gradle.jvm.AsciidoctorTask
 
-plugins {
-    id 'io.github.gradle-nexus.publish-plugin'
+String customGroovyVersion = findProperty('groovyVersion') ?: System.getenv('GROOVY_VERSION')
+if (customGroovyVersion) {
+    logger.lifecycle("Using custom Groovy version: $customGroovyVersion")
 }
 
-version = projectVersion
-ext.set('isSnapshot', projectVersion.endsWith('-SNAPSHOT'))
-ext.set('isReleaseVersion', !isSnapshot)
+subprojects {
+
+    version = projectVersion
 
-if (isReleaseVersion) {
-    nexusPublishing {
-        String nexusUser = findProperty('sonatypeUsername')
-        String nexusPass = findProperty('sonatypePassword')
-        String nexusStagingProfileId = findProperty('sonatypeStagingProfileId')
-        repositories {
-            sonatype {
-                nexusUrl = uri('https://s01.oss.sonatype.org/service/local/')
-                username = nexusUser
-                password = nexusPass
-                stagingProfileId = nexusStagingProfileId
+    if (customGroovyVersion) {
+        configurations.configureEach {
+            resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+                if (details.requested.group == 'org.apache.groovy') {
+                    details.useVersion(customGroovyVersion)
+                }
             }
         }
     }
-}
-subprojects {
-    apply plugin: 'groovy'
 
-    version = rootProject.version
     repositories {
-        mavenCentral()
         maven { url = 'https://repo.grails.org/grails/core' }
-        if (groovyVersion.endsWith('-SNAPSHOT')) {
+        mavenCentral()
+        if (customGroovyVersion?.endsWith('-SNAPSHOT')) {
+            // Used for testing locally against the latest snapshot of Groovy
+            // Usage: ./gradlew build -P"groovyVersion=X.X.X-SNAPSHOT"
+            logger.lifecycle('Adding Groovy Snapshot Repo for project: {}, Using Groovy {}', name, customGroovyVersion)
             maven {
-                name = 'JFrog Groovy snapshot repo'
-                url = 'https://groovy.jfrog.io/artifactory/libs-snapshot-local'
+                name = 'ASF Snapshot repo'
+                url = 'https://repository.apache.org/content/repositories/snapshots'
             }
         }
     }
 }
 
-// Do not generate extra load on Nexus with new staging repository if signing fails
-tasks.withType(InitializeNexusStagingRepository).configureEach {
-    shouldRunAfter tasks.withType(Sign)
+tasks.register('clean', Delete) {
+    group = 'build'
+    delete layout.buildDirectory
 }

buildSrc/build.gradle

@@ -15,7 +15,7 @@ repositories {
 dependencies {
     implementation platform("org.grails:grails-bom:${versions.get('grailsVersion')}")
     implementation "org.asciidoctor:asciidoctor-gradle-jvm:${versions.get('asciidoctorGradlePluginVersion')}"
-    implementation "com.bertramlabs.plugins:asset-pipeline-gradle:${versions.get('assetPipelineGradlePluginVersion')}"
+    implementation 'com.bertramlabs.plugins:asset-pipeline-gradle'
     implementation 'org.grails:grails-gradle-plugin'
     testImplementation 'org.spockframework:spock-core'
 }