Merge branch '7.0.x' into update-profiles-m1

Author: jamesfredley

.github/actions/post-release/entrypoint.sh

@@ -5,10 +5,6 @@ if [ -z "$SNAPSHOT_SUFFIX" ]; then
   SNAPSHOT_SUFFIX="-SNAPSHOT"
 fi
 
-if [ -n "$MICRONAUT_BUILD_EMAIL" ]; then
-    GIT_USER_EMAIL=$MICRONAUT_BUILD_EMAIL
-fi
-
 if [ -z "$GIT_USER_EMAIL" ]; then
    GIT_USER_EMAIL="${GITHUB_ACTOR}@users.noreply.github.com"
 fi

.github/actions/pre-release/entrypoint.sh

@@ -5,10 +5,6 @@ echo -n "Determining release version: "
 release_version=${GITHUB_REF:11}
 echo $release_version
 
-if [ -n "$MICRONAUT_BUILD_EMAIL" ]; then
-    GIT_USER_EMAIL=$MICRONAUT_BUILD_EMAIL
-fi
-
 if [ -z "$GIT_USER_NAME" ]; then
    GIT_USER_NAME="grails-build"
 fi

.github/workflows/gradle.yml

@@ -10,16 +10,12 @@ on:
       - '[3-9]+.[3-9]+.x'
   workflow_dispatch:
 jobs:
-  build:
+  skip_check:
+    runs-on: ubuntu-latest
     outputs:
       found_skip_publish: ${{ steps.check_prevent_property.outputs.value }}
     permissions:
-      contents: read  #  to fetch code (actions/checkout)
-    strategy:
-      matrix:
-        java: [17, 21, 23]
-        os: [ubuntu-latest, windows-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
+      contents: read
     steps:
       - name: "📥 Checkout repository"
         uses: actions/checkout@v4
@@ -31,6 +27,18 @@ jobs:
           else
             echo "value=false" >> $GITHUB_OUTPUT
           fi
+  build:
+    needs: skip_check
+    permissions:
+      contents: read  #  to fetch code (actions/checkout)
+    strategy:
+      matrix:
+        java: [17, 21, 23]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@v4
       - name: "☕️ Setup JDK"
         uses: actions/setup-java@v4
         with:
@@ -47,7 +55,7 @@ jobs:
           DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         run: ./gradlew build assemble groovydoc
   publish:
-    if: github.event_name == 'push' && needs.build.outputs.found_skip_publish != 'true'
+    if: github.event_name == 'push' && needs.skip_check.outputs.found_skip_publish != 'true'
     needs: build
     permissions:
       contents: read # limit to read access
@@ -76,7 +84,7 @@ jobs:
           -Dorg.gradle.internal.publish.checksums.insecure=true
           publish
   docs:
-    if: github.event_name == 'push' && needs.build.outputs.found_skip_publish != 'true'
+    if: github.event_name == 'push' && needs.skip_check.outputs.found_skip_publish != 'true'
     needs: publish
     runs-on: ubuntu-latest
     permissions:

.github/workflows/pre-release.yml

@@ -5,6 +5,9 @@ on:
       targetVersion:
         description: 'Expected Release Version'
         required: true
+      preventSnapshots:
+        description: 'Prevent Snapshot Publishing'
+        required: false
 env:
   GIT_USER_NAME: 'grails-build'
   GIT_USER_EMAIL: '[email protected]'
@@ -274,9 +277,11 @@ jobs:
       - name: "📥 Checkout repository"
         uses: actions/checkout@v4
       - name: "🛑 Set Prevent Snapshot Publishing Flag"
+        if: ${{ github.event.inputs.preventSnapshots }}
         run: |
           sed -i "s/^preventSnapshotPublish.*$/preventSnapshotPublish\=true/" gradle.properties
       - name: "📩 Commit flag to prevent snapshot publishing"
+        if: ${{ github.event.inputs.preventSnapshots }}
         run: |
           git config user.name "${{ env.GIT_USER_NAME }}"
           git config user.email "${{ env.GIT_USER_EMAIL }}"

gradle.properties

@@ -21,12 +21,16 @@ org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=1024M
 
-# Generated on Fri Nov 22 09:58:56 CET 2024 by: ./gradlew :grails-bom:syncProps
+# Set when we are temporarily releasing, should be false unless we want to prevent
+# snapshot or documentation publishes.
+preventSnapshotPublish=false
+
+# Generated on Fri Dec 20 09:00:25 EST 2024 by: ./gradlew :grails-bom:syncProps
 # Only version value modifications allowed after this point. Do not insert or change version names. 
 ant.version=1.10.15
 asciidoctorj.version=3.0.0
-asset-pipeline-gradle.version=5.0.4
-asset-pipeline-grails.version=5.0.4
+asset-pipeline-gradle.version=5.0.5
+asset-pipeline-grails.version=5.0.5
 byte-buddy.version=1.15.5
 commons-codec.version=1.17.1
 commons-text.version=1.12.0
@@ -54,14 +58,15 @@ mongodb.version=5.1.4
 objenesis.version=3.4
 plugins-cache.version=8.0.0-SNAPSHOT
 plugins-database-migration.version=6.0.0-SNAPSHOT
-plugins-fields.version=6.0.0-SNAPSHOT
+plugins-fields.version=6.0.0-M1
 plugins-geb.version=5.0.0-SNAPSHOT
 plugins-hibernate5.version=9.0.0-SNAPSHOT
 plugins-mongodb.version=9.0.0-SNAPSHOT
 plugins-neo4j.version=8.1.0
 plugins-rxjava.version=1.1.1
 plugins-rxjava2.version=2.0.0
 plugins-scaffolding.version=6.0.0-SNAPSHOT
+plugins-views-gradle.version=4.0.0-SNAPSHOT
 plugins-views-json.version=4.0.0-SNAPSHOT
 plugins-views-json-templates.version=4.0.0-SNAPSHOT
 plugins-views-markup.version=4.0.0-SNAPSHOT
@@ -77,10 +82,6 @@ profiles-web.version=7.0.1-SNAPSHOT
 profiles-web-plugin.version=7.0.1-SNAPSHOT
 spock.version=2.3-groovy-4.0
 spotbugs-annotations.version=4.8.6
-spring-boot.version=3.4.0
+spring-boot.version=3.4.1
 springloaded.version=1.2.8.RELEASE
-views-json-testing-support.version=4.0.0-SNAPSHOT
-
-# Set when we are temporarily releasing, should be false unless we want to prevent
-# snapshot or documentation publishes.
-preventSnapshotPublish=true
+views-json-testing-support.version=4.0.0-SNAPSHOT

grails-bom/plugins.properties

@@ -1,6 +1,6 @@
 cache=8.0.0-SNAPSHOT
 database-migration=6.0.0-SNAPSHOT
-fields=6.0.0-SNAPSHOT
+fields=6.0.0-M1
 geb=5.0.0-SNAPSHOT
 hibernate5=9.0.0-SNAPSHOT
 mongodb=9.0.0-SNAPSHOT