Merge branch '7.0.x' into 7.1.x

jamesfredley · jamesfredley · commit f815025dcf78 · 2026-04-25T19:11:45.000-04:00
# Conflicts:
#	.github/workflows/gradle.yml
diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml
@@ -46,7 +46,7 @@ jobs:
         run: ./gradlew codeStyle
       - name: "📤 Upload Failure Reports"
         if: always()
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: core-reports
           path: build/reports/codestyle/
@@ -84,7 +84,7 @@ jobs:
         run: ./gradlew codeStyle
       - name: "📤 Upload Failure Reports"
         if: always()
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: gradle-plugin-reports
           path: grails-gradle/build/reports/codestyle/
@@ -122,7 +122,7 @@ jobs:
         run: ./gradlew codeStyle
       - name: "📤 Upload Failure Reports"
         if: always()
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: forge-reports
           path: grails-forge/build/reports/codestyle/
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -198,7 +198,7 @@ jobs:
           ./tmp1/cli/bin/grails-forge-cli --version
       - name: "📤 Upload CLI Zip to Workflow Summary Page"
         if: ${{ matrix.java == '17' && matrix.indy == false }}
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: 'apache-grails-SNAPSHOT-bin.zip'
           include-hidden-files: true
@@ -353,12 +353,12 @@ jobs:
           --no-build-cache
           --rerun-tasks
       - name: "📤 Upload grails-gradle checksums"
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: grails-gradle-checksums
           path: grails-gradle/build/grails-gradle-checksums.txt
       - name: "📤 Upload grails-gradle published artifacts"
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: grails-gradle-artifacts.txt
           path: grails-gradle/build/grails-gradle-artifacts.txt
@@ -404,34 +404,24 @@ jobs:
           retry_wait_seconds: 180
           command: ./gradlew publish aggregateChecksums aggregatePublishedArtifacts --no-build-cache --rerun-tasks
       - name: "📤 Upload grails-core checksums"
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: grails-core-checksums.txt
           path: build/grails-core-checksums.txt
       - name: "📤 Upload grails-core published artifacts"
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: grails-core-artifacts.txt
           path: build/grails-core-artifacts.txt
       - name: "🔨 Create Grails Wrapper Distribution Zip"
-        run: >
-          ./gradlew :grails-wrapper:distZip
-      - name: "✅ Verify grails-wrapper"
-        if: success()
-        env:
-          GRAILS_WRAPPER_ALLOWED_TYPES: 'SNAPSHOT'
         run: |
-          # Pin the wrapper to this branch's snapshot so it doesn't resolve the
-          # globally latest SNAPSHOT in the Apache repo, which may be compiled
-          # for a newer Java runtime than this job's JDK.
-          export PREFERRED_GRAILS_VERSION=$(grep '^projectVersion=' gradle.properties | cut -d'=' -f2)
+          ./gradlew :grails-wrapper:distZip
           cp grails-wrapper/build/distributions/apache-grails-wrapper-*.zip build/wrapper.zip
           cd build
           unzip wrapper -d tmp
           mv tmp/apache-grails-wrapper-* tmp/wrapper
-          ./tmp/wrapper/grailsw --version
       - name: "📤 Upload Wrapper Zip to Workflow Summary Page"
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: apache-grails-wrapper-SNAPSHOT-bin
           path: build/tmp/wrapper
@@ -467,15 +457,49 @@ jobs:
           --no-build-cache
           --rerun-tasks
       - name: "📤 Upload grails-forge checksums"
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: grails-forge-checksums
           path: grails-forge/build/grails-forge-checksums.txt
       - name: "📤 Upload grails-gradle published artifacts"
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: grails-forge-artifacts.txt
           path: grails-forge/build/grails-forge-artifacts.txt
