You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/10/07 18:56:35 UTC

(grails-core) branch feat/forge-end-of-support updated: Report end of support date from Forge /versions

This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch feat/forge-end-of-support
in repository https://gitbox.apache.org/repos/asf/grails-core.git


The following commit(s) were added to refs/heads/feat/forge-end-of-support by this push:
     new 1f1228bee4 Report end of support date from Forge /versions
1f1228bee4 is described below

commit 1f1228bee4f3097432882b47ac7c5c81473287c7
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Oct 7 14:56:27 2026 -0400

    Report end of support date from Forge /versions
    
    Grails Forge now reports the last supported day of its release line as a
    top-level endOfSupport ISO date on /versions so Forge UI can flag
    deprecated or unsupported Grails versions. The date is checked in per
    release branch as grailsEndOfSupport in the root gradle.properties and
    baked into the forge version info at build time; an invalid date fails
    the build. Snapshot builds never report it, and it is kept out of the
    versions map.
---
 RELEASE.md                                         |  2 +
 gradle.properties                                  |  4 ++
 .../buildsrc/WriteGrailsVersionInfoTask.groovy     | 17 +++++++
 .../main/java/org/grails/forge/api/VersionDTO.java | 11 +++++
 .../forge/api/ApplicationControllerSpec.groovy     | 10 +++++
 grails-forge/grails-forge-core/build.gradle        |  1 +
 .../java/org/grails/forge/util/VersionInfo.java    | 25 ++++++++++-
 .../org/grails/forge/util/VersionInfoSpec.groovy   | 52 ++++++++++++++++++++++
 8 files changed, 121 insertions(+), 1 deletion(-)

diff --git a/RELEASE.md b/RELEASE.md
index 019c7ca634..8898b03068 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -327,6 +327,8 @@ GitHub registers `workflow_dispatch` inputs from the **default branch**. The new
 
 Do not deploy a release slot from its maintenance branch. After the release, that branch has moved on to the next `-SNAPSHOT` version.
 
