Merge branch '7.0.x' into docs/configuration-hybrid

Author: jamesfredley

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,43 @@
+## Description
+<!-- Describe your change and the problem it solves. Link to the related issue(s) if they exist. -->
+
+## Contributor Checklist
+
+Please review the following checklist before submitting your pull request. Pull requests that do not meet these requirements may be closed without review.
+
+### Issue and Scope
+
+- [ ] This PR is linked to an existing issue that has been **acknowledged or approved** by the project team. If no approved issue exists, please give background on why this change is necessary.  Tickets are preferred for release change log history.
+- [ ] This PR addresses the **complete scope** of the linked issue. Partial implementations or unfinished work should not be submitted for review.
+- [ ] This PR contains a **single, focused change**. Unrelated changes should be submitted as separate pull requests.
+- [ ] This PR targets the **correct branch** for the type of change:
+    - **Patch release branches** (e.g., `7.0.x`): Bug fixes only. No new features or API changes.
+    - **Minor release branches** (e.g., `7.1.x`): New features are welcome, but breaking existing APIs must be avoided.
+    - **Major release branches** (e.g., `8.0.x`): Reserved for major changes. Breaking API changes are permitted.
+
+### Code Quality
+
+- [ ] I have **added or updated tests** that cover the changes introduced in this PR. All code contributions are expected to include appropriate test coverage.
+- [ ] I have verified that all existing tests pass by running `./gradlew build --rerun-tasks`.
+- [ ] My code follows the project's **code style** guidelines. I have run `./gradlew codeStyle` and resolved any violations. See [Code Style](../CONTRIBUTING.md#code-style) for details.
+- [ ] This PR does **not** include mass reformatting, style-only changes, or large-scale refactoring unless it was **explicitly approved** in the linked issue. Unsolicited reformatting will not be accepted.
+- [ ] If generative AI tooling was used in preparing this contribution, a quality model was used to ensure contributions are **consistent with the project's quality standards**.
+
+### Licensing and Attribution
+
+- [ ] All contributed code is provided under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0), and new source files include the appropriate **Apache license header**.
+- [ ] I have the necessary rights to submit this contribution and confirm it is my own original work (see [Legal Notice](../CONTRIBUTING.md#i-want-to-contribute)).
+- [ ] If generative AI tooling was used in preparing this contribution, I have followed the [Apache Software Foundation's policy on generative tooling](https://www.apache.org/legal/generative-tooling.html) and have properly attributed its use.
+
+### Documentation
+
+- [ ] If this PR introduces user-facing changes, I have included or updated the relevant documentation.
+- [ ] If this PR adds a new feature, I have updated the **What's New** section of the Grails Guide.
+- [ ] If this PR introduces breaking changes or changes that require user action during an upgrade, I have updated the **Upgrade Notes** for the corresponding version in the Grails Guide.
+- [ ] The PR description clearly explains **what** was changed and **why**.
+
+---
+
+> **First-time contributors:** Please read our [Contributing Guide](../CONTRIBUTING.md) before submitting.
+> Pull requests that appear to be auto-generated, incomplete, or unrelated to an approved issue may be
+> closed to help maintainers focus on reviewed and planned work. We appreciate your understanding.

.github/release-drafter.yml

@@ -128,6 +128,7 @@ categories:
     labels:
       - 'revert'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+filter-by-commitish: true
 version-resolver:
   major:
     labels:
@@ -146,4 +147,4 @@ template: |
 
   ## Contributors
 
-  $CONTRIBUTORS
+  $CONTRIBUTORS

.github/scripts/releaseDistributions.sh

@@ -58,15 +58,19 @@ svn_exists() {
   svn ls "${svn_flags[@]}" --depth=empty "${url}" >/dev/null 2>&1
 }
 
-old_release_folder="$(svn ls "${svn_flags[@]}" "${RELEASE_ROOT}" | awk -F/ 'NF{print $1; exit}')"
-if [[ -n "${old_release_folder}" ]]; then
-  PRIOR_RELEASE_URL="${RELEASE_ROOT}/${old_release_folder}"
-  echo "🗑️ Deleting old release folder: ${PRIOR_RELEASE_URL}"
-  svn rm "${svn_flags[@]}" -m "Remove previous release ${old_release_folder}" "${PRIOR_RELEASE_URL}"
-  echo "✅ Deleted old release folder"
-else
-  echo "ℹ️ No existing release subfolder found under ${RELEASE_ROOT}"
-fi
+for folder in $(svn ls "${svn_flags[@]}" "${RELEASE_ROOT}"); do
+  folder=$(echo "$folder" | sed 's|/$||')
+  [[ "${folder}" == "${RELEASE_VERSION}" ]] && continue
+  PRIOR_RELEASE_URL="${RELEASE_ROOT}/${folder}"
+  read -r -p "Remove old release folder '${folder}' at ${PRIOR_RELEASE_URL}? [y/N] " confirm < /dev/tty
+  if [[ "${confirm}" =~ ^[Yy](es)?$ ]]; then
+    echo "🗑️ Deleting old release folder: ${PRIOR_RELEASE_URL}"
+    svn rm "${svn_flags[@]}" -m "Remove previous release ${folder}" "${PRIOR_RELEASE_URL}"
+    echo "✅ Deleted old release folder"
+  else
+    echo "⏭️ Skipping removal of old release folder: ${PRIOR_RELEASE_URL}"
+  fi
+done
 
 DEV_VERSION_URL="$DEV_ROOT/${RELEASE_VERSION}"
 RELEASE_VERSION_URL="$RELEASE_ROOT/${RELEASE_VERSION}"

.github/workflows/release-notes.yml

@@ -25,7 +25,7 @@ on:
   workflow_dispatch:
 # queue jobs and only allow 1 run per branch due to the likelihood of hitting GitHub resource limits
 concurrency:
-  group: release-pipeline
+  group: release-pipeline-${{ github.event.pull_request.base.ref || github.ref_name }}
   cancel-in-progress: false
 jobs:
   update_release_draft:
@@ -50,4 +50,4 @@ jobs:
           commitish: ${{ github.event.pull_request.base.ref || github.ref_name }}
           filter-by-range: ${{ steps.version.outputs.range }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -38,7 +38,7 @@ env:
   TARGET_BRANCH: ${{ github.event.release.target_commitish }}
   VERSION: will be computed in each job
 concurrency:
-  group: release-pipeline
+  group: release-pipeline-${{ github.event.release.target_commitish }}
   cancel-in-progress: false
 jobs:
   publish:

DEVELOPMENT.md

@@ -44,5 +44,27 @@ These can be set on the command line like so:
 * `skipMongodbTests` - does not run mongo related tests
 * `skipTests` - no tests will run
 
+## Test slicing
+
+Test classes tagged with `@spock.lang.Tag('some-tag')` can be run separately.\
+Tags are inherited from superclasses, so a test class is also included if any of its ancestors is tagged.
+
+Example:
+
+```bash
+./gradlew iT -PincludeTestTags=geb
+```
+
+Available project properties:
+
+* `includeTestTags` - comma-separated list of test tags to include
+* `excludeTestTags` - comma-separated list of test tags to exclude
+
+Example with multiple tags:
+
+```bash
+./gradlew iT -PincludeTestTags=geb,api
+```
+
 ## Start a mongo docker container (containers will start by default)
 `docker run -d  --name mongo-on-docker  -p 27017:27017 mongo`

dependencies.gradle

@@ -25,7 +25,7 @@ ext {
             'ant.version'                   : '1.10.15',
             'asciidoctor-gradle-jvm.version': '4.0.5',
             'asciidoctorj.version'          : '3.0.0',
-            'asset-pipeline-gradle.version' : '5.0.32',
+            'asset-pipeline-gradle.version' : '5.0.34',
             'byte-buddy.version'            : '1.17.7',
             'commons-text.version'          : '1.13.1',
             'directory-watcher.version'     : '0.19.1',
@@ -37,7 +37,7 @@ ext {
             'jna.version'                   : '5.17.0',
             'jquery.version'                : '3.7.1',
             'objenesis.version'             : '3.4',
-            'spring-boot.version'           : '3.5.13',
+            'spring-boot.version'           : '3.5.14',
     ]
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
@@ -67,13 +67,13 @@ ext {
     ]
 
     bomDependencyVersions = [
-            'asset-pipeline-bom.version'  : '5.0.32',
+            'asset-pipeline-bom.version'  : '5.0.34',
             'bootstrap-icons.version'     : '1.13.1',
             'bootstrap.version'           : '5.3.8',
             'commons-codec.version'       : '1.18.0',
             'commons-lang3.version'       : '3.20.0',
             'geb-spock.version'           : '8.0.1',
-            'groovy.version'              : '4.0.30',
+            'groovy.version'              : '4.0.31',
             'jackson.version'             : '2.19.1',
             'jquery.version'              : '3.7.1',
             'liquibase-hibernate5.version': '4.27.0',

etc/bin/verify-cli-distribution.sh

@@ -91,7 +91,7 @@ echo "Checking Shell CLI ..."
 echo "✅ Generated Shell App"
 
 echo "Checking Forge CLI ..."
-./grails-forge-cli create-app -x -g mongodb ForgeApp
+./grails-forge-cli create-app -x -g mongodb -f gradle-settings-file ForgeApp
 echo "✅ Generated Forge App"
 
 echo "✅✅✅ All cli binary distribution checks passed successfully for Apache Grails ${VERSION}."

gradle.properties

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-projectVersion=7.0.10-SNAPSHOT
+projectVersion=7.0.11-SNAPSHOT
 
 javaVersion=17
 

gradle/functional-test-config.gradle

@@ -95,7 +95,20 @@ tasks.withType(Test).configureEach { Test task ->
         task.outputs.dir rootProject.layout.buildDirectory.dir('mongo-test-serialize')
     }
 
-    task.useJUnitPlatform()
+    task.useJUnitPlatform {
+        if (project.hasProperty('includeTestTags')) {
+            // Will only run tests that are tagged with specific tags
+            // e.g. @spock.lang.Tag('geb')
+            // Run with: ./gradlew iT -PincludeTestTags=geb (comma-separated list)
+            includeTags((project.property('includeTestTags') as String).split(',')*.trim() as String[])
+        }
+        if (project.hasProperty('excludeTestTags')) {
+            // Will not run tests that are tagged with specific tags
+            // e.g. @spock.lang.Tag('geb')
+            // Run with: ./gradlew iT -PincludeTestTags=geb
+            excludeTags((project.property('excludeTestTags') as String).split(',')*.trim() as String[])
+        }
+    }
     task.testLogging {
         events('passed', 'skipped', 'failed', 'standardOut', 'standardError')
         showExceptions = true