+  verifyWrapper:
+    name: "Verify grails-wrapper"
+    # Verifies the wrapper works end-to-end. Must run after publishForge so that
+    # grails-cli (which the wrapper resolves at runtime) is available in Nexus.
+    if: github.repository_owner == 'apache' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+    needs: [ publish, publishForge ]
+    runs-on: ubuntu-24.04
+    steps:
+      - name: "Output Agent IP" # in the event RAO blocks this agent, this can be used to debug it
+        run: curl -s https://api.ipify.org
+      - name: "📥 Checkout repository"
+        uses: actions/checkout@v6
+      - name: "☕️ Setup JDK"
+        uses: actions/setup-java@v4
+        with:
+          distribution: liberica
+          java-version: 17
+      - name: "📥 Download Wrapper"
+        uses: actions/download-artifact@v7.0.0
+        with:
+          name: apache-grails-wrapper-SNAPSHOT-bin
+          path: wrapper
+      - name: "✅ Verify grails-wrapper"
+        env:
+          GRAILS_WRAPPER_ALLOWED_TYPES: 'SNAPSHOT'
+        run: |
+          # Pin the wrapper to this branch's snapshot so it doesn't resolve the
+          # globally latest SNAPSHOT in the Apache repo, which may be compiled
+          # for a newer Java runtime than this job's JDK.
+          export PREFERRED_GRAILS_VERSION=$(grep '^projectVersion=' gradle.properties | cut -d'=' -f2)
+          # actions/download-artifact does not preserve the executable bit, so
+          # restore it before invoking the wrapper script (see actions/upload-artifact#38).
+          chmod +x ./wrapper/grailsw
+          ./wrapper/grailsw --version
   docs:
     if: github.repository_owner == 'apache' && github.event_name == 'push'
     needs: [ publish ]
@@ -523,7 +547,7 @@ jobs:
           ./gradlew grails-doc:build
           -PgithubBranch=${{ env.TARGET_BRANCH }}
       - name: "📤 Upload Generated Docs to Workflow Result Page"