+Forge reports the last supported day of its release line as `endOfSupport` (an ISO `yyyy-MM-dd` date) from `/versions`, and Forge UI uses it to flag deprecated or unsupported Grails versions. The date comes from `grailsEndOfSupport` in the root `gradle.properties` and is checked in per release branch, so keep each branch's own value when merging up. Snapshot builds never report it. Release builds report it only when the property is set. A value that is not a valid date fails the Forge build.
+
 Tags created before the AWS workflow was added (for example `v7.0.16`, `v7.1.6`, `v7.2.3`, and `v8.0.0-M6` or earlier) do not contain the workflow file, so they cannot be selected. Package these locally, then upload to Elastic Beanstalk. From a checkout of that tag, copy `grails-forge/grails-forge-web-netty/aws/` from the matching maintenance branch, then from `grails-forge` run:
 
 ```bash
diff --git a/gradle.properties b/gradle.properties
index f4a8750a74..c2d5842b62 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,6 +18,10 @@ projectVersion=7.0.18-SNAPSHOT
 javaVersion=17
 
 githubBranch=7.0.x
+
+# Last day this release line is supported (ISO yyyy-MM-dd). Grails Forge reports it from /versions
+# for release builds only; snapshots never report it. Each release branch sets its own value.
+grailsEndOfSupport=2026-10-31
 githubSlug=apache/grails-core
 
 # Note: BOM dependencies are defined in dependencies.gradle files to allow for dependabot updates
diff --git a/grails-forge/buildSrc/src/main/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTask.groovy b/grails-forge/buildSrc/src/main/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTask.groovy
index 7aee8f8240..4ff5d9f249 100644
--- a/grails-forge/buildSrc/src/main/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTask.groovy
+++ b/grails-forge/buildSrc/src/main/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTask.groovy
@@ -33,6 +33,7 @@ import org.gradle.api.provider.Property
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputDirectories
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.OutputFile
@@ -45,6 +46,8 @@ import javax.inject.Inject
 import javax.xml.parsers.ParserConfigurationException
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
+import java.time.LocalDate
+import java.time.format.DateTimeParseException
 
 @CompileStatic
 @CacheableTask
@@ -53,6 +56,10 @@ abstract class WriteGrailsVersionInfoTask extends DefaultTask {
     @Input
     final Property<String> projectVersion
 
+    @Input
+    @Optional
+    final Property<String> endOfSupport
+
     @InputFile
     @PathSensitive(PathSensitivity.RELATIVE)
     final RegularFileProperty bomPublicationFile
@@ -65,6 +72,7 @@ abstract class WriteGrailsVersionInfoTask extends DefaultTask {
         projectVersion = objects.property(String).convention(project.provider {
             project.version as String
         })
+        endOfSupport = objects.property(String)
         bomPublicationFile = objects.fileProperty()
         versionsDirectory = objects.directoryProperty()
     }
@@ -90,6 +98,15 @@ abstract class WriteGrailsVersionInfoTask extends DefaultTask {
 
         TreeMap<String, String> props = []
         props.put("grails.version", getProjectVersion().get())
+        if (endOfSupport.present) {
+            String date = endOfSupport.get().trim()
+            try {
+                LocalDate.parse(date)
+            } catch (DateTimeParseException e) {
+                throw new GradleException("grailsEndOfSupport must be an ISO date (yyyy-MM-dd) but was: ${date}", e)
+            }
+            props.put("grails.endOfSupport", date)
+        }
         ((GPathResult) pom.getProperty("properties")).children().forEach(child -> {
             NodeChild node = (NodeChild) child
             props.put(node.name(), node.text())
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/VersionDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/VersionDTO.java
index f85067524e..3fa081c6d1 100644
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/VersionDTO.java
+++ b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/VersionDTO.java
@@ -19,9 +19,11 @@
 package org.grails.forge.api;
 
 import io.micronaut.core.annotation.Introspected;
+import io.micronaut.core.annotation.Nullable;
 import org.grails.forge.util.VersionInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import java.time.LocalDate;
 import java.util.Map;
 
 /**
@@ -41,6 +43,15 @@ public class VersionDTO extends Linkable {
         return VersionInfo.getDependencyVersions();
     }
 
+    /**
+     * @return The last day this Grails release line is supported (ISO-8601 date), or null for snapshot builds
+     */
+    @Nullable
+    @Schema(description = "The last day this Grails release line is supported. Not present for snapshot builds.", format = "date")
+    public String getEndOfSupport() {
+        return VersionInfo.getEndOfSupport().map(LocalDate::toString).orElse(null);
+    }
+
     @Override
     public VersionDTO addLink(CharSequence rel, LinkDTO link) {
         super.addLink(rel, link);
diff --git a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ApplicationControllerSpec.groovy b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ApplicationControllerSpec.groovy
index a39d008ecd..a2d72f324b 100644
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ApplicationControllerSpec.groovy
+++ b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ApplicationControllerSpec.groovy
@@ -55,6 +55,16 @@ class ApplicationControllerSpec extends Specification {
         response.versions["grails.version"]
     }
 
+    void "test snapshot versions do not report end of support"() {
+        given:
+        def response = client.toBlocking().retrieve(HttpRequest.GET('/versions'), Map)
+
+        expect:
+        response.versions["grails.version"].endsWith('-SNAPSHOT')
+        !response.containsKey("endOfSupport")
+        !response.versions.containsKey("grails.endOfSupport")
+    }
+
     void "test redirect URL configuration"() {
         expect:
         configuration.redirectUri.get().toString() == 'https://example.com/forge/'
diff --git a/grails-forge/grails-forge-core/build.gradle b/grails-forge/grails-forge-core/build.gradle
index 00f96f5604..69a146b2db 100644
--- a/grails-forge/grails-forge-core/build.gradle
+++ b/grails-forge/grails-forge-core/build.gradle
@@ -86,6 +86,7 @@ grailsVersionInfoTask.configure { WriteGrailsVersionInfoTask it ->
     it.dependsOn(bomPublicationTask)
     it.bomPublicationFile = rootProject.layout.projectDirectory.file('../grails-bom/default/build/publications/maven/pom-default.xml')
     it.versionsDirectory = grailsVersionsPath
+    it.endOfSupport = findProperty('grailsEndOfSupport') as String
 }
 sourceSets.main.resources.srcDir(grailsVersionsPath)
 
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/util/VersionInfo.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/util/VersionInfo.java
index 29078abbd6..651bf762e6 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/util/VersionInfo.java
+++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/util/VersionInfo.java
@@ -26,14 +26,18 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.time.format.DateTimeParseException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 
 public class VersionInfo {
 
+    private static final String END_OF_SUPPORT = "grails.endOfSupport";
     private static final Properties VERSIONS = new Properties();
 
     static {
@@ -94,6 +98,23 @@ public class VersionInfo {
         return isGrailsSnapshot() ? "snapshot" : getGrailsVersion();
     }
 
+    /**
+     * Retrieves the last day the Grails release line is supported. Snapshot builds never report one.
+     *
+     * @return The end of support date, or empty for snapshot builds or when none is configured
+     */
+    public static Optional<LocalDate> getEndOfSupport() {
+        Object endOfSupport = VERSIONS.get(END_OF_SUPPORT);
+        if (endOfSupport == null || isGrailsSnapshot()) {
+            return Optional.empty();
+        }
+        try {
+            return Optional.of(LocalDate.parse(endOfSupport.toString().trim()));
+        } catch (DateTimeParseException e) {
+            return Optional.empty();
+        }
+    }
+
     /**
      * Gets the dependency versions.
      *
@@ -101,7 +122,9 @@ public class VersionInfo {
      */
     public static Map<String, String> getDependencyVersions() {
         Map<String, String> map = new LinkedHashMap<>();
-        VERSIONS.entrySet().stream().sorted(Comparator.comparing(o -> o.getKey().toString()))
+        VERSIONS.entrySet().stream()
+                .filter(entry -> !END_OF_SUPPORT.equals(entry.getKey()))
+                .sorted(Comparator.comparing(o -> o.getKey().toString()))
                 .forEach((entry) -> map.put(entry.getKey().toString(), entry.getValue().toString()));
         return Collections.unmodifiableMap(map);
     }
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/util/VersionInfoSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/util/VersionInfoSpec.groovy
index 42501eabd7..a4f182a817 100644
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/util/VersionInfoSpec.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/util/VersionInfoSpec.groovy
@@ -20,9 +20,18 @@
 package org.grails.forge.util
 
 import spock.lang.Specification
+import spock.lang.TempDir
+import spock.lang.Unroll
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.time.LocalDate
 
 class VersionInfoSpec extends Specification {
 
+    @TempDir
+    Path versionsDir
+
     void "test get dependency version"() {
         given:
         def version = VersionInfo.getDependencyVersion("grails")
@@ -31,4 +40,47 @@ class VersionInfoSpec extends Specification {
         version.key == 'grails.version'
         version.value
     }
+
+    void "test release build reports end of support"() {
+        given:
+        Class<?> versionInfo = loadVersionInfo('7.0.17', '2026-10-31')
+
+        expect:
+        versionInfo.getMethod('getEndOfSupport').invoke(null) == Optional.of(LocalDate.of(2026, 10, 31))
+        !versionInfo.getMethod('getDependencyVersions').invoke(null).containsKey('grails.endOfSupport')
+        versionInfo.getMethod('getDependencyVersions').invoke(null)['grails.version'] == '7.0.17'
+    }
+
+    @Unroll
+    void "test no end of support is reported for version #version and date #endOfSupport"() {
+        given:
+        Class<?> versionInfo = loadVersionInfo(version, endOfSupport)
+
+        expect:
+        versionInfo.getMethod('getEndOfSupport').invoke(null) == Optional.empty()
+        !versionInfo.getMethod('getDependencyVersions').invoke(null).containsKey('grails.endOfSupport')
+
+        where:
+        version           | endOfSupport
+        '7.0.18-SNAPSHOT' | '2026-10-31'
+        '7.0.17'          | null
+        '7.0.17'          | '20207-07-31'
+    }
+
+    void "test the current snapshot build does not report end of support"() {
+        expect:
+        VersionInfo.isGrailsSnapshot()
+        !VersionInfo.getEndOfSupport().present
+        !VersionInfo.getDependencyVersions().containsKey('grails.endOfSupport')
+    }
+
+    private Class<?> loadVersionInfo(String version, String endOfSupport) {
+        String properties = "grails.version=${version}\n"
+        if (endOfSupport != null) {
+            properties += "grails.endOfSupport=${endOfSupport}\n"
+        }
+        Files.writeString(versionsDir.resolve('grails-versions.properties'), properties)
+        URL[] urls = [versionsDir.toUri().toURL(), VersionInfo.protectionDomain.codeSource.location]
+        new URLClassLoader(urls, ClassLoader.platformClassLoader).loadClass(VersionInfo.name)
+    }
 }