Merge branch '7.0.x' into 7.0.x-buildSettingsFix

Author: codeconsole

.github/vote_templates/announce.txt

@@ -2,7 +2,7 @@ The Apache Grails community is pleased to announce the release of Apache Grails
 
 Grails is a powerful Groovy-based web application framework for the JVM built on top of Spring Boot that has many plugins to further extend its functionality.
 
-This release another milestone on our journey to a final 7.0 release. Users are encouraged to try the milestone to provide early feedback. Detailed upgrade instructions are available here: https://docs.grails.org/${VERSION}/guide/upgrading.html
+This release another milestone on our journey to a final 7.0 release. Users are encouraged to try the milestone to provide early feedback. Detailed upgrade instructions are available here: https://grails.apache.org/docs/${VERSION}/guide/upgrading.html
 
 The release notes are available here:
 <blog post link>

.github/workflows/codeql.yml

@@ -64,7 +64,7 @@ jobs:
         java-version: 17
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -75,7 +75,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -89,4 +89,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/release.yml

@@ -129,6 +129,7 @@ jobs:
       - name: "📤 Upload grails wrapper ZIP"
         uses: softprops/action-gh-release@v2
         with:
+          tag_name: ${{ github.event.release.tag_name }}
           files: |
             grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-bin.zip
             grails-wrapper/build/distributions/apache-grails-wrapper-${{ steps.release_version.outputs.value }}-bin.zip.sha512
@@ -150,6 +151,7 @@ jobs:
       - name: "📤 Upload CLI ZIP"
         uses: softprops/action-gh-release@v2
         with:
+          tag_name: ${{ github.event.release.tag_name }}
           files: |
             grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-bin.zip
             grails-forge/grails-cli/build/distributions/apache-grails-${{ steps.release_version.outputs.value }}-bin.zip.sha512
@@ -241,6 +243,7 @@ jobs:
       - name: "Upload combined checksums"
         uses: softprops/action-gh-release@v2
         with:
+          tag_name: ${{ github.event.release.tag_name }}
           files: build/CHECKSUMS.txt
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -253,6 +256,7 @@ jobs:
       - name: "Upload combined published artifacts"
         uses: softprops/action-gh-release@v2
         with:
+          tag_name: ${{ github.event.release.tag_name }}
           files: build/PUBLISHED_ARTIFACTS.txt
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -261,6 +265,7 @@ jobs:
       - name: "Upload Build Date file"
         uses: softprops/action-gh-release@v2
         with:
+          tag_name: ${{ github.event.release.tag_name }}
           files: build/BUILD_DATE.txt
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -334,7 +339,7 @@ jobs:
       - name: "🚀 Upload ZIP and Signature to GitHub Release"
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: v${{ needs.publish.outputs.release_version }}
+          tag_name: ${{ github.event.release.tag_name }}
           files: |
             apache-grails-*-src.zip
             apache-grails-*-src.zip.sha512
@@ -456,6 +461,7 @@ jobs:
       - name: "Upload Distribution SVN revision"
         uses: softprops/action-gh-release@v2
         with:
+          tag_name: ${{ github.event.release.tag_name }}
           files: dev-repo/DIST_SVN_REVISION.txt
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -472,8 +478,9 @@ jobs:
         run: |
           export DIST_SVN_REVISION=$(awk '/Last Changed Rev:/ {print $4}' dev-repo/DIST_SVN_REVISION.txt)
           echo "::group::Grails PMC Vote Email"
+          echo "Subject:"
           echo "*************************************************"
-          echo "Subject: [VOTE] Release Apache Grails ${VERSION}"
+          echo "[VOTE] Release Apache Grails ${VERSION}"
           echo "*************************************************"
           echo "Body:"
           echo "*************************************************"
@@ -529,6 +536,16 @@ jobs:
     needs: [ publish, source, upload ] # TODO Once we have confirmed release won't fail, add it as a dependency here
     runs-on: ubuntu-24.04
     steps:
+      - name: Maximize build space
+        uses: easimon/maximize-build-space@c28619d8999a147d5e09c1199f84ff6af6ad5794
+        with:
+          root-reserve-mb: 3072  # Leave ~3 GB on root FS
+          swap-size-mb: 2048     # Allocate 2 GB swap (default: 4 GB; reduce if not needed)
+          remove-dotnet: 'true'  # Remove .NET SDK (~3-4 GB savings)
+          remove-android: 'true' # Remove Android tools (~2 GB savings)
+          remove-haskell: 'true' # Remove Haskell (~1 GB savings)
+          remove-codeql: 'true'  # Remove CodeQL (~500 MB savings)
+          remove-docker-images: 'false'  # Prune Docker if used (~1-2 GB savings)
       - name: "📥 Checkout repository"
         uses: actions/checkout@v4
         with:
@@ -554,10 +571,12 @@ jobs:
         uses: apache/grails-github-actions/deploy-github-pages@asf
         env:
           GH_TOKEN: ${{ secrets.GRAILS_GHTOKEN }}
-          TARGET_REPOSITORY: 'apache/grails-doc'
           GRADLE_PUBLISH_RELEASE: 'true'
           SOURCE_FOLDER: grails-doc/build/docs
           VERSION: ${{ needs.publish.outputs.release_version }}
+          TARGET_REPOSITORY: 'apache/grails-website'
+          TARGET_FOLDER: 'docs'
+          DOCUMENTATION_BRANCH: 'asf-site-production'
   sdkman:
     environment: sdkman
     name: "VOTE SUCCEEDED - Release to SDKMAN!"
@@ -634,14 +653,13 @@ jobs:
           VERSION_COMMIT_ID: ${{ needs.publish.outputs.commit_hash }}
           PREVIOUS_VERSION: 'TODO_PREVIOUS_VERSION'
         run: |
-          export DIST_SVN_REVISION=$(awk '/Last Changed Rev:/ {print $4}' dev-repo/DIST_SVN_REVISION.txt)
-          
           echo "::group::Announcement Email"
+          echo "Subject:"
           echo "*************************************************"
-          echo "Subject: [ANNOUNCE] Apache Grails ${VERSION}"
+          echo "[ANNOUNCE] Apache Grails ${VERSION}"
           echo "*************************************************"
           echo "Body:"
           echo "*************************************************"
-          cat grails-core/.github/vote_templates/announce.txt | envsubst
+          cat .github/vote_templates/announce.txt | envsubst
           echo "*************************************************"
           echo "::endgroup::"

CONTRIBUTING.md

@@ -19,7 +19,7 @@ limitations under the License.
 
 First off, thanks for taking the time to contribute! ❤️
 
