Merge branch '7.0.x' into match-profile-forge

Author: jamesfredley

.github/workflows/gradle.yml

@@ -125,13 +125,6 @@ jobs:
           ./gradlew build
           --continue --stacktrace
           --rerun-tasks
-      - name: "✅ Verify Forge CLI"
-        run: |
-          cd grails-forge
-          cp grails-forge-cli/build/distributions/apache-grails-forge-cli-*.zip forge-cli.zip
-          unzip forge-cli -d tmp
-          mv tmp/apache-grails-forge-cli-* tmp/forge-cli
-          ./tmp/forge-cli/bin/grails-forge-cli --version
       - name: "✅ Verify combined CLI"
         run: |
           cd grails-forge

DOAP.rdf

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl"?>
+<rdf:RDF xml:lang="en"
+         xmlns="http://usefulinc.com/ns/doap#"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:asfext="http://projects.apache.org/ns/asfext#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/">
+<!--
+    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.
+-->
+  <Project rdf:about="https://grails.apache.org">
+    <created>2025-01-25</created>
+    <license rdf:resource="https://spdx.org/licenses/Apache-2.0" />
+    <name>Apache Grails</name>
+    <homepage rdf:resource="https://grails.apache.org" />
+    <asfext:pmc rdf:resource="https://groovy.apache.org" />
+    <shortdesc>Grails - the Groovy Web Application Framework</shortdesc>
+    <description>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.</description>
+    <bug-database rdf:resource="https://github.com/apache/grails-core/issues" />
+    <mailing-list rdf:resource="https://grails.apache.org/community.html" />
+    <download-page rdf:resource="https://grails.apache.org/download.html" />
+    <programming-language>Groovy</programming-language>
+    <category rdf:resource="https://projects.apache.org/category/web-framework" />
+    <repository>
+      <GitRepository>
+        <location rdf:resource="https://gitbox.apache.org/repos/asf/grails-core.git"/>
+        <browse rdf:resource="http://github.com/apache/grails-core"/>
+      </GitRepository>
+    </repository>
+  </Project>
+</rdf:RDF>

NOTICE

@@ -8,6 +8,9 @@ The Apache Software Foundation (http://www.apache.org/).
 Additional Licenses
 ------------------
 
+This product uses the Jakarta Annotations™ API which is a trademark of the Eclipse Foundation. It is licensed under
+the Eclipse Public License v. 2.0 which is available at https://www.eclipse.org/legal/epl-2.0.
+
 Project Reactor
 This product includes software from Project Reactor, licensed under Apache License, Version 2.0.
 2011-2014 Pivotal Software, Inc.

gradle/dependency-licenses.gradle

@@ -20,7 +20,7 @@
 apply plugin: 'com.github.hierynomus.license-report'
 
 List<String> licenseExclusions = rootProject.subprojects.collect {
-    "org.grails:${it.name}:${rootProject.projectVersion}" as String
+    "org.apache.grails:${it.findProperty('pomArtifactId') ?: it.name}:${rootProject.projectVersion}" as String
 }
 
 downloadLicenses {

grails-core/NOTICE

@@ -0,0 +1,12 @@
+Apache Grails
+Copyright 2005-2025 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+Additional Licenses
+------------------
+
+This product uses the Jakarta Annotations™ API which is a trademark of the Eclipse Foundation. It is licensed under
+the Eclipse Public License v. 2.0 which is available at https://www.eclipse.org/legal/epl-2.0.

grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy

@@ -28,6 +28,7 @@ import grails.util.GrailsNameUtils
 import groovy.transform.CompilationUnitAware
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
+import org.springframework.core.CollectionFactory
 import groovy.xml.MarkupBuilder
 import groovy.xml.StreamingMarkupBuilder
 import groovy.xml.XmlSlurper
@@ -191,7 +192,8 @@ class GlobalGrailsClassInjectorTransformation implements ASTTransformation, Comp
             if (Modifier.isAbstract(classNode.getModifiers())) return false
 
             def classNodeName = classNode.name
-            def props = new Properties()
+            // Use SortedProperties to ensure a consistent order of entries for reproducible builds
+            def props = CollectionFactory.createSortedProperties(false)
             def superTypeName = superType.getName()
 
             // generate META-INF/grails.factories

grails-forge/build.gradle

@@ -28,6 +28,7 @@ file('../gradle.properties').withInputStream {
 }
 
 ext {
+    isReproducibleBuild = System.getenv("SOURCE_DATE_EPOCH") != null
     buildInstant = java.util.Optional.ofNullable(System.getenv('SOURCE_DATE_EPOCH'))
             .map(Long::parseLong)
             .map(Instant::ofEpochSecond)
@@ -41,7 +42,7 @@ ext {
 
 allprojects {
     props.forEach { k, v ->
-        if(!project.hasProperty(k as String)) {
+        if (!project.hasProperty(k as String)) {
             project.ext.set(k as String, v)
         }
     }
@@ -72,6 +73,18 @@ allprojects {
     }
 }
 
+subprojects {
+    configurations.configureEach {
+        resolutionStrategy {
+            def cacheHours = isCiBuild || isReproducibleBuild ? 0 : 24
+            cacheDynamicVersionsFor(cacheHours, 'hours')
+            cacheChangingModulesFor(cacheHours, 'hours')
+        }
+    }
+
+    apply from: rootProject.layout.projectDirectory.file('gradle/dependency-licenses.gradle')
+}
+
 apply {
     // we must apply the publish configuration first or the docs config will not work
     from layout.projectDirectory.file('gradle/publish-root-config.gradle')

grails-forge/buildSrc/build.gradle

@@ -64,6 +64,10 @@ configurations.configureEach {
 }
 
 dependencies {
+    implementation "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:${rootProperties.gradleLicensePluginVersion}", {
+        // Due to https://github.com/hierynomus/license-gradle-plugin/issues/161, spring must be excluded
+        exclude group: 'org.springframework', module: 'spring-core'
+    }
     implementation "io.micronaut.build.internal:micronaut-gradle-plugins:$micronautGradlePlugins"
     implementation "com.fizzed:rocker-compiler:$rockerVersion"
     implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
@@ -80,6 +84,7 @@ dependencies {
     }
     implementation "org.antlr:antlr4-runtime:$antlr4Version"
     implementation "org.gradle.crypto.checksum:org.gradle.crypto.checksum.gradle.plugin:$gradleChecksumPluginVersion"
+    implementation "org.apache.ant:ant:$antVersion"
 }
 
 gradlePlugin {