-        uses: actions/upload-artifact@v7.0.0
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: grails-docs-${{ env.NOW }}.zip
           path: ./build/distributions/*.zip
diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml
@@ -51,7 +51,7 @@ jobs:
         run: ./gradlew rat
       - name: Upload RAT HTML report
         if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: rat-report
           path: build/reports/rat/index.html
diff --git a/build-logic/settings.gradle b/build-logic/settings.gradle
@@ -18,40 +18,9 @@
  */
 
 pluginManagement {
+    apply from: file('../gradle/plugin-repositories.gradle')
     repositories {
-        if (System.getenv('GRAILS_INCLUDE_MAVEN_LOCAL')) {
-            mavenLocal()
-        }
-        mavenCentral()
-        gradlePluginPortal()
-        maven {
-            url = 'https://repository.apache.org/content/groups/snapshots'
-            content {
-                includeVersionByRegex('org[.]apache[.]grails[.]gradle.*', '.*', '.*-SNAPSHOT')
-            }
-            mavenContent {
-                snapshotsOnly()
-            }
-        }
-        maven {
-            url = 'https://central.sonatype.com/repository/maven-snapshots'
-            content {
-                includeVersionByRegex('cloud[.]wondrify.*', '.*', '.*-SNAPSHOT')
-            }
-            mavenContent {
-                snapshotsOnly()
-            }
-        }
-        maven {
-            url = 'https://repository.apache.org/content/groups/staging'
-            content {
-                includeModuleByRegex('org[.]apache[.]grails[.]gradle', 'grails-publish')
-                includeModuleByRegex('org[.]apache[.]groovy', 'groovy.*')
-            }
-            mavenContent {
-                releasesOnly()
-            }
-        }
+        configurePluginRepositories(delegate)
     }
 }
 
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
@@ -20,6 +20,10 @@ pluginManagement {
     includeBuild('../build-logic') {
         name = 'build-logic-root'
     }
+    apply from: file('../gradle/plugin-repositories.gradle')
+    repositories {
+        configurePluginRepositories(delegate)
+    }
 }
 
 plugins {
diff --git a/gradle/plugin-repositories.gradle b/gradle/plugin-repositories.gradle
@@ -0,0 +1,54 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+ext.configurePluginRepositories = { RepositoryHandler repositories ->
+    if (System.getenv('GRAILS_INCLUDE_MAVEN_LOCAL')) {
+        repositories.mavenLocal()
+    }
+    repositories.mavenCentral()
+    repositories.gradlePluginPortal()
+    repositories.maven {
+        url = uri('https://repository.apache.org/content/groups/snapshots')
+        content {
+            includeGroup('org.apache.grails.gradle')
+        }
+        mavenContent {
+            snapshotsOnly()
+        }
+    }
+    repositories.maven {
+        url = uri('https://central.sonatype.com/repository/maven-snapshots')
+        content {
+            includeGroupByRegex('cloud[.]wondrify[.].*')
+        }
+        mavenContent {
+            snapshotsOnly()
+        }
+    }
+    repositories.maven {
+        url = uri('https://repository.apache.org/content/groups/staging')
+        content {
+            includeModule('org.apache.grails.gradle', 'grails-publish')
+            includeModuleByRegex('org[.]apache[.]groovy', 'groovy.*')
+        }
+        mavenContent {
+            releasesOnly()
+        }
+    }
+}
diff --git a/grails-doc/src/en/ref/Tags - GSP/formActionSubmit.adoc b/grails-doc/src/en/ref/Tags - GSP/formActionSubmit.adoc
@@ -61,18 +61,18 @@ Creates a submit button that sets the `formaction` attribute, which allows one t
 
 Attributes
 
-* `value` (required) - The caption of the button and name of action when not explicitly defined.
-* `id` (optional) - The element id of the input element
-* `action` (optional) - The name of the action to use in the link; if not specified the default action will be linked
-* `controller` (optional) - The name of the controller to use in the link; if not specified the current controller will be linked
-* `namespace` (optional) - The namespace of the controller to use in the link
-* `plugin` (optional) - The name of the plugin which provides the controller
-* `id` (optional) - The id to use in the link
-* `fragment` (optional) - The link fragment (often called anchor tag) to use
-* `mapping` (optional) - The link:{guidePath}/theWebLayer.html#namedMappings to use to rewrite the link
-* `method` (optional) - The HTTP method specified in the corresponding URL mapping
-* `params` (optional) - A map containing URL query parameters for the link
-* `url` (optional) - A Map containing the action, controller, id etc.
+* `value` (required) - The label shown on the submit button.
+* `id` (optional) - The DOM id of the rendered input element.
+* `disabled` (optional) - Disables the rendered button when the value evaluates to true.
+* `action` (optional) - The name of the action to use in the link; if not specified the default action will be linked.
+* `controller` (optional) - The name of the controller to use in the link; if not specified the current controller will be linked.
+* `namespace` (optional) - The namespace of the controller to use in the link.
+* `plugin` (optional) - The name of the plugin which provides the controller.
+* `fragment` (optional) - The link fragment (often called anchor tag) to use.
+* `mapping` (optional) - The link:{guidePath}/theWebLayer.html#namedMappings to use to rewrite the link.
+* `method` (optional) - The HTTP method specified in the corresponding URL mapping.
+* `params` (optional) - A map containing URL query parameters for the link.
+* `url` (optional) - A Map containing the action, controller, id, etc. for the generated link. If the target URL needs an `id`, provide it here because the top-level `id` attribute is used for the input element.
 * `uri` (optional) - A string for a relative path in the running app.
 * `relativeUri` (optional) - Used to specify a uri relative to the current path.
 * `absolute` (optional) - If `true` will prefix the link target address with the value of the `grails.serverURL` property from the application configuration, or http://localhost:8080 if there is no setting in the config and not running in production.
diff --git a/grails-forge/buildSrc/settings.gradle b/grails-forge/buildSrc/settings.gradle
@@ -20,6 +20,10 @@ pluginManagement {
     includeBuild('../../build-logic') {
         name = 'build-logic-root'
     }
+    apply from: file('../../gradle/plugin-repositories.gradle')
+    repositories {
+        configurePluginRepositories(delegate)
+    }
 }
 
 plugins {
diff --git a/grails-forge/settings.gradle b/grails-forge/settings.gradle
@@ -25,6 +25,10 @@ pluginManagement {
     includeBuild('../build-logic') {
         name = 'build-logic-root'
     }
+    apply from: file('../gradle/plugin-repositories.gradle')
+    repositories {
+        configurePluginRepositories(delegate)
+    }
 }
 
 plugins {
diff --git a/grails-gradle/buildSrc/settings.gradle b/grails-gradle/buildSrc/settings.gradle
@@ -20,6 +20,10 @@ pluginManagement {
     includeBuild('../../build-logic') {
         name = 'build-logic-root'
     }
+    apply from: file('../../gradle/plugin-repositories.gradle')
+    repositories {
+        configurePluginRepositories(delegate)
+    }
 }
 
 plugins {
diff --git a/grails-gradle/settings.gradle b/grails-gradle/settings.gradle
@@ -22,6 +22,10 @@ pluginManagement {
     includeBuild('../build-logic') {
         name = 'build-logic-root'
     }
+    apply from: file('../gradle/plugin-repositories.gradle')
+    repositories {
+        configurePluginRepositories(delegate)
+    }
 }
 
 plugins {
diff --git a/grails-gsp/plugin/src/main/groovy/org/grails/plugins/web/taglib/FormTagLib.groovy b/grails-gsp/plugin/src/main/groovy/org/grails/plugins/web/taglib/FormTagLib.groovy
@@ -557,23 +557,27 @@ class FormTagLib implements ApplicationContextAware, InitializingBean, TagLibrar
 
     /**
      * Creates a submit button using the `formaction` attribute to submit to a different action than the form.
-     * The action will be generated by the various link attributes.<br/>
+     * The target URL is generated from the supported link attributes.<br/>
+     * The rendered `&lt;input&gt;` uses this tag's `id` attribute for its DOM id. If the generated URL needs an
+     * `id`, provide it through the `url` map.<br/>
      *
      * &lt;g:formActionSubmit action="myaction" value="Submit"/&gt;<br/>
      * &lt;g:formActionSubmit controller="myctrl" action="myaction" value="ButtonName"/&gt;<br/>
      *
-     * @attr id the id attribute of the formActionSubmit tag
-     * @attr value the button's show value
-     * @attr action The name of the action to use in the link, if not specified the default action will be linked
-     * @attr controller The name of the controller to use in the link, if not specified the current controller will be linked
-     * @attr namespace The namespace of the controller to use in the link
+     * @emptyTag
+     *
+     * @attr value REQUIRED The label shown on the submit button
+     * @attr id DOM id for the rendered input element
+     * @attr disabled Makes the button disabled. Will be interpreted as a Groovy Truth
+     * @attr action The name of the action to use in the generated link, if not specified the default action will be linked
+     * @attr controller The name of the controller to use in the generated link, if not specified the current controller will be linked
+     * @attr namespace The namespace of the controller to use in the generated link
      * @attr plugin The name of the plugin which provides the controller
-     * @attr id The id to use in the link
      * @attr fragment The link fragment (often called anchor tag) to use
      * @attr mapping The named URL mapping to use to rewrite the link
      * @attr method The HTTP method specified in the corresponding URL mapping
      * @attr params A map containing URL query parameters for the link
-     * @attr url A map containing the action, controller, id etc.
+     * @attr url A map containing the action, controller, id etc. for the generated link
      * @attr uri A string for a relative path in the running app.
      * @attr relativeUri Used to specify a uri relative to the current path.
      * @attr absolute If set to "true" will prefix the link target address with the value of the grails.serverURL property from Config, or http://localhost:&lt;port&gt; if no value in Config and not running in production.
diff --git a/settings.gradle b/settings.gradle
@@ -26,6 +26,10 @@ pluginManagement {
     includeBuild('./build-logic') {
         name = 'build-logic-root'
     }
+    apply from: file('gradle/plugin-repositories.gradle')
+    repositories {
+        configurePluginRepositories(delegate)
+    }
 }
 
 plugins {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ pluginManagement {`
`20`	`20`	`includeBuild('../build-logic') {`
`21`	`21`	`name = 'build-logic-root'`
`22`	`22`	`}`
	`23`	`+ apply from: file('../gradle/plugin-repositories.gradle')`
	`24`	`+ repositories {`
	`25`	`+ configurePluginRepositories(delegate)`
	`26`	`+ }`
`23`	`27`	`}`
`24`	`28`
`25`	`29`	`plugins {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@ pluginManagement {`
`25`	`25`	`includeBuild('../build-logic') {`
`26`	`26`	`name = 'build-logic-root'`
`27`	`27`	`}`
	`28`	`+ apply from: file('../gradle/plugin-repositories.gradle')`
	`29`	`+ repositories {`
	`30`	`+ configurePluginRepositories(delegate)`
	`31`	`+ }`
`28`	`32`	`}`
`29`	`33`
`30`	`34`	`plugins {`