-Grails is an open source project with an active community and we rely heavily on that community to help make Grails better. As such, there are various ways in which people can contribute to Grails. One of these is by [writing useful plugins](https://docs.grails.org/latest/guide/plugins.html) and making them publicly available.
+Grails is an open source project with an active community and we rely heavily on that community to help make Grails better. As such, there are various ways in which people can contribute to Grails. One of these is by [writing useful plugins](https://grails.apache.org/docs/latest/guide/plugins.html) and making them publicly available.
 
 All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
 
@@ -49,7 +49,7 @@ All types of contributions are encouraged and valued. See the [Table of Contents
 
 ## I Have a Question
 
-> If you want to ask a question, we assume that you have read the available [Documentation](https://docs.grails.org/latest/).
+> If you want to ask a question, we assume that you have read the available [Documentation](https://grails.apache.org/docs/latest/).
 
 Before you ask a question, it is best to search for existing [Issues](https://github.com/apache/grails-core/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
 
@@ -63,7 +63,7 @@ If you then still feel the need to ask a question and need clarification, we rec
 
 ## I Want to Write a Grails Plugin
 
-[Grails Plugins](https://docs.grails.org/latest/guide/plugins.html) are similar to a Grails Application project, but they include a plugin descriptor and package shared functionality for other Grails Applications to use.  More information can be found [here](https://docs.grails.org/latest/guide/plugins.html#creatingAndInstallingPlugins).
+[Grails Plugins](https://grails.apache.org/docs/latest/guide/plugins.html) are similar to a Grails Application project, but they include a plugin descriptor and package shared functionality for other Grails Applications to use.  More information can be found [here](https://grails.apache.org/docs/latest/guide/plugins.html#creatingAndInstallingPlugins).
 
 ## I Want to Contribute
 
@@ -79,7 +79,7 @@ If you then still feel the need to ask a question and need clarification, we rec
 A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
 
 - Make sure that you are using the latest version.
-- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](https://docs.grails.org/latest/). If you are looking for support, you might want to check [this section](#i-have-a-question)).
+- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](https://grails.apache.org/docs/latest/). If you are looking for support, you might want to check [this section](#i-have-a-question)).
 - To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/apache/grails-coreissues?q=label%3Abug).
 - Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
 - Collect information about the bug:
@@ -116,7 +116,7 @@ This section guides you through submitting an enhancement suggestion for Grails,
 #### Before Submitting an Enhancement
 
 - Make sure that you are using the latest version.
-- Read the [documentation](https://docs.grails.org/latest/) carefully and find out if the functionality is already covered, maybe by an individual configuration.
+- Read the [documentation](https://grails.apache.org/docs/latest/) carefully and find out if the functionality is already covered, maybe by an individual configuration.
 - Perform a [search](https://github.com/apache/grails-core/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
 - Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
 
@@ -193,9 +193,9 @@ By default, Grails forks a JVM to run the application. The `-debug-jvm` argument
 
 ### Improving The Documentation
 
-There are many aspects to [Grail's documentation](https://docs.grails.org/)
-- [API](https://docs.grails.org/latest/api/) documentation in the code itself via javadoc & groovydoc.
-- [The Grails User Guide](https://docs.grails.org/latest/guide/single.html) from the `grails-doc` project in this
+There are many aspects to [Grail's documentation](https://grails.apache.org/docs/)
+- [API](https://grails.apache.org/docs/latest/api/) documentation in the code itself via javadoc & groovydoc.
+- [The Grails User Guide](https://grails.apache.org/docs/latest/guide/single.html) from the `grails-doc` project in this
   repository.
 - Various how-to [Guides](https://guides.grails.org/index.html) from
   the [grails-guides](https://github.com/grails-guides) Organization.

INSTALL

@@ -1,7 +1,7 @@
 Grails Installation Guide
 =======================
 
-Grails is a powerful Groovy-based web application framework for the JVM built on top of Spring Boot that has many plugins to further extend its functionality. The full documentation for how to install Grails via different mechanisms and use it can be found at `https://docs.grails.org/latest`.  This document specifically covers the basic building and installation of Grails from a source distribution.
+Grails is a powerful Groovy-based web application framework for the JVM built on top of Spring Boot that has many plugins to further extend its functionality. The full documentation for how to install Grails via different mechanisms and use it can be found at `https://grails.apache.org/docs/latest`.  This document specifically covers the basic building and installation of Grails from a source distribution.
 
 How to use the source distribution
 ------------------------------

README.md

@@ -16,7 +16,7 @@ limitations under the License.
 
 # Apache Grails
 
-[![Documentation](https://img.shields.io/badge/Documentation-595959)](https://docs.grails.org)
+[![Documentation](https://img.shields.io/badge/Documentation-595959)](https://grails.apache.org/docs/)
 [![Develocity](https://img.shields.io/badge/Develocity-06A0CE?logo=Gradle&labelColor=06A0CE)](https://ge.grails.org/scans)
 [![CI](https://github.com/apache/grails-core/actions/workflows/gradle.yml/badge.svg?event=push)](https://github.com/apache/grails-core/actions/workflows/gradle.yml)
 [![Groovy Joint Validation Build](https://github.com/apache/grails-core/actions/workflows/groovy-joint-workflow.yml/badge.svg?event=push)](https://github.com/apache/grails-core/actions/workflows/groovy-joint-workflow.yml)
@@ -38,7 +38,7 @@ Please see the [INSTALL](INSTALL) document for instructions on how to build, use
 
 ## Getting help
 
-- Check the [Documentation](https://docs.grails.org/) for your preferred Apache Grails version.
+- Check the [Documentation](https://grails.apache.org/docs/) for your preferred Apache Grails version.
 - Check for a [Grails Guide](https://github.com/grails-guides/).
 - Ask questions on the [Grails User Mailing List](https://lists.apache.org/[email protected])
 - Submit an issue: [Grails Issues](https://github.com/apache/grails-core/issues)
@@ -73,13 +73,13 @@ To create an Apache Grails Application with the wrapper follow these steps:
 3. Run the wrapper command `grailsw -t forge create-app` to create a new Apache Grails Application.
 
 Please note, that the wrapper supports either the legacy `Apache Grails Shell` or the newer `Apache Grails Forge` CLI.
-For more detailed information about it, see the [documentation](https://docs.grails.org/snapshot/index.html).
+For more detailed information about it, see the [documentation](https://grails.apache.org/docs/snapshot/index.html).
 
 #### Wrapper - Running Commands inside a Apache Grails Project
 
 For running commands, the Grails Wrapper will always pull the Apache Grails version from `gradle.properties` and ignore
 any environment variables. Type `grailsw -t shell help` to see the available commands. For more detailed information
-about it, see the [documentation](https://docs.grails.org/snapshot/index.html).
+about it, see the [documentation](https://grails.apache.org/docs/snapshot/index.html).
 
 ### grails-shell-cli
 
@@ -110,7 +110,7 @@ Once your Apache Grails Application is created, you can start it with the comman
 
     ./gradlew bootRun
 
-For further information, please consult the [documentation](https://docs.grails.org).
+For further information, please consult the [documentation](https://grails.apache.org/docs/).
 
 ## Licensing