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 17:26:13 UTC

(grails-core) branch feat/forge-grails-composite created (now 27971429e8)

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

jdaugherty pushed a change to branch feat/forge-grails-composite
in repository https://gitbox.apache.org/repos/asf/grails-core.git


      at 27971429e8 Reduce Forge's documentation script to what Groovydoc needs

This branch includes the following new commits:

     new ba940ec415 Honour grails.native2ascii in a plugin's build script
     new e1131ca72e Move the Forge build conventions into build-logic
     new 46ff841f4e Make Forge a Grails plugin hosted by a web application and a CLI application
     new 50f0f7975d Let a GSP page write no line for its template logic
     new b686570349 Render Forge's templates with GSP instead of Rocker
     new 6010bed3a4 Keep the Forge API's OpenAPI base document with the web application's configuration
     new 27971429e8 Reduce Forge's documentation script to what Groovydoc needs

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(grails-core) 07/07: Reduce Forge's documentation script to what Groovydoc needs

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 27971429e8f633dae72bf1f9fff9194b5cd78257
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Oct 7 13:16:23 2026 -0400

    Reduce Forge's documentation script to what Groovydoc needs
    
    The script declares the Groovy that runs Groovydoc and the standard titles. Groovydoc is given the
    javaVersion it was held back from when Forge pinned Groovy 3, the documentation configuration is no
    longer added to each Groovydoc task's classpath, which the groovydoc plugin already composes, and
    groovy-dateutil is gone, as Groovydoc never used it.
---
 grails-forge/gradle/doc-config.gradle | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/grails-forge/gradle/doc-config.gradle b/grails-forge/gradle/doc-config.gradle
index e45394c66d..cfc6962f39 100644
--- a/grails-forge/gradle/doc-config.gradle
+++ b/grails-forge/gradle/doc-config.gradle
@@ -19,24 +19,15 @@
 
 apply plugin: 'org.apache.grails.buildsrc.groovydoc'
 
-groovydocEnhancer {
-    javaVersionEnabled = false
-}
-
 dependencies {
-    // The `documentation` configuration is registered by the buildsrc.groovydoc
-    // plugin and is independent of compileClasspath/testRuntimeClasspath. Apply
-    // grails-bom here so the unversioned groovy-* artifacts below resolve through
-    // groovy-bom.
+    // the Groovy that runs Groovydoc, for the groovydoc plugin's documentation configuration
     documentation platform("org.apache.grails:grails-bom:$projectVersion")
-    documentation 'org.apache.groovy:groovy-templates'
-    documentation 'org.apache.groovy:groovy-dateutil'
     documentation 'org.apache.groovy:groovy-ant'
     documentation 'org.apache.groovy:groovy-groovydoc'
+    documentation 'org.apache.groovy:groovy-templates'
 }
 
 tasks.withType(Groovydoc).configureEach { Groovydoc gdoc ->
-    gdoc.classpath += project.configurations.documentation
     gdoc.windowTitle = "${project.findProperty('pomArtifactId') ?: project.name} - $projectVersion"
     gdoc.docTitle = "${project.findProperty('pomArtifactId') ?: project.name} - $projectVersion"
 }


(grails-core) 05/07: Render Forge's templates with GSP instead of Rocker

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b686570349347fc1a8dfc956a5b7c83a872148ef
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Oct 7 13:01:01 2026 -0400

    Render Forge's templates with GSP instead of Rocker
    
    The files the generator writes are rendered from GSPs under grails-app/views/forge of the Forge plugin,
    and of the Forge CLI for its code generation commands, in place of Rocker templates. Each page declares
    its model, so it is compiled statically with its module by the GSP Gradle plugin and a page that does
    not type check fails the build. The pages are rendered by the GSP engine alone, without a web request,
    from the compiled pages the views registries name, so the web application, the CLI and the specs
    render them the same way. A feature renders a page through GspView.of(uri, model), written as a file
    of the generated project by GspTemplate; TestRockerModelProvider is TestViewProvider.
    
    The pages declare trimLogicLines, so a line holding only template logic writes nothing, which is what
    Rocker's logic whitespace discarding did. They were converted from Rocker's own parse of the templates,
    after Forge's whitespace post-processor, and every application type, feature, GORM implementation and
    option generates the same files as before, and each code generation command the same source. The
    content closure behind an unused Selenium version is gone with Rocker.
    
    The shaded launchers merge the views registries of the plugin and the CLI. The Rocker convention plugin,
    its post-processor and the Rocker and ANTLR versions are removed from build-logic.
---
 .agents/skills/gradle-developer/SKILL.md           |   2 +-
 .gitignore                                         |   1 +
 .../gradle/wrapper/gradle-wrapper.properties       |   2 +-
 build-logic/plugins/build.gradle                   |   9 +-
 .../forge/rocker/plugin/JavaGeneratorRunnable.java | 166 ------------------
 .../forge/rocker/plugin/RockerConfiguration.java   |  99 -----------
 .../forge/rocker/plugin/RockerGradleException.java |  34 ----
 .../grails/forge/rocker/plugin/RockerPlugin.java   | 100 -----------
 .../rocker/plugin/RockerSourceSetProperty.java     |  80 ---------
 .../org/grails/forge/rocker/plugin/RockerTask.java | 186 ---------------------
 .../forge/rocker/plugin/TemplateDirectorySet.java  | 124 --------------
 .../forge/rocker/plugin/WhitespaceProcessor.java   |  52 ------
 gradle.properties                                  |   7 +-
 gradle/wrapper/gradle-wrapper.properties           |   2 +-
 grails-forge/README.md                             |   8 +
 grails-forge/gradle.properties                     |   2 +-
 .../gradle/wrapper/gradle-wrapper.properties       |   2 +-
 grails-forge/grails-cli-shadow/build.gradle        |   3 +-
 grails-forge/grails-cli/build.gradle               |   3 +-
 grails-forge/grails-forge-cli/build.gradle         |  24 +--
 .../forge/cli/command/templates/controller.gsp}    |  23 +--
 .../cli/command/templates/controllerSpec.gsp}      |  25 ++-
 .../views/forge/cli/command/templates/domain.gsp}  |  25 ++-
 .../forge/cli/command/templates/domainSpec.gsp}    |  27 ++-
 .../forge/cli/command/templates/interceptor.gsp}   |  25 ++-
 .../cli/command/templates/interceptorSpec.gsp}     |  27 ++-
 .../views/forge/cli/command/templates/job.gsp}     |  23 +--
 .../views/forge/cli/command/templates/service.gsp} |  27 ++-
 .../forge/cli/command/templates/serviceSpec.gsp}   |  25 ++-
 .../views/forge/cli/command/templates/taglib.gsp}  |  23 +--
 .../forge/cli/command/templates/taglibSpec.gsp}    |  25 ++-
 .../cli/command/CreateControllerCommand.groovy     |   9 +-
 .../cli/command/CreateDomainClassCommand.groovy    |   9 +-
 .../cli/command/CreateInterceptorCommand.groovy    |   9 +-
 .../forge/cli/command/CreateJobCommand.groovy      |   6 +-
 .../forge/cli/command/CreateServiceCommand.groovy  |   9 +-
 .../forge/cli/command/CreateTagLibCommand.groovy   |   9 +-
 grails-forge/grails-forge-core/build.gradle        |  27 ++-
 .../asciidoctor/template/asciidocGradle.gsp}       |  17 +-
 .../feature/asciidoctor/template/indexAdoc.gsp}    |   8 +-
 .../views/forge/feature/build/gitignore.gsp}       |   6 +-
 .../feature/build/gradle/templates/buildGradle.gsp | 140 ++++++++++++++++
 .../gradle/templates/buildSrcBuildGradle.gsp}      |  56 +++----
 .../build/gradle/templates/dependencies.gsp}       |  34 ++--
 .../build/gradle/templates/gradleProperties.gsp}   |  38 ++---
 .../gradle/templates/gradleWrapperProperties.gsp}  |  33 ++--
 .../build/gradle/templates/settingsGradle.gsp}     |  34 ++--
 .../grails-app/views/forge/feature/cli.gsp         |  43 +++++
 .../plain/templates/plainGithubWorkflow.gsp}       |  27 ++-
 .../github/workflows/templates/javaSetup.gsp}      |  24 ++-
 .../grails/templates/applicationController.gsp}    |  14 +-
 .../forge/feature/grails/templates/plugin.gsp}     |  41 +++--
 .../feature/grails/templates/urlMappings.gsp}      |  29 ++--
 .../feature/lang/groovy/templates/application.gsp} |  58 ++++---
 .../feature/lang/groovy/templates/bootStrap.gsp}   |  37 ++--
 .../forge/feature/logging/template/logback.gsp}    |  12 +-
 .../migration/templates/dbMigrationGradle.gsp}     |  11 +-
 .../forge/feature/other/template/maindocs.gsp}     |  23 ++-
 .../forge/feature/other/template/markdownLink.gsp} |  11 +-
 .../views/forge/feature/other/template/readme.gsp} |  45 ++---
 .../forge/feature/security/template/role.gsp}      |  18 +-
 .../template/securityApplicationGroovy.gsp}        |  31 ++--
 .../forge/feature/security/template/user.gsp}      |  26 ++-
 .../feature/security/template/userClassic.gsp}     |  28 ++--
 .../security/template/userClassicService.gsp}      |  16 +-
 .../feature/security/template/userClassicSpec.gsp} |  14 +-
 .../feature/security/template/userController.gsp}  |  16 +-
 .../forge/feature/security/template/userRole.gsp}  |  20 +--
 .../feature/security/template/userService.gsp}     |  20 +--
 .../forge/feature/security/template/userSpec.gsp}  |  14 +-
 .../feature/spring/template/springResources.gsp}   |   6 +-
 .../feature/test/template/containerGebSpec.gsp}    |  25 ++-
 .../forge/feature/test/template/gebConfig.gsp}     |  14 +-
 .../views/forge/feature/test/template/gebSpec.gsp} |  25 ++-
 .../forge/feature/view/json/templates/_errors.gsp} |   6 +-
 .../forge/feature/view/json/templates/_object.gsp} |   8 +-
 .../forge/feature/view/json/templates/error.gsp}   |   6 +-
 .../forge/feature/view/json/templates/index.gsp}   |   6 +-
 .../feature/view/json/templates/notFound.gsp}      |   6 +-
 .../feature/view/markup/templates/_errors.gsp}     |   6 +-
 .../feature/view/markup/templates/_object.gsp}     |   8 +-
 .../forge/feature/view/markup/templates/error.gsp} |   6 +-
 .../forge/feature/view/markup/templates/index.gsp} |   6 +-
 .../feature/view/markup/templates/notFound.gsp}    |   6 +-
 .../views/forge/template/api/grailsForgeApi.gsp}   |  32 ++--
 .../generator/DefaultProjectGenerator.groovy       |  15 +-
 .../application/generator/GeneratorContext.groovy  |  28 ++--
 .../forge/feature/asciidoctor/Asciidoctor.groovy   |   9 +-
 .../forge/feature/build/gradle/Gradle.groovy       |  22 +--
 .../feature/build/gradle/GradleBuildSrc.groovy     |  12 +-
 .../feature/build/gradle/GradleSettingsFile.groovy |   6 +-
 .../plain/PlainGithubWorkflowFeature.groovy        |   8 +-
 .../forge/feature/grails/GrailsUrlMappings.groovy  |   6 +-
 .../feature/lang/groovy/GrailsApplication.groovy   |  21 +--
 .../forge/feature/logging/LogbackConfig.groovy     |   8 +-
 .../migration/DatabaseMigrationPlugin.groovy       |   5 +-
 .../org/grails/forge/feature/other/Readme.groovy   |   8 +-
 .../feature/security/GrailsSpringSecurity.groovy   |  18 +-
 .../forge/feature/security/SecurityFeature.groovy  |  17 +-
 .../security/SpringBootStarterSecurity.groovy      |  17 +-
 .../forge/feature/spring/SpringResources.groovy    |   6 +-
 .../forge/feature/test/GebWithLocalBrowsers.groovy |  21 ++-
 .../feature/test/GebWithTestcontainers.groovy      |  16 +-
 .../grails/forge/feature/view/json/ViewJson.groovy |  18 +-
 .../forge/feature/view/markup/ViewMarkup.groovy    |  18 +-
 ...vider.groovy => DefaultTestViewProvider.groovy} |  10 +-
 ...odelProvider.groovy => TestViewProvider.groovy} |  14 +-
 .../org/grails/forge/template/ForgePages.groovy    | 106 ++++++++++++
 .../{RockerTemplate.groovy => GspTemplate.groovy}  |  26 +--
 .../org/grails/forge/template/GspView.groovy       |  69 ++++++++
 .../grails/forge/template/RockerWritable.groovy    |  39 -----
 .../build/gradle/templates/buildGradle.rocker.raw  | 156 -----------------
 .../gradle/templates/gradleProperties.rocker.raw   |  33 ----
 .../gradle/templates/settingsGradle.rocker.raw     |  35 ----
 .../java/org/grails/forge/feature/cli.rocker.raw   |  48 ------
 .../forge/feature/other/template/readme.rocker.raw |  41 -----
 .../groovy/org/grails/forge/BuildBuilder.groovy    |   7 +-
 ...iderSpec.groovy => TestViewProviderSpec.groovy} |  10 +-
 .../forge/api/ForgeApplicationService.groovy       |  14 +-
 grails-forge/test-core/build.gradle                |   9 -
 .../gradle/wrapper/gradle-wrapper.properties       |   2 +-
 .../gradle/wrapper/gradle-wrapper.properties       |   2 +-
 .../gradle/wrapper/gradle-wrapper.properties       |   2 +-
 123 files changed, 1110 insertions(+), 2161 deletions(-)

diff --git a/.agents/skills/gradle-developer/SKILL.md b/.agents/skills/gradle-developer/SKILL.md
index 5d2f3dd8ee..2e5abe21fc 100644
--- a/.agents/skills/gradle-developer/SKILL.md
+++ b/.agents/skills/gradle-developer/SKILL.md
@@ -162,7 +162,7 @@ Never unify those casually.
    - `grails-profiles/base/skeleton/` and `grails-profiles/profile/skeleton/`
    - `grails-shell-cli/src/test/resources/gradle-sample/` (and `bin/test` copy if present)
    - Forge **generated-app** wrapper assets (all of these - properties alone is not enough):
-     - `grails-forge/grails-forge-core/.../gradleWrapperProperties.rocker.raw` (properties template)
+     - `grails-forge/grails-forge-core/grails-app/views/forge/.../gradleWrapperProperties.gsp` (properties page)
      - `grails-forge/grails-forge-core/src/main/resources/gradle/gradlew`
      - `grails-forge/grails-forge-core/src/main/resources/gradle/gradlew.bat`
      - `grails-forge/grails-forge-core/src/main/resources/gradle/wrapper/gradle-wrapper.jar`
diff --git a/.gitignore b/.gitignore
index 222a8cd356..e777358dfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@ target
 tmp/
 !grails-fields/src/main/groovy/org/grails/scaffolding/registry/output
 !grails-forge/*/src/**/build/
+!grails-forge/*/grails-app/**/build/
 # copied from the grails-wrapper build by the Forge plugin's copyGrailsWrapper task
 grails-forge/grails-forge-core/src/main/resources/grails-wrapper/
 !etc/bin
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties
index 814d929a9f..d609ab0bb9 100644
--- a/build-logic/gradle/wrapper/gradle-wrapper.properties
+++ b/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 # Keep gradle version synced with .sdkmanrc, gradle.properties (gradleToolingApiVersion), all other gradle-wrapper.properties files,
-# and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
+# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
diff --git a/build-logic/plugins/build.gradle b/build-logic/plugins/build.gradle
index bc257cb2a3..0dfadbdced 100644
--- a/build-logic/plugins/build.gradle
+++ b/build-logic/plugins/build.gradle
@@ -45,10 +45,7 @@ dependencies {
     implementation gradleBomDependencies['asm']
     // validateBomProperties reads BOM POMs with Maven's own model, as ExtractDependenciesTask in docs-core does
     implementation "org.apache.maven:maven-model:${gradleBomDependencyVersions['maven-model.version']}"
-    // Forge build conventions: the Rocker template compiler behind org.grails.forge.rocker and the
-    // shadow transformers that assemble the grails CLI distribution
-    implementation "com.fizzed:rocker-compiler:${gradleProperties.rockerVersion}"
-    implementation "org.antlr:antlr4-runtime:${gradleProperties.antlr4Version}"
+    // Forge build conventions: the shadow transformers that assemble the grails CLI distribution
     implementation "com.gradleup.shadow:shadow-gradle-plugin:${gradleProperties.shadowVersion}"
 
     testImplementation "org.spockframework:spock-core:${gradleBomDependencyVersions['gradle-spock.version']}"
@@ -148,9 +145,5 @@ gradlePlugin {
             id = 'org.apache.grails.buildsrc.agent-skills'
             implementationClass = 'org.apache.grails.buildsrc.AgentSkillsPlugin'
         }
-        register('forgeRockerPlugin') {
-            id = 'org.grails.forge.rocker'
-            implementationClass = 'org.grails.forge.rocker.plugin.RockerPlugin'
-        }
     }
 }
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/JavaGeneratorRunnable.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/JavaGeneratorRunnable.java
deleted file mode 100644
index 4b6e889c98..0000000000
--- a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/JavaGeneratorRunnable.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import com.fizzed.rocker.compiler.GeneratorException;
-import com.fizzed.rocker.compiler.JavaGenerator;
-import com.fizzed.rocker.compiler.JavaGeneratorMain;
-import com.fizzed.rocker.compiler.PlainTextStrategy;
-import com.fizzed.rocker.compiler.RockerConfiguration;
-import com.fizzed.rocker.compiler.RockerUtil;
-import com.fizzed.rocker.compiler.TemplateParser;
-import com.fizzed.rocker.model.TemplateModel;
-import com.fizzed.rocker.runtime.ParserException;
-import com.fizzed.rocker.runtime.RockerRuntime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class JavaGeneratorRunnable implements Runnable {
-
-    private static final Logger log = LoggerFactory.getLogger(JavaGeneratorMain.class);
-
-    private final com.fizzed.rocker.compiler.RockerConfiguration configuration;
-    private final TemplateParser parser;
-    private final JavaGenerator generator;
-    private final List<File> templateFiles;
-    private String suffixRegex;
-    private boolean failOnError;
-
-    public JavaGeneratorRunnable() {
-        this.configuration = new RockerConfiguration();
-        this.parser = new TemplateParser(this.configuration);
-        this.generator = new JavaGenerator(this.configuration);
-        this.generator.setPlainTextStrategy(PlainTextStrategy.STATIC_STRINGS);
-        this.templateFiles = new ArrayList<>();
-        this.suffixRegex = ".*\\.rocker\\.(raw|html)$";
-        this.failOnError = true;
-    }
-
-    public String getSuffixRegex() {
-        return suffixRegex;
-    }
-
-    public void setSuffixRegex(String suffixRegex) {
-        this.suffixRegex = suffixRegex;
-    }
-
-    public boolean isFailOnError() {
-        return failOnError;
-    }
-
-    public void setFailOnError(boolean failOnError) {
-        this.failOnError = failOnError;
-    }
-
-    public TemplateParser getParser() {
-        return parser;
-    }
-
-    public JavaGenerator getGenerator() {
-        return generator;
-    }
-
-    public void run() throws RuntimeException{
-        if (this.configuration.getTemplateDirectory() == null) {
-            throw new RuntimeException("Template directory was null");
-        }
-
-        if (!this.configuration.getTemplateDirectory().exists() || !this.configuration.getTemplateDirectory().isDirectory()) {
-            throw new RuntimeException("Template directory does not exist: " + this.configuration.getTemplateDirectory());
-        }
-
-        // loop thru template directory and match templates
-        Collection<File> allFiles = RockerUtil.listFileTree(this.configuration.getTemplateDirectory());
-        for (File f : allFiles) {
-            if (f.getName().matches(suffixRegex)) {
-                templateFiles.add(f);
-            }
-        }
-
-        log.info("Parsing " + templateFiles.size() + " rocker template files");
-
-        int errors = 0;
-        int generated = 0;
-
-        for (File f : templateFiles) {
-            TemplateModel model = null;
-
-            try {
-                // parse model
-                model = parser.parse(f);
-            } catch (IOException | ParserException e) {
-                if (e instanceof ParserException) {
-                    ParserException pe = (ParserException) e;
-                    log.error("Parsing failed for " + f + ":[" + pe.getLineNumber() + "," + pe.getColumnNumber() + "] " + pe.getMessage());
-                } else {
-                    log.error("Unable to parse template", e);
-                }
-                errors++;
-            }
-
-            try {
-                File outputFile = generator.generate(model);
-                generated++;
-
-                log.debug("Generated java source: " + outputFile);
-            } catch (GeneratorException | IOException e) {
-                throw new RuntimeException("Generating java source failed for " + f + ": " + e.getMessage(), e);
-            }
-
-        }
-
-        log.info("Generated " + generated + " rocker java source files");
-
-        if (errors > 0 && failOnError) {
-            throw new RuntimeException("Caught " + errors + " errors.");
-        }
-
-        if (!configuration.getOptions().getOptimize()) {
-            // save configuration
-            this.configuration.getClassDirectory().mkdirs();
-
-            // use resource name, but strip leading slash
-            // place it into the classes directory (not the compile directory)
-            try{
-                File configFile = new File(this.configuration.getClassDirectory(), RockerRuntime.CONF_RESOURCE_NAME.substring(1));
-                this.configuration.write(configFile);
-                log.info("Generated rocker configuration " + configFile);
-            }catch(IOException iox){
-                throw new RuntimeException(iox);
-            }
-        } else {
-            log.info("Optimize flag on. Did not generate rocker configuration file");
-        }
-    }
-
-    public void setTemplateDirectory(File templateDirectory) {
-        this.parser.getConfiguration().setTemplateDirectory(templateDirectory);
-    }
-
-    public void setOutputDirectory(File outputDirectory) {
-        this.generator.getConfiguration().setOutputDirectory(outputDirectory);
-    }
-}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerConfiguration.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerConfiguration.java
deleted file mode 100644
index 09583504b8..0000000000
--- a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerConfiguration.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import com.fizzed.rocker.model.JavaVersion;
-import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.provider.ListProperty;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.Internal;
-import org.gradle.api.tasks.Optional;
-
-/**
- * Bean for the configuration options of Rocker Compiler
- */
-public abstract class RockerConfiguration {
-    private String[] postProcessing;
-    private Boolean markAsGenerated;
-
-    public RockerConfiguration() {
-        getSkip().convention(false);
-        getFailOnError().convention(true);
-        getSkipTouch().convention(true);
-        getJavaVersion().convention(JavaVersion.current());
-        getOptimize().convention(true);
-        getDiscardLogicWhitespace().convention(true);
-    }
-
-    @Internal
-    public abstract Property<Boolean> getSkip();
-
-    @Internal
-    public abstract Property<Boolean> getFailOnError();
-
-    @Internal
-    public abstract Property<Boolean> getSkipTouch();
-
-    @Optional
-    @Input
-    public abstract Property<String> getTouchFile();
-
-    @Input
-    public abstract Property<String> getJavaVersion();
-
-    @Optional
-    @Input
-    public abstract Property<String> getExtendsClass();
-
-    @Optional
-    @Input
-    public abstract Property<String> getExtendsModelClass();
-
-    @Optional
-    @Input
-    public abstract Property<Boolean> getOptimize();
-
-    @Optional
-    @Input
-    public abstract Property<Boolean> getDiscardLogicWhitespace();
-
-    @Optional
-    @Input
-    public abstract Property<String> getTargetCharset();
-
-    @Optional
-    @Input
-    public abstract Property<String> getSuffixRegex();
-
-    @Internal
-    public abstract DirectoryProperty getOutputBaseDirectory();
-
-    @Internal
-    public abstract DirectoryProperty getClassBaseDirectory();
-
-    @Optional
-    @Input
-    public abstract ListProperty<String> getPostProcessing();
-
-    @Optional
-    @Input
-    public abstract Property<Boolean> getMarkAsGenerated();
-}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerGradleException.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerGradleException.java
deleted file mode 100644
index 85b879ff51..0000000000
--- a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerGradleException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-/**
- * Named RuntimeException
- */
-@SuppressWarnings("serial")
-public class RockerGradleException extends RuntimeException {
-    public RockerGradleException(String msg) {
-        super(msg);
-    }
-
-    public RockerGradleException(String msg, Exception e) {
-        super(msg, e);
-    }
-}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerPlugin.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerPlugin.java
deleted file mode 100644
index 0c861313a7..0000000000
--- a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerPlugin.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.plugins.ExtensionAware;
-import org.gradle.api.plugins.JavaLibraryPlugin;
-import org.gradle.api.plugins.JavaPluginExtension;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.GroovySourceDirectorySet;
-import org.gradle.api.tasks.SourceSetContainer;
-import org.gradle.api.tasks.TaskProvider;
-
-/**
- * A plugin that for gradle that provides the `generateRockerTemplateSource`
- * tasks.
- */
-public class RockerPlugin implements Plugin<Project> {
-    /**
-     * Create `rockerCompile` task in group build and describe the task
-     *
-     * @param project - gradle project
-     */
-    @Override
-    public void apply(Project project) {
-        // Make sure that we have the objects from the java task available
-        project.getPluginManager().apply(JavaLibraryPlugin.class);
-
-        // Create own project extension (configuration)
-        RockerConfiguration rockerConfig = project.getExtensions().create("rocker", RockerConfiguration.class);
-        rockerConfig.getOutputBaseDirectory().convention(
-                project.getLayout().getBuildDirectory().dir("generated-src/rocker")
-        );
-        rockerConfig.getClassBaseDirectory().convention(
-                project.getLayout().getBuildDirectory().dir("classes")
-        );
-
-        // Create own source set extension using the modern JavaPluginExtension API
-        SourceSetContainer sourceSets = project.getExtensions()
-                .getByType(JavaPluginExtension.class).getSourceSets();
-        sourceSets.all(sourceSet -> processSourceSet(project, sourceSet, rockerConfig));
-
-    }
-
-    private static void processSourceSet(Project project, SourceSet sourceSet,
-                                         RockerConfiguration rockerConfig) {
-        // for each source set we will:
-        // 1) Add a new 'rocker' extension to the source set
-        RockerSourceSetProperty rockerProperty
-                = new RockerSourceSetProperty(project);
-        ((ExtensionAware) sourceSet).getExtensions().add(
-                "rocker", rockerProperty);
-
-        // 2) Create a rocker task for this sourceSet following the gradle
-        //    naming conventions
-        String taskName = sourceSet.getTaskName(
-                "generate", "RockerTemplateSource");
-        TaskProvider<RockerTask> rockerTaskProvider = project.getTasks().register(taskName, RockerTask.class, rockerTask -> {
-            rockerTask.setGroup("build");
-            rockerTask.setDescription("Generate Sources from "
-                    + sourceSet.getName() + " Rocker Templates");
-            rockerTask.getRockerProjectConfig().set(rockerConfig);
-            rockerTask.getOutputDir().convention(
-                    rockerConfig.getOutputBaseDirectory().dir(sourceSet.getName())
-            );
-            rockerTask.getClassDir().convention(
-                    rockerConfig.getClassBaseDirectory().dir(sourceSet.getName())
-            );
-            rockerTask.getTemplateDirs().from(rockerProperty.getRocker().getSrcDirs());
-        });
-
-        // The generated Java references the template models, which are Groovy classes in the Forge
-        // modules, and the Groovy code references the generated templates, so the generated sources are
-        // joint-compiled with the Groovy sources when the Groovy plugin is applied
-        if (project.getPluginManager().hasPlugin("groovy")) {
-            sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class).srcDir(rockerTaskProvider);
-        } else {
-            sourceSet.getJava().srcDir(rockerTaskProvider);
-        }
-    }
-
-}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerSourceSetProperty.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerSourceSetProperty.java
deleted file mode 100644
index 5aef586e2b..0000000000
--- a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerSourceSetProperty.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import groovy.lang.Closure;
-import org.gradle.api.Action;
-import org.gradle.api.Project;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.util.internal.ClosureBackedAction;
-
-import java.io.File;
-import java.util.Set;
-
-/**
- * The rocker property added to the {@link SourceSet}.
- */
-public class RockerSourceSetProperty {
-
-    private final TemplateDirectorySet templateDirs;
-
-    /**
-     * @param project - main gradle project
-     */
-    public RockerSourceSetProperty(Project project) {
-        super();
-        templateDirs = new TemplateDirectorySet(project);
-    }
-
-    public TemplateDirectorySet getRocker() {
-        return templateDirs;
-    }
-
-    public RockerSourceSetProperty rocker(Closure<?> configureClosure) {
-        new ClosureBackedAction<>(configureClosure).execute(getRocker());
-        return this;
-    }
-
-    public RockerSourceSetProperty rocker(
-        Action<? super TemplateDirectorySet> configureAction) {
-        configureAction.execute(getRocker());
-        return this;
-    }
-
-    // Delegate methods to TemplateDirectorySet for DSL compatibility
-    public RockerSourceSetProperty srcDir(Object srcDir) {
-        templateDirs.srcDir(srcDir);
-        return this;
-    }
-
-    public RockerSourceSetProperty srcDirs(Object... srcDirs) {
-        templateDirs.srcDirs(srcDirs);
-        return this;
-    }
-
-    public RockerSourceSetProperty setSrcDirs(Iterable<?> srcPaths) {
-        templateDirs.setSrcDirs(srcPaths);
-        return this;
-    }
-
-    public Set<File> getSrcDirs() {
-        return templateDirs.getSrcDirs();
-    }
-}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerTask.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerTask.java
deleted file mode 100644
index 218b1d1a59..0000000000
--- a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerTask.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import com.fizzed.rocker.compiler.RockerOptions;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.file.ConfigurableFileCollection;
-import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.file.FileSystemOperations;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.CacheableTask;
-import org.gradle.api.tasks.Classpath;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.Nested;
-import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.PathSensitive;
-import org.gradle.api.tasks.PathSensitivity;
-import org.gradle.api.tasks.TaskAction;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-@CacheableTask
-public abstract class RockerTask extends DefaultTask {
-
-
-    /**
-     * @return the config
-     */
-    @Nested
-    public abstract Property<RockerConfiguration> getRockerProjectConfig();
-
-    /**
-     * @return the templateDirs
-     */
-    @InputFiles
-    @PathSensitive(PathSensitivity.RELATIVE)
-    public abstract ConfigurableFileCollection getTemplateDirs();
-
-    /**
-     * @return the outputDir
-     */
-    @OutputDirectory
-    public abstract DirectoryProperty getOutputDir();
-
-    @Classpath
-    public abstract DirectoryProperty getClassDir();
-
-    @Inject
-    protected abstract FileSystemOperations getFileSystemOperations();
-
-    /**
-     * Sets up the logger and runs the rocker compiler
-     */
-    @TaskAction
-    public void compileRocker() {
-        RockerConfiguration ext = (RockerConfiguration)
-                getProject().getExtensions().findByName("rocker");
-        File outputDir = getOutputDir().get().getAsFile();
-        // Rocker only writes files, so remove sources generated from templates that no longer exist
-        getFileSystemOperations().delete(spec -> spec.delete(outputDir));
-        Set<File> templateDirs = getTemplateDirs().getFiles();
-        for (File templateDir : templateDirs) {
-            doCompileRocker(ext, getLogger(), templateDir, outputDir, getClassDir().get().getAsFile());
-        }
-    }
-
-    /**
-     * Uses the project to get GradleExtension and runs the generator
-     */
-    public static void doCompileRocker(RockerConfiguration ext,
-                                       Logger logger,
-                                       File templateDir, File outputDir, File classDir) {
-
-        runJavaGeneratorMain(ext, logger, templateDir, outputDir, classDir);
-    }
-
-    /**
-     * Run the Rocker compiler with the RockerGradleExtension as configuration
-     * options.
-     *
-     * @param ext the extension from the project object
-     */
-    private static void runJavaGeneratorMain(RockerConfiguration ext,
-                                             Logger logger,
-                                             File templateDir, File outputDir, File classDir) {
-        if (ext.getSkip().get()) {
-            logger.info("Skip flag is on, will skip goal.");
-            return;
-        }
-
-        logger.info("Targeting java version " + ext.getJavaVersion().get());
-
-        try {
-            JavaGeneratorRunnable jgm = new JavaGeneratorRunnable();
-
-            jgm.getParser().getConfiguration().setTemplateDirectory(templateDir);
-            jgm.getGenerator().getConfiguration().setOutputDirectory(outputDir);
-            jgm.getGenerator().getConfiguration().setClassDirectory(classDir);
-            jgm.setFailOnError(ext.getFailOnError().get());
-
-            // passthru other config
-            if (ext.getSuffixRegex().isPresent()) {
-                jgm.setSuffixRegex(ext.getSuffixRegex().get());
-            }
-            RockerOptions rockerOptions = jgm.getParser().getConfiguration().getOptions();
-            rockerOptions.setJavaVersion(ext.getJavaVersion().get());
-            if (ext.getExtendsClass().isPresent()) {
-                rockerOptions.setExtendsClass(ext.getExtendsClass().get());
-            }
-            if (ext.getExtendsModelClass().isPresent()) {
-                rockerOptions.setExtendsModelClass(ext.getExtendsModelClass().get());
-            }
-            if (ext.getDiscardLogicWhitespace().isPresent()) {
-                rockerOptions.setDiscardLogicWhitespace(ext.getDiscardLogicWhitespace().get());
-            }
-            if (ext.getTargetCharset().isPresent()) {
-                rockerOptions.setTargetCharset(ext.getTargetCharset().get());
-            }
-            if (ext.getOptimize().isPresent()) {
-                rockerOptions.setOptimize(ext.getOptimize().get());
-            }
-            if (ext.getPostProcessing().isPresent()) {
-                List<String> postProcessing = ext.getPostProcessing().get();
-                if (!postProcessing.isEmpty()) {
-                    rockerOptions.setPostProcessing(postProcessing.toArray(new String[0]));
-                }
-            }
-            if (ext.getMarkAsGenerated().isPresent()) {
-                rockerOptions.setMarkAsGenerated(ext.getMarkAsGenerated().get());
-            }
-
-            jgm.run();
-
-        } catch (Exception e) {
-            throw new RockerGradleException(e.getMessage(), e);
-        }
-
-        if (!ext.getSkipTouch().get()) {
-            String touchFile = ext.getTouchFile().orElse("").get();
-            if (touchFile.length() == 0) {
-                throw new RockerGradleException(
-                        "If skipTouch is equal to false, then "
-                                + "touchFile must not be empty");
-            }
-            if (ext.getTouchFile().isPresent()) {
-                File f = new File(touchFile);
-                logger.info("Touching file " + f);
-                try {
-                    if (!f.exists()) {
-                        new FileOutputStream(f).close();
-                    }
-                    if (!f.setLastModified(System.currentTimeMillis())) {
-                        throw new IOException("Could not set Last Modified");
-                    }
-                } catch (IOException e) {
-                    logger.debug("Unable to touch file: " + f.getAbsolutePath(), e);
-                }
-            }
-        }
-    }
-
-}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/TemplateDirectorySet.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/TemplateDirectorySet.java
deleted file mode 100644
index 2ce6084ed1..0000000000
--- a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/TemplateDirectorySet.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import org.gradle.api.PathValidation;
-import org.gradle.api.Project;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.util.PatternFilterable;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A simplified version of {@link SourceSet}. Gradle's {@link SourceSet}
- * inherits from {@link PatternFilterable}, but rocker works on complete
- * directories. So instead of using {@link SourceSet} and allowing
- * the user to specify filters without any effect, this simplified
- * source set implementation is used.
- * <P>
- * It would be tempting to provide e.g. {@code templateDir} instead of
- * {@code srcDir}, but this would break established use and templates are
- * the source in this context.
- */
-public class TemplateDirectorySet  {
-    private Project project;
-    private final Set<File> templateDirs = new HashSet<>();
-
-    /**
-     * Create a new instance. The project is used to immediately check
-     * (with {@code project.file()} the validity of added directories.
-     *
-     * @param project the project
-     */
-    public TemplateDirectorySet(Project project) {
-        super();
-        this.project = project;
-    }
-
-    /**
-     * Adds the given source directory to this set.
-     *
-     * @param srcDir the directory
-     * @return the template set for easy chaining
-     */
-    public TemplateDirectorySet srcDir(Object srcDir) {
-        templateDirs.add(project.file(srcDir, PathValidation.DIRECTORY));
-        return this;
-    }
-
-    /**
-     * Adds the given source directories to this set.
-     *
-     * @param srcDirs the directories
-     * @return the template set for easy chaining
-     */
-    public TemplateDirectorySet srcDirs(Object... srcDirs) {
-        for (Object srcDir : srcDirs) {
-            srcDir(srcDir);
-        }
-        return this;
-    }
-
-    /**
-     * Sets the source directories for this set.
-     *
-     * @param srcPaths the source directories
-     * @return the template set for easy chaining
-     */
-    public TemplateDirectorySet setSrcDirs(Iterable<?> srcPaths) {
-        templateDirs.clear();
-        srcPaths.forEach(this::srcDir);
-        return this;
-    }
-
-    /**
-     * Adds the given source to this set.
-     *
-     * @param source the source
-     * @return the template set for easy chaining
-     */
-    public TemplateDirectorySet source(TemplateDirectorySet source) {
-        source.getSrcDirs().forEach(this::srcDir);
-        return this;
-    }
-
-    /**
-     * Returns the source directories that make up this set.
-     *
-     * @return the directories
-     */
-    public Set<File> getSrcDirs() {
-        return templateDirs;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("TemplateDirectorySet [");
-        if (!templateDirs.isEmpty()) {
-            builder.append("templateDirs=");
-            builder.append(templateDirs);
-        }
-        builder.append("]");
-        return builder.toString();
-    }
-}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/WhitespaceProcessor.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/WhitespaceProcessor.java
deleted file mode 100644
index a24f929dfc..0000000000
--- a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/WhitespaceProcessor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import com.fizzed.rocker.model.PlainText;
-import com.fizzed.rocker.model.PostProcessorException;
-import com.fizzed.rocker.model.TemplateModel;
-import com.fizzed.rocker.model.TemplateModelPostProcessor;
-import com.fizzed.rocker.model.TemplateUnit;
-
-import java.util.List;
-
-public class WhitespaceProcessor implements TemplateModelPostProcessor {
-
-    @Override
-    public TemplateModel process(TemplateModel templateModel, int ppIndex) throws PostProcessorException {
-        List<TemplateUnit> units = templateModel.getUnits();
-        int length = units.size();
-        PlainText lastPlainText = null;
-        for (int i = 0; i < length; i ++) {
-            TemplateUnit tu = units.get(i);
-            if (tu instanceof PlainText) {
-                PlainText pt = (PlainText)tu;
-                if ((lastPlainText == null || lastPlainText.getText().endsWith("\n")) && pt.getText().startsWith("\n")) {
-                    PlainText replacementPt = new PlainText(pt.getSourceRef(), pt.getText().substring(1));
-                    // replace the unit
-                    units.add(i, replacementPt);
-                    units.remove(i + 1);
-                }
-                lastPlainText = pt;
-            }
-        }
-        return templateModel;
-    }
-}
diff --git a/gradle.properties b/gradle.properties
index 14ed4d492a..7fff5bc5a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -43,7 +43,7 @@ expectitCoreVersion=0.9.0
 geantyrefVersion=1.3.16
 gparsVersion=1.2.1
 # Keep gradle version synced with .sdkmanrc, all gradle-wrapper.properties files,
-# and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
+# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
 gradleToolingApiVersion=9.8.0
 greenmailVersion=2.1.14
 javassistVersion=3.33.0-GA
@@ -56,10 +56,7 @@ picocliVersion=4.7.7
 spyMemcachedVersion=2.12.3
 
 # Build dependency versions not managed by BOMs
-# Forge pins read by build-logic (the Rocker compiler plugin and the shadow transformers);
-# rockerVersion is also the Rocker runtime the Forge modules compile against
-antlr4Version=4.8-1!!
-rockerVersion=2.2.1
+# Forge pin read by build-logic (the shadow transformers)
 shadowVersion=8.3.11
 apacheRatVersion=0.8.1
 gradleChecksumPluginVersion=1.4.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 814d929a9f..d609ab0bb9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 # Keep gradle version synced with .sdkmanrc, gradle.properties (gradleToolingApiVersion), all other gradle-wrapper.properties files,
-# and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
+# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
diff --git a/grails-forge/README.md b/grails-forge/README.md
index 13689188c1..db0d146f71 100644
--- a/grails-forge/README.md
+++ b/grails-forge/README.md
@@ -27,6 +27,14 @@ same generator from the command line. Both applications consume the framework th
 application does, by Maven coordinates, so building Forge is also the first use of the Grails that was just
 built. The `grails` launcher (`grails-cli`) assembles the CLI with the Grails shell CLI into one distribution.
 
+The files the generator writes are rendered from GSPs under `grails-app/views/forge` of `grails-forge-core`
+(and, for the CLI's code generation commands, of `grails-forge-cli`). Each page declares the model it is
+rendered with and is compiled with its module, so a page that does not type check fails the build. The pages
+are rendered by the GSP engine alone, without a web request, and declare `trimLogicLines="true"`: a line
+holding only a scriptlet, a directive or a comment writes nothing, so the line breaks of a generated file are
+the ones its page shows as text. A feature renders a page through `GspView.of(uri, model)`, written as a file
+of the generated project by `GspTemplate`.
+
 ## Building
 
 Forge is a separate Gradle build next to the framework build, run with its own wrapper from this directory:
diff --git a/grails-forge/gradle.properties b/grails-forge/gradle.properties
index ba036558dc..398bb8eb4b 100644
--- a/grails-forge/gradle.properties
+++ b/grails-forge/gradle.properties
@@ -20,7 +20,7 @@
 # Project version is defined in the root gradle.properties file. Forge is a separate Gradle build that
 # consumes the framework it is built with by coordinates (includeBuild substitution), so every version
 # the framework manages comes from grails-bom; only Forge-specific pins live here. The pins build-logic
-# needs as well (Rocker, shadow) live in the root gradle.properties.
+# needs as well (shadow) live in the root gradle.properties.
 title=Grails Application Forge
 projectDesc=Generates Grails applications
 commonsCompressVersion=1.28.0
diff --git a/grails-forge/gradle/wrapper/gradle-wrapper.properties b/grails-forge/gradle/wrapper/gradle-wrapper.properties
index 814d929a9f..d609ab0bb9 100644
--- a/grails-forge/gradle/wrapper/gradle-wrapper.properties
+++ b/grails-forge/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 # Keep gradle version synced with .sdkmanrc, gradle.properties (gradleToolingApiVersion), all other gradle-wrapper.properties files,
-# and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
+# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
diff --git a/grails-forge/grails-cli-shadow/build.gradle b/grails-forge/grails-cli-shadow/build.gradle
index 86b19a63e1..c7f03967f8 100644
--- a/grails-forge/grails-cli-shadow/build.gradle
+++ b/grails-forge/grails-cli-shadow/build.gradle
@@ -69,7 +69,8 @@ shadowJarTask.configure { ShadowJar it ->
     // letting the first jar win
     it.mergeServiceFiles('META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports')
     it.transform(PropertiesFileTransformer) {
-        paths = ['META-INF/spring.factories']
+        // the views registries of the Forge plugin and the Forge CLI, each naming its own compiled pages
+        paths = ['META-INF/spring.factories', 'gsp/views.properties']
         mergeStrategy = 'append'
     }
 
diff --git a/grails-forge/grails-cli/build.gradle b/grails-forge/grails-cli/build.gradle
index 474a3046da..64fd985b18 100644
--- a/grails-forge/grails-cli/build.gradle
+++ b/grails-forge/grails-cli/build.gradle
@@ -109,7 +109,8 @@ shadowJarTask.configure { ShadowJar it ->
     // letting the first jar win
     it.mergeServiceFiles('META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports')
     it.transform(PropertiesFileTransformer) {
-        paths = ['META-INF/spring.factories']
+        // the views registries of the Forge plugin and the Forge CLI, each naming its own compiled pages
+        paths = ['META-INF/spring.factories', 'gsp/views.properties']
         mergeStrategy = 'append'
     }
 
diff --git a/grails-forge/grails-forge-cli/build.gradle b/grails-forge/grails-forge-cli/build.gradle
index 0e9bc2196b..688308793d 100644
--- a/grails-forge/grails-forge-cli/build.gradle
+++ b/grails-forge/grails-forge-cli/build.gradle
@@ -25,7 +25,8 @@ plugins {
     id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-app'
     id 'java-test-fixtures' // CliRunner, which the specs here and in test-core run one command bean with
-    id 'org.grails.forge.rocker'
+    // the pages of the code generation commands, under grails-app/views/forge/cli
+    id 'org.apache.grails.gradle.grails-gsp'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
@@ -40,14 +41,6 @@ grails {
     cliAutoProvision = false
 }
 
-sourceSets {
-    main {
-        rocker {
-            srcDir('src/main/java')
-        }
-    }
-}
-
 configurations.configureEach {
     resolutionStrategy {
         // prevent fatJar result containing multiple versions of picocli
@@ -98,7 +91,12 @@ dependencies {
     implementation 'org.apache.grails.bootstrap:grails-bootstrap' // grails.codegen.model, for add-property
     implementation 'org.apache.groovy:groovy'
 
-    implementation "com.fizzed:rocker-runtime:$rockerVersion"
+    // renders the compiled pages, without a web request
+    implementation 'org.apache.grails.views:grails-gsp-core'
+    // the page compiler compileGroovyPages forks, which lives in the web GSP module; needed to build
+    // the pages only
+    compileOnly 'org.apache.grails.views:grails-web-gsp'
+    compileOnly 'jakarta.servlet:jakarta.servlet-api'
     implementation "info.picocli:picocli:$picocliVersion"
     implementation "info.picocli:picocli-shell-jline3:$picocliVersion"
     implementation 'jakarta.inject:jakarta.inject-api'
@@ -125,8 +123,10 @@ dependencies {
     testRuntimeOnly 'org.objenesis:objenesis'
 }
 
-rocker {
-    postProcessing = ['org.grails.forge.rocker.plugin.WhitespaceProcessor']
+// The specs render the pages as the application ships them, compiled. The GSP plugin leaves the
+// compiled pages off a Grails build's test class path, where an application renders its views from source.
+tasks.named('test', Test).configure { Test test ->
+    test.classpath += files(layout.buildDirectory.dir('gsp-classes/main')).builtBy('compileGroovyPages')
 }
 
 apply {
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/controller.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/controller.gsp
similarity index 72%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/controller.rocker.raw
rename to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/controller.gsp
index 40752b5db9..39529f95a2 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/controller.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/controller.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,21 +15,16 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
 
-@import org.grails.forge.application.Project
+<% } %>
 
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
-
-class @project.getClassName()Controller {
+class ${project.getClassName()}Controller {
 
     def index() {
 
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/controllerSpec.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/controllerSpec.gsp
similarity index 71%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/controllerSpec.rocker.raw
rename to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/controllerSpec.gsp
index 7fd9339f26..d4a80ba03f 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/controllerSpec.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/controllerSpec.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,23 +15,18 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+
+<% } %>
 import grails.testing.web.controllers.ControllerUnitTest
 import spock.lang.Specification
 
-class @project.getClassName()ControllerSpec extends Specification implements ControllerUnitTest<@project.getClassName()Controller> {
+class ${project.getClassName()}ControllerSpec extends Specification implements ControllerUnitTest<${project.getClassName()}Controller> {
 
      void "test index action"() {
         when:
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domain.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/domain.gsp
similarity index 73%
copy from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domain.rocker.raw
copy to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/domain.gsp
index 2d56d6b91d..1d12dd2399 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domain.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/domain.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,20 +15,15 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
-class @project.getClassName() {
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+
+<% } %>
+class ${project.getClassName()} {
 
     static constraints = {
     }
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domainSpec.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/domainSpec.gsp
similarity index 69%
copy from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domainSpec.rocker.raw
copy to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/domainSpec.gsp
index 47c7d3dcd6..ded23f46fc 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domainSpec.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/domainSpec.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,27 +15,22 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+
+<% } %>
 import grails.testing.gorm.DomainUnitTest
 import spock.lang.Specification
 
-class @project.getClassName()Spec extends Specification implements DomainUnitTest<@project.getClassName()> {
+class ${project.getClassName()}Spec extends Specification implements DomainUnitTest<${project.getClassName()}> {
 
      void "test domain constraints"() {
         when:
-        @project.getClassName() domain = new @project.getClassName()()
+        ${project.getClassName()} domain = new ${project.getClassName()}()
         //TODO: Set domain props here
 
         then:
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/interceptor.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/interceptor.gsp
similarity index 74%
copy from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/interceptor.rocker.raw
copy to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/interceptor.gsp
index 2c5a447356..64d7a37797 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/interceptor.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/interceptor.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,20 +15,15 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
-class @project.getClassName()Interceptor {
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+
+<% } %>
+class ${project.getClassName()}Interceptor {
 
       boolean before() { true }
 
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/interceptorSpec.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/interceptorSpec.gsp
similarity index 67%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/interceptorSpec.rocker.raw
rename to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/interceptorSpec.gsp
index 331a29795d..7099dce931 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/interceptorSpec.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/interceptorSpec.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,27 +15,22 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+
+<% } %>
 import grails.testing.web.interceptor.InterceptorUnitTest
 import spock.lang.Specification
 
-class @project.getClassName()InterceptorSpec extends Specification implements InterceptorUnitTest<@project.getClassName()Interceptor> {
+class ${project.getClassName()}InterceptorSpec extends Specification implements InterceptorUnitTest<${project.getClassName()}Interceptor> {
 
     void "test interceptor matching"() {
         when:
-        withRequest(controller: "@project.getClassName().toLowerCase()")
+        withRequest(controller: "${project.getClassName().toLowerCase()}")
 
         then:
         interceptor.doesMatch()
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/job.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/job.gsp
similarity index 76%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/job.rocker.raw
rename to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/job.gsp
index a4c2eb9fb3..12223f3b84 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/job.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/job.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,21 +15,16 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
 
-@import org.grails.forge.application.Project
+<% } %>
 
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
-
-class @project.getClassName()Job {
+class ${project.getClassName()}Job {
 
     static triggers = {
         simple repeatInterval: 5000l // execute job once in 5 seconds
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/service.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/service.gsp
similarity index 73%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/service.rocker.raw
rename to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/service.gsp
index ac7531b014..dd26f696fa 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/service.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/service.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,23 +15,18 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+
+<% } %>
 import groovy.transform.CompileStatic
 
-@@CompileStatic
-class @project.getClassName()Service {
+@CompileStatic
+class ${project.getClassName()}Service {
 
     def doSomething() {
 
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/serviceSpec.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/serviceSpec.gsp
similarity index 71%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/serviceSpec.rocker.raw
rename to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/serviceSpec.gsp
index e36a202057..d53c8e4852 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/serviceSpec.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/serviceSpec.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,23 +15,18 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+
+<% } %>
 import grails.testing.services.ServiceUnitTest
 import spock.lang.Specification
 
-class @project.getClassName()ServiceSpec extends Specification implements ServiceUnitTest<@project.getClassName()Service> {
+class ${project.getClassName()}ServiceSpec extends Specification implements ServiceUnitTest<${project.getClassName()}Service> {
 
      void "test something"() {
         expect:
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/taglib.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/taglib.gsp
similarity index 73%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/taglib.rocker.raw
rename to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/taglib.gsp
index 54c4355418..ce2e551335 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/taglib.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/taglib.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,21 +15,16 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
 
-@import org.grails.forge.application.Project
+<% } %>
 
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
-
-class @project.getClassName()TagLib {
+class ${project.getClassName()}TagLib {
 
     def simple = { attrs, body ->
 
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/taglibSpec.rocker.raw b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/taglibSpec.gsp
similarity index 71%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/taglibSpec.rocker.raw
rename to grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/taglibSpec.gsp
index 525537e574..c6cb06a58e 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/taglibSpec.rocker.raw
+++ b/grails-forge/grails-forge-cli/grails-app/views/forge/cli/command/templates/taglibSpec.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,23 +15,18 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+
+<% } %>
 import grails.testing.web.taglib.TagLibUnitTest
 import spock.lang.Specification
 
-class @project.getClassName()TagLibSpec extends Specification implements TagLibUnitTest<@project.getClassName()TagLib> {
+class ${project.getClassName()}TagLibSpec extends Specification implements TagLibUnitTest<${project.getClassName()}TagLib> {
 
      void "test simple tag as method"() {
        expect:
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateControllerCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateControllerCommand.groovy
index b280d216bc..87565013ac 100644
--- a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateControllerCommand.groovy
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateControllerCommand.groovy
@@ -23,13 +23,12 @@ import org.grails.forge.util.ThrowingSupplier
 import jakarta.inject.Inject
 import org.grails.forge.application.Project
 import org.grails.forge.cli.CodeGenConfig
-import org.grails.forge.cli.command.templates.controller
-import org.grails.forge.cli.command.templates.controllerSpec
 import org.grails.forge.io.ConsoleOutput
 import org.grails.forge.io.OutputHandler
 import org.grails.forge.template.RenderResult
-import org.grails.forge.template.RockerTemplate
 import org.grails.forge.template.TemplateRenderer
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import picocli.CommandLine
 
 @CommandLine.Command(name = CreateControllerCommand.NAME, description = 'Creates a Grails Controller')
@@ -61,8 +60,8 @@ class CreateControllerCommand extends CodeGenCommand {
     Integer call() throws Exception {
         final Project project = getProject(controllerName)
         TemplateRenderer templateRenderer = getTemplateRenderer(project)
-        final RenderResult controllerRenderResult = templateRenderer.render(new RockerTemplate('grails-app/controllers/{packagePath}/{className}Controller.groovy', controller.template(project)), overwrite)
-        final RenderResult controllerSpecRenderResult = templateRenderer.render(new RockerTemplate('src/test/groovy/{packagePath}/{className}ControllerSpec.groovy', controllerSpec.template(project)), overwrite)
+        final RenderResult controllerRenderResult = templateRenderer.render(new GspTemplate('grails-app/controllers/{packagePath}/{className}Controller.groovy', GspView.of('/forge/cli/command/templates/controller.gsp', [project: project])), overwrite)
+        final RenderResult controllerSpecRenderResult = templateRenderer.render(new GspTemplate('src/test/groovy/{packagePath}/{className}ControllerSpec.groovy', GspView.of('/forge/cli/command/templates/controllerSpec.gsp', [project: project])), overwrite)
         if (controllerRenderResult != null && controllerSpecRenderResult != null) {
             logRenderResult(controllerRenderResult)
             logRenderResult(controllerSpecRenderResult)
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateDomainClassCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateDomainClassCommand.groovy
index 2026e5a36d..cad4e2956f 100644
--- a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateDomainClassCommand.groovy
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateDomainClassCommand.groovy
@@ -23,13 +23,12 @@ import org.grails.forge.util.ThrowingSupplier
 import jakarta.inject.Inject
 import org.grails.forge.application.Project
 import org.grails.forge.cli.CodeGenConfig
-import org.grails.forge.cli.command.templates.domain
-import org.grails.forge.cli.command.templates.domainSpec
 import org.grails.forge.io.ConsoleOutput
 import org.grails.forge.io.OutputHandler
 import org.grails.forge.template.RenderResult
-import org.grails.forge.template.RockerTemplate
 import org.grails.forge.template.TemplateRenderer
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import picocli.CommandLine
 
 @CommandLine.Command(name = CreateDomainClassCommand.NAME, description = 'Creates a Domain Class')
@@ -61,8 +60,8 @@ class CreateDomainClassCommand extends CodeGenCommand {
     Integer call() throws Exception {
         final Project project = getProject(domainClassName)
         final TemplateRenderer templateRenderer = getTemplateRenderer(project)
-        final RenderResult domainRenderResult = templateRenderer.render(new RockerTemplate('grails-app/domain/{packagePath}/{className}.groovy', domain.template(project)), overwrite)
-        final RenderResult domainSpecRenderResult = templateRenderer.render(new RockerTemplate('src/test/groovy/{packagePath}/{className}Spec.groovy', domainSpec.template(project)), overwrite)
+        final RenderResult domainRenderResult = templateRenderer.render(new GspTemplate('grails-app/domain/{packagePath}/{className}.groovy', GspView.of('/forge/cli/command/templates/domain.gsp', [project: project])), overwrite)
+        final RenderResult domainSpecRenderResult = templateRenderer.render(new GspTemplate('src/test/groovy/{packagePath}/{className}Spec.groovy', GspView.of('/forge/cli/command/templates/domainSpec.gsp', [project: project])), overwrite)
         if (domainRenderResult != null && domainSpecRenderResult != null) {
             logRenderResult(domainRenderResult)
             logRenderResult(domainSpecRenderResult)
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateInterceptorCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateInterceptorCommand.groovy
index 67f451b29e..de4f1cc4c4 100644
--- a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateInterceptorCommand.groovy
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateInterceptorCommand.groovy
@@ -23,13 +23,12 @@ import org.grails.forge.util.ThrowingSupplier
 import jakarta.inject.Inject
 import org.grails.forge.application.Project
 import org.grails.forge.cli.CodeGenConfig
-import org.grails.forge.cli.command.templates.interceptor
-import org.grails.forge.cli.command.templates.interceptorSpec
 import org.grails.forge.io.ConsoleOutput
 import org.grails.forge.io.OutputHandler
 import org.grails.forge.template.RenderResult
-import org.grails.forge.template.RockerTemplate
 import org.grails.forge.template.TemplateRenderer
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import picocli.CommandLine
 
 @CommandLine.Command(name = CreateInterceptorCommand.NAME, description = 'Creates a Interceptor Class')
@@ -61,8 +60,8 @@ class CreateInterceptorCommand extends CodeGenCommand {
     Integer call() throws Exception {
         final Project project = getProject(interceptorName)
         final TemplateRenderer templateRenderer = getTemplateRenderer(project)
-        final RenderResult renderResult = templateRenderer.render(new RockerTemplate('grails-app/controllers/{packagePath}/{className}Interceptor.groovy', interceptor.template(project)), overwrite)
-        final RenderResult specRenderResult = templateRenderer.render(new RockerTemplate('src/test/groovy/{packagePath}/{className}InterceptorSpec.groovy', interceptorSpec.template(project)), overwrite)
+        final RenderResult renderResult = templateRenderer.render(new GspTemplate('grails-app/controllers/{packagePath}/{className}Interceptor.groovy', GspView.of('/forge/cli/command/templates/interceptor.gsp', [project: project])), overwrite)
+        final RenderResult specRenderResult = templateRenderer.render(new GspTemplate('src/test/groovy/{packagePath}/{className}InterceptorSpec.groovy', GspView.of('/forge/cli/command/templates/interceptorSpec.gsp', [project: project])), overwrite)
         if (renderResult != null && specRenderResult != null) {
             logRenderResult(renderResult)
             logRenderResult(specRenderResult)
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateJobCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateJobCommand.groovy
index 786e674889..9c6cda23cd 100644
--- a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateJobCommand.groovy
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateJobCommand.groovy
@@ -23,12 +23,12 @@ import org.grails.forge.util.ThrowingSupplier
 import jakarta.inject.Inject
 import org.grails.forge.application.Project
 import org.grails.forge.cli.CodeGenConfig
-import org.grails.forge.cli.command.templates.job
 import org.grails.forge.feature.other.GrailsQuartz
 import org.grails.forge.io.ConsoleOutput
 import org.grails.forge.io.OutputHandler
 import org.grails.forge.template.RenderResult
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import picocli.CommandLine
 
 @CommandLine.Command(name = CreateJobCommand.NAME, description = 'Creates a new Quartz scheduled job')
@@ -63,7 +63,7 @@ class CreateJobCommand extends CodeGenCommand {
         }
         final Project project = getProject(jobName)
         final RenderResult result = getTemplateRenderer(project)
-            .render(new RockerTemplate('grails-app/jobs/{packagePath}/{className}Job.groovy', job.template(project)), overwrite)
+            .render(new GspTemplate('grails-app/jobs/{packagePath}/{className}Job.groovy', GspView.of('/forge/cli/command/templates/job.gsp', [project: project])), overwrite)
         if (result != null) {
             logRenderResult(result)
         }
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateServiceCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateServiceCommand.groovy
index 6d5f714854..84b83de0d3 100644
--- a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateServiceCommand.groovy
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateServiceCommand.groovy
@@ -23,13 +23,12 @@ import org.grails.forge.util.ThrowingSupplier
 import jakarta.inject.Inject
 import org.grails.forge.application.Project
 import org.grails.forge.cli.CodeGenConfig
-import org.grails.forge.cli.command.templates.service
-import org.grails.forge.cli.command.templates.serviceSpec
 import org.grails.forge.io.ConsoleOutput
 import org.grails.forge.io.OutputHandler
 import org.grails.forge.template.RenderResult
-import org.grails.forge.template.RockerTemplate
 import org.grails.forge.template.TemplateRenderer
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import picocli.CommandLine
 
 @CommandLine.Command(name = CreateServiceCommand.NAME, description = 'Creates a Service Class')
@@ -61,8 +60,8 @@ class CreateServiceCommand extends CodeGenCommand {
     Integer call() throws Exception {
         final Project project = getProject(serviceName)
         final TemplateRenderer templateRenderer = getTemplateRenderer(project)
-        final RenderResult renderResult = templateRenderer.render(new RockerTemplate('grails-app/services/{packagePath}/{className}Service.groovy', service.template(project)), overwrite)
-        final RenderResult specRenderResult = templateRenderer.render(new RockerTemplate('src/test/groovy/{packagePath}/{className}ServiceSpec.groovy', serviceSpec.template(project)), overwrite)
+        final RenderResult renderResult = templateRenderer.render(new GspTemplate('grails-app/services/{packagePath}/{className}Service.groovy', GspView.of('/forge/cli/command/templates/service.gsp', [project: project])), overwrite)
+        final RenderResult specRenderResult = templateRenderer.render(new GspTemplate('src/test/groovy/{packagePath}/{className}ServiceSpec.groovy', GspView.of('/forge/cli/command/templates/serviceSpec.gsp', [project: project])), overwrite)
         if (renderResult != null && specRenderResult != null) {
             logRenderResult(renderResult)
             logRenderResult(specRenderResult)
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateTagLibCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateTagLibCommand.groovy
index 36f3c2cfaa..1c48f25922 100644
--- a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateTagLibCommand.groovy
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateTagLibCommand.groovy
@@ -23,13 +23,12 @@ import org.grails.forge.util.ThrowingSupplier
 import jakarta.inject.Inject
 import org.grails.forge.application.Project
 import org.grails.forge.cli.CodeGenConfig
-import org.grails.forge.cli.command.templates.taglib
-import org.grails.forge.cli.command.templates.taglibSpec
 import org.grails.forge.io.ConsoleOutput
 import org.grails.forge.io.OutputHandler
 import org.grails.forge.template.RenderResult
-import org.grails.forge.template.RockerTemplate
 import org.grails.forge.template.TemplateRenderer
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import picocli.CommandLine
 
 @CommandLine.Command(name = CreateTagLibCommand.NAME, description = 'Creates a Grails TagLib')
@@ -61,8 +60,8 @@ class CreateTagLibCommand extends CodeGenCommand {
     Integer call() throws Exception {
         final Project project = getProject(tagLibName)
         TemplateRenderer templateRenderer = getTemplateRenderer(project)
-        final RenderResult controllerRenderResult = templateRenderer.render(new RockerTemplate('grails-app/taglib/{packagePath}/{className}TagLib.groovy', taglib.template(project)), overwrite)
-        final RenderResult controllerSpecRenderResult = templateRenderer.render(new RockerTemplate('src/test/groovy/{packagePath}/{className}TagLibSpec.groovy', taglibSpec.template(project)), overwrite)
+        final RenderResult controllerRenderResult = templateRenderer.render(new GspTemplate('grails-app/taglib/{packagePath}/{className}TagLib.groovy', GspView.of('/forge/cli/command/templates/taglib.gsp', [project: project])), overwrite)
+        final RenderResult controllerSpecRenderResult = templateRenderer.render(new GspTemplate('src/test/groovy/{packagePath}/{className}TagLibSpec.groovy', GspView.of('/forge/cli/command/templates/taglibSpec.gsp', [project: project])), overwrite)
         if (controllerRenderResult != null && controllerSpecRenderResult != null) {
             logRenderResult(controllerRenderResult)
             logRenderResult(controllerSpecRenderResult)
diff --git a/grails-forge/grails-forge-core/build.gradle b/grails-forge/grails-forge-core/build.gradle
index 1ed4d4ac20..983d93832b 100644
--- a/grails-forge/grails-forge-core/build.gradle
+++ b/grails-forge/grails-forge-core/build.gradle
@@ -23,7 +23,8 @@ plugins {
     id 'org.apache.grails.buildsrc.properties'
     id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.gradle.grails-plugin'
-    id 'org.grails.forge.rocker'
+    // the generator's pages, under grails-app/views/forge, are GSPs compiled with the plugin
+    id 'org.apache.grails.gradle.grails-gsp'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
@@ -46,14 +47,6 @@ grails {
     native2ascii = false
 }
 
-sourceSets {
-    main {
-        rocker {
-            srcDir('src/main/java')
-        }
-    }
-}
-
 dependencies {
     implementation platform("org.apache.grails:grails-bom:$projectVersion")
 
@@ -65,9 +58,14 @@ dependencies {
     api 'jakarta.annotation:jakarta.annotation-api'
     api 'jakarta.inject:jakarta.inject-api'
     api 'jakarta.validation:jakarta.validation-api'
-    api "com.fizzed:rocker-runtime:$rockerVersion"
     api "io.github.java-diff-utils:java-diff-utils:$javaDiffUtils"
 
+    // renders the compiled pages, without a web request
+    implementation 'org.apache.grails.views:grails-gsp-core'
+    // the page compiler compileGroovyPages forks, which lives in the web GSP module; needed to build
+    // the pages only, the plugin renders them with grails-gsp-core alone
+    compileOnly 'org.apache.grails.views:grails-web-gsp'
+    compileOnly 'jakarta.servlet:jakarta.servlet-api'
     implementation "com.typesafe:config:$typesafeConfigVersion"
     implementation "org.apache.commons:commons-compress:$commonsCompressVersion"
     implementation "org.yaml:snakeyaml"
@@ -100,10 +98,6 @@ tasks.named('build').configure {
     it.dependsOn(grailsVersionInfoTask)
 }
 
-rocker {
-    postProcessing = ['org.grails.forge.rocker.plugin.WhitespaceProcessor']
-}
-
 // A Grails plugin's GSPs are its views, compiled rather than packaged, so the plugin build keeps them out
 // of the resources. The GSPs under src/main/resources/gsp are templates the generator writes into
 // generated applications, not views of this plugin, so they stay in.
@@ -141,3 +135,8 @@ apply {
         it.dependsOn(copyGrailsWrapper, grailsVersionInfoTask)
     }
 }
+// The specs render the pages as the plugin ships them, compiled. The GSP plugin leaves the compiled
+// pages off a Grails build's test class path, where an application renders its views from source.
+tasks.named('test', Test).configure { Test test ->
+    test.classpath += files(layout.buildDirectory.dir('gsp-classes/main')).builtBy('compileGroovyPages')
+}
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/asciidoctor/template/asciidocGradle.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/asciidoctor/template/asciidocGradle.gsp
similarity index 83%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/asciidoctor/template/asciidocGradle.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/asciidoctor/template/asciidocGradle.gsp
index 7b80b749f9..ac9f447d7b 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/asciidoctor/template/asciidocGradle.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/asciidoctor/template/asciidocGradle.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,18 +15,15 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@args (
-  String asciidoctorjVersion,
-  String asciidoctorjModuleDiagramVersion
-)
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ model="String asciidoctorjVersion" %>
+<%@ model="String asciidoctorjModuleDiagramVersion" %>
 asciidoctorj {
-    version '@asciidoctorjVersion'
+    version '${asciidoctorjVersion}'
     modules {
         diagram {
-            version '@asciidoctorjModuleDiagramVersion'
+            version '${asciidoctorjModuleDiagramVersion}'
         }
     }
 
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/asciidoctor/template/indexAdoc.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/asciidoctor/template/indexAdoc.gsp
similarity index 94%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/asciidoctor/template/indexAdoc.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/asciidoctor/template/indexAdoc.gsp
index ca1a5ac756..ba7b63f7df 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/asciidoctor/template/indexAdoc.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/asciidoctor/template/indexAdoc.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,10 +15,10 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 = Your Project
-author@@example.org
+author@example.org
 
 Write a short introduction about your project
 
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gitignore.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gitignore.gsp
similarity index 95%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gitignore.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gitignore.gsp
index 9f2b6ec366..357f0ef2a3 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gitignore.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gitignore.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 ### Gradle ###
 .gradle
 build/
diff --git a/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/buildGradle.gsp b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/buildGradle.gsp
new file mode 100644
index 0000000000..b83b0ab1ee
--- /dev/null
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/buildGradle.gsp
@@ -0,0 +1,140 @@
+%{--
+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.
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="java.util.function.Function" %>
+<%@ page import="org.grails.forge.application.ApplicationType" %>
+<%@ page import="org.grails.forge.build.dependencies.CoordinateResolver" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.build.dependencies.Coordinate" %>
+<%@ page import="org.grails.forge.build.gradle.GradleBuild" %>
+<%@ page import="org.grails.forge.build.gradle.GradleDsl" %>
+<%@ page import="org.grails.forge.build.gradle.GradlePlugin" %>
+<%@ page import="org.grails.forge.feature.Features" %>
+<%@ page import="org.grails.forge.util.VersionInfo" %>
+<%@ page import="org.grails.forge.options.JdkVersion" %>
+<%@ page import="org.grails.forge.build.gradle.GradleDependency" %>
+<%@ page import="org.grails.forge.build.gradle.GradleRepository" %>
+<%@ page import="org.grails.forge.template.GspView" %>
+<%@ model="ApplicationType applicationType" %>
+<%@ model="Project project" %>
+<%@ model="Function<String,Coordinate> coordinateResolver" %>
+<%@ model="Features features" %>
+<%@ model="GradleBuild gradleBuild" %>
+<%@ model="String grailsVersion" %>
+<% if (!features.contains('gradle-build-src') && !gradleBuild.getBuildscriptDependencies().isEmpty()) { %>
+buildscript {
+    repositories {
+        <% for (GradleRepository repo : gradleBuild.getBuildRepositories()) { %>
+        ${repo.toSnippet('        ')}
+        <% } %>
+    }
+    dependencies { // Not Published to Gradle Plugin Portal
+        <% for (GradleDependency dependency : gradleBuild.getBuildscriptDependencies()) { %>
+        ${dependency.toSnippet()}
+        <% } %>
+    }
+}
+
+<% } %>
+<% for (String importLine : gradleBuild.getPluginsImports()) { %>
+${importLine}<% } %>plugins {
+    <% for (GradlePlugin gradlePlugin : gradleBuild.getPluginsWithoutApply()) { %>
+    <% if (gradlePlugin.getVersion() != null) { %>
+    id "${gradlePlugin.getId()}" version "${gradlePlugin.getVersion()}"
+    <% } else { %>
+    id "${gradlePlugin.getId()}"
+    <% } %>
+    <% } %>
+}
+
+<% if (!gradleBuild.getPluginsWithApply().isEmpty()) { %>
+// Not Published to Gradle Plugin Portal
+<% for (GradlePlugin gradlePlugin : gradleBuild.getPluginsWithApply()) { %>
+apply plugin: "${gradlePlugin.getId()}"
+<% } %>
+<% } %>
+
+group = "${project.getPackageName()}"
+
+<% if (features.contains('asciidoctor')) { %>
+apply from: "gradle/asciidoc.gradle"
+<% } %>
+repositories {
+    <% for (GradleRepository repo : gradleBuild.getRepositories()) { %>
+    ${repo.toSnippet('    ')}
+    <% } %>
+}
+
+${GspView.of('/forge/feature/build/gradle/templates/dependencies.gsp', [applicationType: applicationType, project: project, features: features, gradleBuild: gradleBuild]).render()}
+compileJava.options.release = ${features.getTargetJdk()}
+
+<% if (features.contains('jrebel')) { %>
+tasks.named('bootRun') {
+    dependsOn(generateRebel)
+    if (project.hasProperty("rebelAgent")) {
+        jvmArgs(rebelAgent)
+    }
+}
+
+<% } %>
+<% if (features.contains('spock')) { %>
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+    <% if (features.contains('geb-with-local-browsers')) { %>
+    def gebEnv = providers.systemProperty('geb.env')
+    if (gebEnv.present) {
+        systemProperty('geb.env', gebEnv.get())
+    }
+    <% } %>
+}
+<% } %>
+${gradleBuild.renderExtensions()}
+<% if (features.contains('grails-compile-static')) { %>
+grails {
+    compileStatic {
+        controllers = true
+        services = true
+        tagLibs = true
+        <% if (features.contains('gsp')) { %>
+        gsp = true
+        <% } %>
+    }
+}
+
+<% } %>
+<% if (features.contains('asset-pipeline-grails')) { %>
+assets {
+    <% if (applicationType == ApplicationType.WEB_PLUGIN) { %>
+    packagePlugin = true
+    <% } %>
+    excludes = [
+            'webjars/jquery/**',
+            'webjars/bootstrap/**',
+            'webjars/bootstrap-icons/**'
+    ]
+    includes = [
+            'webjars/jquery/*/dist/jquery.js',
+            'webjars/bootstrap/*/dist/js/bootstrap.bundle.js',
+            'webjars/bootstrap/*/dist/css/bootstrap.css',
+            'webjars/bootstrap-icons/*/font/bootstrap-icons.css',
+            'webjars/bootstrap-icons/*/font/fonts/*',
+    ]
+}
+
+<% } %>
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/buildSrcBuildGradle.gsp
similarity index 56%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/buildSrcBuildGradle.gsp
index 1dff5a907c..ba41036b26 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildSrcBuildGradle.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/buildSrcBuildGradle.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,24 +15,20 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.ApplicationType
-@import org.grails.forge.application.Project
-@import org.grails.forge.feature.Features
-@import org.grails.forge.build.gradle.GradleBuild
-@import org.grails.forge.build.gradle.GradleDependency
-@import org.grails.forge.build.gradle.GradleRepository
-@import org.grails.forge.util.VersionInfo
-
-@args (
-ApplicationType applicationType,
-Project project,
-Features features,
-GradleBuild gradleBuild,
-String grailsVersion
-)
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.ApplicationType" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.feature.Features" %>
+<%@ page import="org.grails.forge.build.gradle.GradleBuild" %>
+<%@ page import="org.grails.forge.build.gradle.GradleDependency" %>
+<%@ page import="org.grails.forge.build.gradle.GradleRepository" %>
+<%@ page import="org.grails.forge.util.VersionInfo" %>
+<%@ model="ApplicationType applicationType" %>
+<%@ model="Project project" %>
+<%@ model="Features features" %>
+<%@ model="GradleBuild gradleBuild" %>
+<%@ model="String grailsVersion" %>
 // load the root gradle.properties only for properties not already set
 // (e.g., buildSrc/gradle.properties or by environment variables like ORG_GRADLE_PROJECT_grailsVersion=7.0.0)
 // https://github.com/gradle/gradle/issues/2534
@@ -45,22 +41,22 @@ props.each { key, val ->
 }
 
 repositories {
-@for (GradleRepository repo : gradleBuild.getBuildRepositories()) {
-    @repo.toSnippet("    ")
-}
+    <% for (GradleRepository repo : gradleBuild.getBuildRepositories()) { %>
+    ${repo.toSnippet('    ')}
+    <% } %>
 }
 
 dependencies {
-@if (features.contains("gorm-hibernate7") && features.contains("grails-micronaut")) {
+    <% if (features.contains('gorm-hibernate7') && features.contains('grails-micronaut')) { %>
     implementation platform("org.apache.grails:grails-hibernate7-micronaut-bom:$grailsVersion")
-} else if (features.contains("grails-micronaut")) {
+    <% } else if (features.contains('grails-micronaut')) { %>
     implementation platform("org.apache.grails:grails-micronaut-bom:$grailsVersion")
-} else if (features.contains("gorm-hibernate7")) {
+    <% } else if (features.contains('gorm-hibernate7')) { %>
     implementation platform("org.apache.grails:grails-hibernate7-bom:$grailsVersion")
-} else {
+    <% } else { %>
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
-}
-@for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) {
-    @dependency.toSnippet()
-}
+    <% } %>
+    <% for (GradleDependency dependency : gradleBuild.getBuildSrcDependencies()) { %>
+    ${dependency.toSnippet()}
+    <% } %>
 }
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/dependencies.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/dependencies.gsp
similarity index 54%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/dependencies.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/dependencies.gsp
index 374491aed6..54180703ba 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/dependencies.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/dependencies.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,23 +15,19 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.ApplicationType
-@import org.grails.forge.application.Project
-@import org.grails.forge.build.gradle.GradleBuild
-@import org.grails.forge.build.gradle.GradleDependency
-@import org.grails.forge.feature.Features
-
-@args (
-ApplicationType applicationType,
-Project project,
-Features features,
-GradleBuild gradleBuild
-)
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.ApplicationType" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.build.gradle.GradleBuild" %>
+<%@ page import="org.grails.forge.build.gradle.GradleDependency" %>
+<%@ page import="org.grails.forge.feature.Features" %>
+<%@ model="ApplicationType applicationType" %>
+<%@ model="Project project" %>
+<%@ model="Features features" %>
+<%@ model="GradleBuild gradleBuild" %>
 dependencies {
-@for (GradleDependency dependency : gradleBuild.getDependencies()) {
-    @dependency.toSnippet()
-}
+    <% for (GradleDependency dependency : gradleBuild.getDependencies()) { %>
+    ${dependency.toSnippet()}
+    <% } %>
 }
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/interceptor.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleProperties.gsp
similarity index 67%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/interceptor.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleProperties.gsp
index 2c5a447356..7b37feb535 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/interceptor.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleProperties.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,27 +15,15 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
-class @project.getClassName()Interceptor {
-
-      boolean before() { true }
-
-      boolean after() { true }
-
-      void afterView() {
-        // no-op
-      }
-
-}
\ No newline at end of file
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.build.Property" %>
+<%@ page import="java.util.List" %>
+<%@ model="List<Property> properties" %>
+<% for (Property prop : properties) { %>
+<% if (prop.isComment()) { %>
+#${prop.getComment()}
+<% } else { %>
+${prop.getKey()}=${prop.getValue()}
+<% } %>
+<% } %>
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
similarity index 55%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
index 0e9b5f1811..bc838ad089 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,23 +15,20 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import java.util.function.Function
-@import org.grails.forge.application.Project
-@import org.grails.forge.build.dependencies.CoordinateResolver
-@import org.grails.forge.build.dependencies.Coordinate
-@import org.grails.forge.build.gradle.GradleBuild
-@import org.grails.forge.build.gradle.GradlePlugin
-@import org.grails.forge.feature.Features
-
-@args (
-Project project,
-GradleBuild gradleBuild,
-Function<String, Coordinate> coordinateResolver,
-Features features)
-
-@* Keep gradle version synced with .sdkmanrc, gradle.properties (gradleToolingApiVersion), all gradle-wrapper.properties files *@
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="java.util.function.Function" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.build.dependencies.CoordinateResolver" %>
+<%@ page import="org.grails.forge.build.dependencies.Coordinate" %>
+<%@ page import="org.grails.forge.build.gradle.GradleBuild" %>
+<%@ page import="org.grails.forge.build.gradle.GradlePlugin" %>
+<%@ page import="org.grails.forge.feature.Features" %>
+<%@ model="Project project" %>
+<%@ model="GradleBuild gradleBuild" %>
+<%@ model="Function<String,Coordinate> coordinateResolver" %>
+<%@ model="Features features" %>
+%{-- Keep gradle version synced with .sdkmanrc, gradle.properties (gradleToolingApiVersion), all gradle-wrapper.properties files --}%
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domain.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/settingsGradle.gsp
similarity index 50%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domain.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/settingsGradle.gsp
index 2d56d6b91d..5b86e2d889 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domain.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/settingsGradle.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,21 +15,17 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
-class @project.getClassName() {
-
-    static constraints = {
-    }
-}
\ No newline at end of file
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="java.util.function.Function" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.build.dependencies.CoordinateResolver" %>
+<%@ page import="org.grails.forge.build.dependencies.Coordinate" %>
+<%@ page import="org.grails.forge.build.gradle.GradleBuild" %>
+<%@ page import="org.grails.forge.build.gradle.GradlePlugin" %>
+<%@ page import="org.grails.forge.feature.Features" %>
+<%@ model="Project project" %>
+<%@ model="GradleBuild gradleBuild" %>
+<%@ model="Function<String,Coordinate> coordinateResolver" %>
+<%@ model="Features features" %>
+${gradleBuild.renderSettingsExtensions()}rootProject.name = "${project.getName()}"
\ No newline at end of file
diff --git a/grails-forge/grails-forge-core/grails-app/views/forge/feature/cli.gsp b/grails-forge/grails-forge-core/grails-app/views/forge/feature/cli.gsp
new file mode 100644
index 0000000000..66ce80ca2f
--- /dev/null
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/cli.gsp
@@ -0,0 +1,43 @@
+%{--
+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.
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.options.Language" %>
+<%@ page import="org.grails.forge.options.DevelopmentReloading" %>
+<%@ page import="org.grails.forge.options.BuildTool" %>
+<%@ page import="org.grails.forge.options.GormImpl" %>
+<%@ page import="org.grails.forge.options.ServletImpl" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.application.ApplicationType" %>
+<%@ page import="java.util.List" %>
+<%@ model="Language language" %>
+<%@ model="DevelopmentReloading reloading" %>
+<%@ model="BuildTool buildTool" %>
+<%@ model="GormImpl gormImpl" %>
+<%@ model="ServletImpl servletImpl" %>
+<%@ model="Project project" %>
+<%@ model="List<String> features" %>
+<%@ model="ApplicationType applicationType" %>
+applicationType: ${applicationType.getName()}
+defaultPackage: ${project.getPackageName()}
+reloading: ${reloading.getName()}
+sourceLanguage: ${language.getName()}
+buildTool: ${buildTool.getName()}
+gormImpl: ${gormImpl.getName()}
+servletImpl: ${servletImpl.getName()}
+features: ${features.toString()}
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/github/workflows/plain/templates/plainGithubWorkflow.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/github/workflows/plain/templates/plainGithubWorkflow.gsp
similarity index 77%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/github/workflows/plain/templates/plainGithubWorkflow.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/github/workflows/plain/templates/plainGithubWorkflow.gsp
index fdd0c98808..8219ff4320 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/github/workflows/plain/templates/plainGithubWorkflow.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/github/workflows/plain/templates/plainGithubWorkflow.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,17 +15,13 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-@import org.grails.forge.options.JdkVersion
-@import org.grails.forge.feature.github.workflows.templates.javaSetup
-
-@args (
-Project project,
-JdkVersion jdkVersion
-)
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.options.JdkVersion" %>
+<%@ page import="org.grails.forge.template.GspView" %>
+<%@ model="Project project" %>
+<%@ model="JdkVersion jdkVersion" %>
 name: Java CI
 on: [push, pull_request]
 jobs:
@@ -35,9 +31,8 @@ jobs:
       checks: write
       contents: read
     steps:
-@javaSetup.template(jdkVersion)
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@@v6.1.0
+${GspView.of('/forge/feature/github/workflows/templates/javaSetup.gsp', [jdkVersion: jdkVersion]).render()}      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6.1.0
         with:
           # 'basic' is the MIT-licensed cache provider; the default 'enhanced' provider is proprietary (Gradle commercial Terms of Use)
           cache-provider: basic
@@ -57,6 +52,6 @@ jobs:
         run: ./gradlew build
       - name: Publish Test Report
         if: failure()
-        uses: scacap/action-surefire-report@@v1
+        uses: scacap/action-surefire-report@v1
         with:
           report_paths: '**/build/test-results/**/TEST-*.xml'
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/github/workflows/templates/javaSetup.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/github/workflows/templates/javaSetup.gsp
similarity index 66%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/github/workflows/templates/javaSetup.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/github/workflows/templates/javaSetup.gsp
index 953e41d55b..745781c8f4 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/github/workflows/templates/javaSetup.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/github/workflows/templates/javaSetup.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,18 +15,14 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.options.JdkVersion
-@import org.grails.forge.application.Project
-
-@args (
-JdkVersion jdkVersion
-)
-
-      - uses: actions/checkout@@v6.0.2
-      - name: Set up JDK @jdkVersion.majorVersion()
-        uses: actions/setup-java@@v5.2.0
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.options.JdkVersion" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="JdkVersion jdkVersion" %>
+      - uses: actions/checkout@v6.0.2
+      - name: Set up JDK ${jdkVersion.majorVersion()}
+        uses: actions/setup-java@v5.2.0
         with:
           distribution: 'liberica'
-          java-version: @jdkVersion.majorVersion()
+          java-version: ${jdkVersion.majorVersion()}
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/applicationController.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/grails/templates/applicationController.gsp
similarity index 85%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/applicationController.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/grails/templates/applicationController.gsp
index f3e230e1b1..e7e31a9c1a 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/applicationController.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/grails/templates/applicationController.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,13 +15,11 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args(Project project)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+package ${project.getPackageName()}
 
 import grails.core.GrailsApplication
 import grails.plugins.GrailsPluginManager
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/plugin.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/grails/templates/plugin.gsp
similarity index 73%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/plugin.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/grails/templates/plugin.gsp
index a90ba0cd7b..eb429f654e 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/plugin.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/grails/templates/plugin.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,42 +15,39 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-@import org.grails.forge.application.ApplicationType
-@import org.grails.forge.util.VersionInfo
-
-@args(Project project, ApplicationType applicationType)
-
-@grailsVersion => { @VersionInfo.getGrailsVersion() }
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.application.ApplicationType" %>
+<%@ page import="org.grails.forge.util.VersionInfo" %>
+<%@ model="Project project" %>
+<%@ model="ApplicationType applicationType" %>
+<% Closure grailsVersion = { -> %>
+${VersionInfo.getGrailsVersion()} <% } %>package ${project.getPackageName()}
 
 import grails.plugins.*
 
-class @project.getClassName()GrailsPlugin extends Plugin {
+class ${project.getClassName()}GrailsPlugin extends Plugin {
 
     // the version or versions of Grails the plugin is designed for
-       def grailsVersion = "@grailsVersion > *"
+       def grailsVersion = "${grailsVersion()} > *"
        // resources that are excluded from plugin packaging
        def pluginExcludes = [
            "grails-app/views/error.gsp"
        ]
 
        // TODO Fill in these fields
-       def title = "@project.getNaturalName()" // Headline display name of the plugin
+       def title = "${project.getNaturalName()}" // Headline display name of the plugin
        def author = "Your name"
        def authorEmail = ""
        def description = '''\
    Brief summary/description of the plugin.
    '''
-   @if(applicationType == ApplicationType.WEB_PLUGIN) {
+       <% if (applicationType == ApplicationType.WEB_PLUGIN) { %>
        def profiles = ['web']
-   }
-
+       <% } %>
    // URL to the plugin's documentation
-       def documentation = "https://grails-plugins.github.io/@project.getClassName()/"
+       def documentation = "https://grails-plugins.github.io/${project.getClassName()}/"
 
        // Extra (optional) plugin metadata
 
@@ -61,13 +58,13 @@ class @project.getClassName()GrailsPlugin extends Plugin {
    //    def organization = [ name: "My Company", url: "https://www.my-company.com/" ]
 
        // Any additional developers beyond the author specified above.
-   //    def developers = [ [ name: "Joe Bloggs", email: "joe@@bloggs.net" ]]
+   //    def developers = [ [ name: "Joe Bloggs", email: "joe@bloggs.net" ]]
 
        // Location of the plugin's issue tracker.
-   //    def issueManagement = [ system: "GitHub", url: "https://github.com/apache/@project.getClassName()/issues" ]
+   //    def issueManagement = [ system: "GitHub", url: "https://github.com/apache/${project.getClassName()}/issues" ]
 
        // Online location of the plugin's browseable source code.
-   //    def scm = [ url: "https://github.com/apache/@project.getClassName()" ]
+   //    def scm = [ url: "https://github.com/apache/${project.getClassName()}" ]
 
        Closure doWithSpring() { {->
                // TODO Implement runtime spring config (optional)
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/urlMappings.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/grails/templates/urlMappings.gsp
similarity index 73%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/urlMappings.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/grails/templates/urlMappings.gsp
index 379cb64d53..59dafa29cb 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/grails/templates/urlMappings.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/grails/templates/urlMappings.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,18 +15,17 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-@import org.grails.forge.application.ApplicationType
-
-@args (Project project, ApplicationType applicationType)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.application.ApplicationType" %>
+<%@ model="Project project" %>
+<%@ model="ApplicationType applicationType" %>
+package ${project.getPackageName()}
 
 class UrlMappings {
     static mappings = {
-@if(applicationType == ApplicationType.WEB || applicationType == ApplicationType.WEB_PLUGIN) {
+        <% if (applicationType == ApplicationType.WEB || applicationType == ApplicationType.WEB_PLUGIN) { %>
         "/$namespace/$controller/$action?/$id?(.$format)?" {}
         "/$controller/$action?/$id?(.$format)?"{
             constraints {
@@ -35,12 +34,12 @@ class UrlMappings {
         }
 
         "/"(view:"/index")
-@if(applicationType == ApplicationType.WEB) {
+        <% if (applicationType == ApplicationType.WEB) { %>
         // Browsers request /favicon.ico for pages that declare no icon of their own
         "/favicon.ico"(redirect: [uri: '/assets/favicon.ico', permanent: true])
-}
-}
-@if (applicationType == ApplicationType.REST_API) {
+        <% } %>
+        <% } %>
+        <% if (applicationType == ApplicationType.REST_API) { %>
         delete "/$controller/$id(.$format)?"(action:"delete")
         get "/$controller(.$format)?"(action:"index")
         get "/$controller/$id(.$format)?"(action:"show")
@@ -48,7 +47,7 @@ class UrlMappings {
         put "/$controller/$id(.$format)?"(action:"update")
         patch "/$controller/$id(.$format)?"(action:"patch")
         "/"(controller: 'application', action:'index')
-}
+        <% } %>
         "500"(view:'/error')
         "404"(view:'/notFound')
 
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/templates/application.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/lang/groovy/templates/application.gsp
similarity index 67%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/templates/application.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/lang/groovy/templates/application.gsp
index c732f95e19..acc3228b44 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/templates/application.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/lang/groovy/templates/application.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,53 +15,51 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.ApplicationType
-@import org.grails.forge.application.Project
-@import org.grails.forge.feature.Features
-
-@args (ApplicationType applicationType, Project project, Features features)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.ApplicationType" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.feature.Features" %>
+<%@ model="ApplicationType applicationType" %>
+<%@ model="Project project" %>
+<%@ model="Features features" %>
+package ${project.getPackageName()}
 
 import groovy.transform.CompileStatic
 
-@if(features.contains("grails-micronaut")) {
+<% if (features.contains('grails-micronaut')) { %>
 import io.micronaut.spring.boot.starter.EnableMicronaut
 
-}
-@if(features.contains("spring-boot-starter-security")) {
+<% } %>
+<% if (features.contains('spring-boot-starter-security')) { %>
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.crypto.factory.PasswordEncoderFactories
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.web.SecurityFilterChain
 
-}
+<% } %>
 import grails.boot.GrailsApp
 import grails.boot.config.GrailsAutoConfiguration
-@if(applicationType.equals(ApplicationType.PLUGIN) || applicationType.equals(ApplicationType.WEB_PLUGIN)) {
+<% if (applicationType.equals(ApplicationType.PLUGIN) || applicationType.equals(ApplicationType.WEB_PLUGIN)) { %>
 import grails.plugins.metadata.PluginSource
-}
+<% } %>
 
-
-@if(applicationType.equals(ApplicationType.PLUGIN) || applicationType.equals(ApplicationType.WEB_PLUGIN)) {
-@@PluginSource
-}
-@@CompileStatic
-@if(features.contains("grails-micronaut")) {
-@@EnableMicronaut
-}
-@if(features.contains("spring-boot-starter-security")) {
-@@EnableWebSecurity
-}
+<% if (applicationType.equals(ApplicationType.PLUGIN) || applicationType.equals(ApplicationType.WEB_PLUGIN)) { %>
+@PluginSource
+<% } %>
+@CompileStatic
+<% if (features.contains('grails-micronaut')) { %>
+@EnableMicronaut
+<% } %>
+<% if (features.contains('spring-boot-starter-security')) { %>
+@EnableWebSecurity
+<% } %>
 class Application extends GrailsAutoConfiguration {
     static void main(String[] args) {
         GrailsApp.run(Application, args)
     }
-@if(features.contains("spring-boot-starter-security")) {
-
+    <% if (features.contains('spring-boot-starter-security')) { %>
 
     def beans = {
 
@@ -81,5 +79,5 @@ class Application extends GrailsAutoConfiguration {
             http.build()
         }
     }
-}
+    <% } %>
 }
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/templates/bootStrap.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/lang/groovy/templates/bootStrap.gsp
similarity index 78%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/templates/bootStrap.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/lang/groovy/templates/bootStrap.gsp
index 0ba8d2254d..5aac26354d 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/templates/bootStrap.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/lang/groovy/templates/bootStrap.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,27 +15,24 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-@import org.grails.forge.feature.Features
-
-@args(Project project, Features features)
-
-package @project.getPackageName()
-
-@if(features.contains("spring-boot-starter-security")) {
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.feature.Features" %>
+<%@ model="Project project" %>
+<%@ model="Features features" %>
+package ${project.getPackageName()}
+
+<% if (features.contains('spring-boot-starter-security')) { %>
 import org.springframework.security.crypto.factory.PasswordEncoderFactories
 
-}
+<% } %>
 class BootStrap {
-@if(features.contains("grails-spring-security")) {
-
+    <% if (features.contains('grails-spring-security')) { %>
     def springSecurityService
-}
-
+    <% } %>
     def init = {
-@if(features.contains("spring-boot-starter-security")) {
+        <% if (features.contains('spring-boot-starter-security')) { %>
         User.withTransaction {
             def passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder()
             def password = UUID.randomUUID().toString()
@@ -47,8 +44,8 @@ class BootStrap {
             new User(username: 'user', password: passwordEncoder.encode(userPassword), roles: ['ROLE_USER']).save(failOnError: true)
             log.warn "Generated user credentials: user / $userPassword"
         }
-}
-@if(features.contains("grails-spring-security")) {
+        <% } %>
+        <% if (features.contains('grails-spring-security')) { %>
         User.withTransaction {
             def password = UUID.randomUUID().toString()
             def adminRole = new Role('ROLE_ADMIN').save(failOnError: true)
@@ -56,7 +53,7 @@ class BootStrap {
             UserRole.create(admin, adminRole, true)
             log.warn "Generated admin credentials: admin / $password"
         }
-}
+        <% } %>
     }
 
     def destroy = {
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/logging/template/logback.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/logging/template/logback.gsp
similarity index 89%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/logging/template/logback.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/logging/template/logback.gsp
index 594fc757c3..0b28b43518 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/logging/template/logback.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/logging/template/logback.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,10 +15,10 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@args (String projectName, String packageName)
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ model="String projectName" %>
+<%@ model="String packageName" %>
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
@@ -31,7 +31,7 @@ under the License.
     <springProfile name="development">
         <logger name="StackTrace" level="ERROR"/>
 
-<!--        <logger name="@packageName" level="DEBUG"/>-->
+<!--        <logger name="${packageName}" level="DEBUG"/>-->
 
 <!--        <logger name="org.hibernate.SQL" level="DEBUG"/>-->
 <!--        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>-->
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/migration/templates/dbMigrationGradle.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/migration/templates/dbMigrationGradle.gsp
similarity index 85%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/migration/templates/dbMigrationGradle.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/migration/templates/dbMigrationGradle.gsp
index 5f49c6167c..96f1050495 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/migration/templates/dbMigrationGradle.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/migration/templates/dbMigrationGradle.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,14 +15,13 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@args(String srcDirPath)
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ model="String srcDirPath" %>
 sourceSets {
     main {
         resources {
-            srcDir @srcDirPath
+            srcDir ${srcDirPath}
         }
     }
 }
\ No newline at end of file
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/template/maindocs.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/other/template/maindocs.gsp
similarity index 66%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/template/maindocs.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/other/template/maindocs.gsp
index 7582946345..a9ce1c1f12 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/template/maindocs.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/other/template/maindocs.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,20 +15,19 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.util.VersionInfo" %>
+<%@ page import="java.util.List" %>
+## Grails ${VersionInfo.getGrailsVersion()} Documentation
 
-@import org.grails.forge.util.VersionInfo
-@import java.util.List
-
-## Grails @VersionInfo.getGrailsVersion() Documentation
-
-@if (VersionInfo.isGrailsSnapshot()) {
+<% if (VersionInfo.isGrailsSnapshot()) { %>
 - [User Guide](https://grails.apache.org/docs/snapshot/guide/index.html)
 - [API Reference](https://grails.apache.org/docs/snapshot/api/index.html)
-} else {
-- [User Guide](https://grails.apache.org/docs/@VersionInfo.getGrailsVersion()/guide/index.html)
-- [API Reference](https://grails.apache.org/docs/@VersionInfo.getGrailsVersion()/api/index.html)
-}
+<% } else { %>
+- [User Guide](https://grails.apache.org/docs/${VersionInfo.getGrailsVersion()}/guide/index.html)
+- [API Reference](https://grails.apache.org/docs/${VersionInfo.getGrailsVersion()}/api/index.html)
+<% } %>
 - [Grails Guides](https://guides.grails.org/index.html)
 ---
 
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/template/markdownLink.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/other/template/markdownLink.gsp
similarity index 84%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/template/markdownLink.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/other/template/markdownLink.gsp
index 91a4a41da3..fe9177cdfa 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/template/markdownLink.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/other/template/markdownLink.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,7 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@args(String label, String href)
-- [@label](@href)
\ No newline at end of file
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ model="String label" %>
+<%@ model="String href" %>
+- [${label}](${href})
\ No newline at end of file
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domainSpec.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/other/template/readme.gsp
similarity index 54%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domainSpec.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/other/template/readme.gsp
index 47c7d3dcd6..346bd92cb5 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/templates/domainSpec.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/other/template/readme.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,30 +15,19 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-    Project project
-)
-
-@if(project.getPackageName() != null) {
-package @project.getPackageName()
-
-}
-
-import grails.testing.gorm.DomainUnitTest
-import spock.lang.Specification
-
-class @project.getClassName()Spec extends Specification implements DomainUnitTest<@project.getClassName()> {
-
-     void "test domain constraints"() {
-        when:
-        @project.getClassName() domain = new @project.getClassName()()
-        //TODO: Set domain props here
-
-        then:
-        domain.validate()
-     }
-}
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.feature.Feature" %>
+<%@ model="Feature feature" %>
+<% if (feature.getDocumentation() != null || feature.getThirdPartyDocumentation() != null) { %>
+## Feature ${feature.getName()} documentation
+
+<% if (feature.getDocumentation() != null) { %>
+- [Grails ${feature.getTitle().replaceFirst('^Grails\\s+(.*)', '$1')} documentation](${feature.getDocumentation()})
+
+<% } %>
+<% if (feature.getThirdPartyDocumentation() != null) { %>
+- [${feature.getThirdPartyDocumentation()}](${feature.getThirdPartyDocumentation()})
+
+<% } %>
+<% } %>
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/role.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/role.gsp
similarity index 78%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/role.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/role.gsp
index 50dc390454..871e2100ff 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/role.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/role.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,19 +15,17 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (Project project)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+package ${project.getPackageName()}
 
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
-@@EqualsAndHashCode(includes = 'authority')
-@@ToString(includes = 'authority', includeNames = true, includePackage = false)
+@EqualsAndHashCode(includes = 'authority')
+@ToString(includes = 'authority', includeNames = true, includePackage = false)
 class Role implements Serializable {
 
     private static final long serialVersionUID = 1
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/securityApplicationGroovy.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/securityApplicationGroovy.gsp
similarity index 80%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/securityApplicationGroovy.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/securityApplicationGroovy.gsp
index b9f73768fa..075752ccc6 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/securityApplicationGroovy.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/securityApplicationGroovy.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,20 +15,19 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (Project project, boolean ui)
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<%@ model="boolean ui" %>
 // The plugin denies every URL without a rule (rejectIfNoRule): these rules open
 // the public pages and restrict the user administration to ROLE_ADMIN.
-grails.plugin.springsecurity.userLookup.userDomainClassName = '@(project.getPackageName()).User'
-grails.plugin.springsecurity.userLookup.authorityJoinClassName = '@(project.getPackageName()).UserRole'
-grails.plugin.springsecurity.authority.className = '@(project.getPackageName()).Role'
-@if(ui) {
+grails.plugin.springsecurity.userLookup.userDomainClassName = '${project.getPackageName()}.User'
+grails.plugin.springsecurity.userLookup.authorityJoinClassName = '${project.getPackageName()}.UserRole'
+grails.plugin.springsecurity.authority.className = '${project.getPackageName()}.Role'
+<% if (ui) { %>
 grails.plugin.springsecurity.ui.encodePassword = true
-}
+<% } %>
 grails.plugin.springsecurity.controllerAnnotations.staticRules = [
     [pattern: '/',                    access: ['permitAll']],
     [pattern: '/error',               access: ['permitAll']],
@@ -40,13 +39,13 @@ grails.plugin.springsecurity.controllerAnnotations.staticRules = [
     [pattern: '/**/css/**',           access: ['permitAll']],
     [pattern: '/**/images/**',        access: ['permitAll']],
     [pattern: '/**/favicon.ico',      access: ['permitAll']],
-@if(ui) {
+    <% if (ui) { %>
     [pattern: '/register/**',         access: ['permitAll']],
-}
+    <% } %>
     [pattern: '/user/**',             access: ['ROLE_ADMIN']],
-@if(ui) {
+    <% if (ui) { %>
     [pattern: '/role/**',             access: ['ROLE_ADMIN']],
     [pattern: '/registrationCode/**', access: ['ROLE_ADMIN']],
     [pattern: '/securityInfo/**',     access: ['ROLE_ADMIN']],
-}
+    <% } %>
 ]
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/user.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/user.gsp
similarity index 77%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/user.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/user.gsp
index 4a29d29404..ce8df01535 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/user.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/user.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,14 +15,13 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-@import org.grails.forge.feature.Features
-
-@args (Project project, Features features)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.feature.Features" %>
+<%@ model="Project project" %>
+<%@ model="Features features" %>
+package ${project.getPackageName()}
 
 import org.springframework.security.core.GrantedAuthority
 import org.springframework.security.core.authority.SimpleGrantedAuthority
@@ -39,24 +38,23 @@ class User implements UserDetails {
 
     static hasMany = [roles: String]
 
-@if (features.contains("gorm-mongodb")) {
+    <% if (features.contains('gorm-mongodb')) { %>
     static mapping = {
         collection 'users'
     }
 
-} else if (features.contains("gorm-hibernate5") || features.contains("gorm-hibernate7")) {
+    <% } else if (features.contains('gorm-hibernate5') || features.contains('gorm-hibernate7')) { %>
     static mapping = {
         table 'users'
     }
 
-}
-
+    <% } %>
     static constraints = {
         username nullable: false, blank: false, unique: true
         password nullable: false, blank: false, password: true
     }
 
-    @@Override
+    @Override
     Collection<GrantedAuthority> getAuthorities() {
         roles.collect { new SimpleGrantedAuthority(it) }
     }
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userClassic.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userClassic.gsp
similarity index 74%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userClassic.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userClassic.gsp
index 75d358f0a1..66acd30d43 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userClassic.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userClassic.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,20 +15,19 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-@import org.grails.forge.feature.Features
-
-@args (Project project, Features features)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ page import="org.grails.forge.feature.Features" %>
+<%@ model="Project project" %>
+<%@ model="Features features" %>
+package ${project.getPackageName()}
 
 import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
-@@EqualsAndHashCode(includes = 'username')
-@@ToString(includes = 'username', includeNames = true, includePackage = false)
+@EqualsAndHashCode(includes = 'username')
+@ToString(includes = 'username', includeNames = true, includePackage = false)
 class User implements Serializable {
 
     private static final long serialVersionUID = 1
@@ -53,18 +52,17 @@ class User implements Serializable {
         UserRole.findAllByUser(this)*.role
     }
 
-@if (features.contains("gorm-mongodb")) {
+    <% if (features.contains('gorm-mongodb')) { %>
     static mapping = {
         collection 'user'
     }
 
-} else if (features.contains("gorm-hibernate5") || features.contains("gorm-hibernate7")) {
+    <% } else if (features.contains('gorm-hibernate5') || features.contains('gorm-hibernate7')) { %>
     static mapping = {
         table name: '`user`'
     }
 
-}
-
+    <% } %>
     static constraints = {
         email nullable: true, email: true, unique: true
         username unique: true, nullable: false
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userClassicService.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userClassicService.gsp
similarity index 79%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userClassicService.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userClassicService.gsp
index 89160d8d44..d5236b859f 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userClassicService.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userClassicService.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,16 +15,14 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (Project project)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+package ${project.getPackageName()}
 
 import grails.plugin.scaffolding.annotation.Scaffold
 
-@@Scaffold(User)
+@Scaffold(User)
 class UserService {
 }
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userClassicSpec.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userClassicSpec.gsp
similarity index 88%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userClassicSpec.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userClassicSpec.gsp
index 9d48d4c360..986f82ae71 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userClassicSpec.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userClassicSpec.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,13 +15,11 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (Project project)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+package ${project.getPackageName()}
 
 import grails.testing.gorm.DataTest
 import spock.lang.Specification
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userController.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userController.gsp
similarity index 79%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userController.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userController.gsp
index 2c4ffdee9e..7dec3ad94c 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userController.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userController.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,17 +15,15 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (Project project)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+package ${project.getPackageName()}
 
 import grails.plugin.scaffolding.RestfulServiceController
 import grails.plugin.scaffolding.annotation.Scaffold
 
-@@Scaffold(RestfulServiceController<User>)
+@Scaffold(RestfulServiceController<User>)
 class UserController {
 }
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userRole.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userRole.gsp
similarity index 91%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userRole.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userRole.gsp
index ce44bef44c..bd6fe17dd2 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userRole.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userRole.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,19 +15,17 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (Project project)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+package ${project.getPackageName()}
 
 import grails.gorm.DetachedCriteria
 import groovy.transform.ToString
 import org.codehaus.groovy.util.HashCodeHelper
 
-@@ToString(cache = true, includeNames = true, includePackage = false)
+@ToString(cache = true, includeNames = true, includePackage = false)
 class UserRole implements Serializable {
 
     private static final long serialVersionUID = 1
@@ -41,7 +39,7 @@ class UserRole implements Serializable {
         role = r
     }
 
-    @@Override
+    @Override
     boolean equals(other) {
         if (!(other instanceof UserRole)) {
             return false
@@ -50,7 +48,7 @@ class UserRole implements Serializable {
         other.user?.id == user?.id && other.role?.id == role?.id
     }
 
-    @@Override
+    @Override
     int hashCode() {
         int hashCode = HashCodeHelper.initHash()
         if (user) hashCode = HashCodeHelper.updateHash(hashCode, user.id)
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userService.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userService.gsp
similarity index 83%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userService.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userService.gsp
index b6db644257..a3a064743d 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userService.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userService.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,13 +15,11 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (Project project)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+package ${project.getPackageName()}
 
 import grails.gorm.transactions.Transactional
 import grails.plugin.scaffolding.annotation.Scaffold
@@ -29,11 +27,11 @@ import org.springframework.security.core.userdetails.UserDetails
 import org.springframework.security.core.userdetails.UserDetailsService
 import org.springframework.security.core.userdetails.UsernameNotFoundException
 
-@@Scaffold(User)
+@Scaffold(User)
 class UserService implements UserDetailsService {
 
-    @@Override
-    @@Transactional(readOnly = true)
+    @Override
+    @Transactional(readOnly = true)
     UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         User.findByUsername(username, [fetch: [roles: 'join']]) ?: { throw new UsernameNotFoundException(username) }()
     }
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userSpec.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userSpec.gsp
similarity index 91%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userSpec.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userSpec.gsp
index 38ac5f1ef1..435a690a57 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/security/template/userSpec.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/security/template/userSpec.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,13 +15,11 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (Project project)
-
-package @project.getPackageName()
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+package ${project.getPackageName()}
 
 import grails.testing.gorm.DomainUnitTest
 import spock.lang.Specification
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/spring/template/springResources.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/spring/template/springResources.gsp
similarity index 92%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/spring/template/springResources.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/spring/template/springResources.gsp
index 6b1e4bf975..f0d87a6dae 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/spring/template/springResources.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/spring/template/springResources.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 // Place your Spring DSL code here
 beans = {
 }
\ No newline at end of file
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/containerGebSpec.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/test/template/containerGebSpec.gsp
similarity index 79%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/containerGebSpec.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/test/template/containerGebSpec.gsp
index 5f6e271f65..b16630a1cd 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/containerGebSpec.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/test/template/containerGebSpec.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,18 +15,13 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-Project project
-)
-
-@if (project.getPackageName() != null) {
-package @project.getPackageName()
-}
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+<% } %>
 import grails.plugin.geb.ContainerGebSpec
 import grails.testing.mixin.integration.Integration
 
@@ -34,8 +29,8 @@ import grails.testing.mixin.integration.Integration
  * See https://grails.apache.org/docs/latest/guide/testing.html#functionalTesting and https://groovy.apache.org/geb/manual/current/
  * for more instructions on how to write functional tests with Grails and Geb.
  */
-@@Integration
-class @project.getClassName()Spec extends ContainerGebSpec {
+@Integration
+class ${project.getClassName()}Spec extends ContainerGebSpec {
 
     void 'should display the correct title on the home page'() {
         when: 'visiting the home page'
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/gebConfig.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/test/template/gebConfig.gsp
similarity index 92%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/gebConfig.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/test/template/gebConfig.gsp
index 7e2cb12fd7..b5be0a3172 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/gebConfig.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/test/template/gebConfig.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,14 +15,10 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-Project project
-)
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
 import org.openqa.selenium.chrome.ChromeDriver
 import org.openqa.selenium.chrome.ChromeOptions
 import org.openqa.selenium.firefox.FirefoxDriver
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/gebSpec.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/test/template/gebSpec.gsp
similarity index 80%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/gebSpec.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/test/template/gebSpec.gsp
index 7fb9a33f40..07b9c2cb68 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/template/gebSpec.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/test/template/gebSpec.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,18 +15,13 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.Project
-
-@args (
-Project project
-)
-
-@if (project.getPackageName() != null) {
-package @project.getPackageName()
-}
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.Project" %>
+<%@ model="Project project" %>
+<% if (project.getPackageName() != null) { %>
+package ${project.getPackageName()}
+<% } %>
 import geb.spock.GebSpec
 import grails.testing.mixin.integration.Integration
 
@@ -34,8 +29,8 @@ import grails.testing.mixin.integration.Integration
  * See https://grails.apache.org/docs/latest/guide/testing.html#functionalTesting and https://groovy.apache.org/geb/manual/current/
  * for more instructions on how to write functional tests with Grails and Geb.
  */
-@@Integration
-class @project.getClassName()Spec extends GebSpec {
+@Integration
+class ${project.getClassName()}Spec extends GebSpec {
 
     void 'should display the correct title on the home page'() {
         when: 'visiting the home page'
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/_errors.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/_errors.gsp
similarity index 96%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/_errors.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/_errors.gsp
index f72f83fcd4..2007a88775 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/_errors.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/_errors.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 import org.springframework.validation.*
 
 /**
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/_object.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/_object.gsp
similarity index 90%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/_object.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/_object.gsp
index c2da9160c0..965312c0be 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/_object.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/_object.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,10 +15,10 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 import groovy.transform.*
 
-@@Field Object object
+@Field Object object
 
 json g.render(object)
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/error.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/error.gsp
similarity index 92%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/error.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/error.gsp
index ad309e5f81..6138adb58f 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/error.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/error.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 response.status 500
 
 json {
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/index.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/index.gsp
similarity index 96%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/index.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/index.gsp
index 238a7133ff..138ed4fb2f 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/index.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/index.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 import grails.core.*
 import grails.util.*
 import grails.plugins.*
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/notFound.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/notFound.gsp
similarity index 92%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/notFound.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/notFound.gsp
index 6e2eba9b3b..29489f644c 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/json/templates/notFound.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/json/templates/notFound.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 response.status 404
 
 json {
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/_errors.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/_errors.gsp
similarity index 96%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/_errors.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/_errors.gsp
index 1662a2643a..d79bb47987 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/_errors.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/_errors.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 import org.springframework.validation.*
 
 /**
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/_object.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/_object.gsp
similarity index 90%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/_object.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/_object.gsp
index 2b120cd1a9..ac9c14af95 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/_object.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/_object.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,11 +15,11 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 import groovy.transform.*
 
-@@Field Object object
+@Field Object object
 
 xmlDeclaration()
 g.render(object)
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/error.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/error.gsp
similarity index 92%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/error.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/error.gsp
index b519370c35..133972cd5a 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/error.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/error.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 response.status 500
 
 xmlDeclaration()
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/index.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/index.gsp
similarity index 97%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/index.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/index.gsp
index 8b69820246..eb114c5d67 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/index.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/index.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 import grails.core.*
 import grails.util.*
 import grails.plugins.*
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/notFound.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/notFound.gsp
similarity index 92%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/notFound.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/notFound.gsp
index b16bd6b7d5..d88cfa3be3 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/markup/templates/notFound.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/feature/view/markup/templates/notFound.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,8 +15,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
 response.status 404
 
 xmlDeclaration()
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/template/api/grailsForgeApi.rocker.raw b/grails-forge/grails-forge-core/grails-app/views/forge/template/api/grailsForgeApi.gsp
similarity index 76%
rename from grails-forge/grails-forge-core/src/main/java/org/grails/forge/template/api/grailsForgeApi.rocker.raw
rename to grails-forge/grails-forge-core/grails-app/views/forge/template/api/grailsForgeApi.gsp
index 3dfca677c5..e1ee2a7dbc 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/template/api/grailsForgeApi.rocker.raw
+++ b/grails-forge/grails-forge-core/grails-app/views/forge/template/api/grailsForgeApi.gsp
@@ -1,4 +1,4 @@
-@*
+%{--
 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
@@ -15,30 +15,26 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-*@
-
-@import org.grails.forge.application.ApplicationType
-@import java.util.List
-
-@args (
-    String grailsVersion,
-    String serverURL
-)
-
-=== Grails Forge @grailsVersion (@serverURL)
+--}%
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ page import="org.grails.forge.application.ApplicationType" %>
+<%@ page import="java.util.List" %>
+<%@ model="String grailsVersion" %>
+<%@ model="String serverURL" %>
+=== Grails Forge ${grailsVersion} (${serverURL})
 
 Grails Forge generates example project for the Grails® framework (https://grails.apache.org).
 
-The primary API for generating application is @serverURL/create/{type}/{name}.
+The primary API for generating application is ${serverURL}/create/{type}/{name}.
 
 The application type can be one of the following:
 
 +-----------------+------------------------------------------+
 | ID              | Description                              |
 +-----------------+------------------------------------------+
-@for (ApplicationType type : ApplicationType.values()) {
-| @String.format("%-" + 15 + "s",type.name()) | @String.format("%-" + 40 + "s",type.getDescription()) |
-}
+<% for (ApplicationType type : ApplicationType.values()) { %>
+| ${String.format('%-' + 15 + 's',type.name())} | ${String.format('%-' + 40 + 's',type.getDescription())} |
+<% } %>
 +-----------------+------------------------------------------+
 
 The "name" can be whatever you choose.
@@ -56,10 +52,10 @@ Available query parameters include:
 
 To view the possible features and their descriptions visit:
 
-@serverURL/application-types/{type}/features
+${serverURL}/application-types/{type}/features
 
 === Examples
 
 To create a default application:
 
-    $ curl @serverURL/create/WEB/example -o example.zip
+    $ curl ${serverURL}/create/WEB/example -o example.zip
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/application/generator/DefaultProjectGenerator.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/application/generator/DefaultProjectGenerator.groovy
index ae5b8d6902..f9c7421d1d 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/application/generator/DefaultProjectGenerator.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/application/generator/DefaultProjectGenerator.groovy
@@ -28,16 +28,16 @@ import org.grails.forge.feature.AvailableFeatures
 import org.grails.forge.feature.FeatureRegistry
 import org.springframework.stereotype.Component
 import org.grails.forge.feature.FeatureContext
-import org.grails.forge.feature.cli
 import org.grails.forge.io.ConsoleOutput
 import org.grails.forge.io.OutputHandler
 import org.grails.forge.options.BuildTool
 import org.grails.forge.options.Language
 import org.grails.forge.options.Options
 import org.grails.forge.template.RenderResult
-import org.grails.forge.template.RockerTemplate
 import org.grails.forge.template.Template
 import org.grails.forge.template.TemplateRenderer
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import java.util.function.Function
 
 @Component('projectGenerator')
@@ -84,15 +84,8 @@ class DefaultProjectGenerator implements ProjectGenerator {
         features.sort(Comparator.comparing(Function.identity()))
 
         generatorContext.addTemplate('grailsCli',
-                new RockerTemplate('grails-forge-cli.yml',
-                        cli.template(Language.DEFAULT_OPTION,
-                                generatorContext.getDevelopmentReloading(),
-                                BuildTool.DEFAULT_OPTION,
-                                generatorContext.getGorm(),
-                                generatorContext.getServlet(),
-                                generatorContext.getProject(),
-                                features,
-                                applicationType)))
+                new GspTemplate('grails-forge-cli.yml',
+                        GspView.of('/forge/feature/cli.gsp', [language: Language.DEFAULT_OPTION, reloading: generatorContext.getDevelopmentReloading(), buildTool: BuildTool.DEFAULT_OPTION, gormImpl: generatorContext.getGorm(), servletImpl: generatorContext.getServlet(), project: generatorContext.getProject(), features: features, applicationType: applicationType])))
 
         generatorContext.applyFeatures()
 
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/application/generator/GeneratorContext.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/application/generator/GeneratorContext.groovy
index 92ba571ab4..7ab97e79de 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/application/generator/GeneratorContext.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/application/generator/GeneratorContext.groovy
@@ -19,7 +19,6 @@
 package org.grails.forge.application.generator
 
 import groovy.transform.CompileStatic
-import com.fizzed.rocker.RockerModel
 import jakarta.annotation.Nonnull
 import jakarta.annotation.Nullable
 import org.grails.forge.application.ApplicationType
@@ -40,7 +39,6 @@ import org.grails.forge.feature.build.gradle.GradleBuildSrc
 import org.grails.forge.feature.config.ApplicationConfiguration
 import org.grails.forge.feature.config.BootstrapConfiguration
 import org.grails.forge.feature.config.Configuration
-import org.grails.forge.feature.other.template.markdownLink
 import org.grails.forge.options.DevelopmentReloading
 import org.grails.forge.options.GormImpl
 import org.grails.forge.options.JdkVersion
@@ -48,12 +46,12 @@ import org.grails.forge.options.Language
 import org.grails.forge.options.Options
 import org.grails.forge.options.ServletImpl
 import org.grails.forge.options.TestFramework
-import org.grails.forge.options.TestRockerModelProvider
-import org.grails.forge.template.RockerTemplate
-import org.grails.forge.template.RockerWritable
+import org.grails.forge.options.TestViewProvider
 import org.grails.forge.template.Template
 import org.grails.forge.template.Writable
 import org.grails.forge.util.VersionInfo
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 /**
  * A context object used when generating projects.
@@ -138,7 +136,7 @@ class GeneratorContext implements DependencyContext {
      * @param href Link's uri
      */
     void addHelpLink(String label, String href) {
-        addHelpTemplate(new RockerWritable(markdownLink.template(label, href)))
+        addHelpTemplate(GspView.of('/forge/feature/other/template/markdownLink.gsp', [label: label, href: href]))
     }
 
     /**
@@ -305,23 +303,23 @@ class GeneratorContext implements DependencyContext {
         return TestFramework.SPOCK.getIntegrationSourcePath(path)
     }
 
-    RockerModel parseModel(RockerModel javaTemplate, RockerModel groovyTemplate) {
+    GspView parseView(GspView javaTemplate, GspView groovyTemplate) {
         return groovyTemplate
     }
 
-    void addTemplate(String name, String path, TestRockerModelProvider testRockerModelProvider) {
-        RockerModel rockerModel = testRockerModelProvider.findModel(TestFramework.SPOCK)
-        if (rockerModel != null) {
-            addTemplate(name, new RockerTemplate(path, rockerModel))
+    void addTemplate(String name, String path, TestViewProvider testViewProvider) {
+        GspView view = testViewProvider.findView(TestFramework.SPOCK)
+        if (view != null) {
+            addTemplate(name, new GspTemplate(path, view))
         }
     }
 
     void addTemplate(String templateName,
                             String triggerFile,
-                            RockerModel javaTemplate,
-                            RockerModel groovyTemplate) {
-        RockerModel rockerModel = parseModel(javaTemplate, groovyTemplate)
-        addTemplate(templateName, new RockerTemplate(triggerFile, rockerModel))
+                            GspView javaTemplate,
+                            GspView groovyTemplate) {
+        GspView view = parseView(javaTemplate, groovyTemplate)
+        addTemplate(templateName, new GspTemplate(triggerFile, view))
     }
 
     @Override
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/asciidoctor/Asciidoctor.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/asciidoctor/Asciidoctor.groovy
index dc97f8c565..1a5e69fd67 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/asciidoctor/Asciidoctor.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/asciidoctor/Asciidoctor.groovy
@@ -27,9 +27,8 @@ import org.grails.forge.build.dependencies.CoordinateResolver
 import org.grails.forge.build.gradle.GradlePlugin
 import org.grails.forge.feature.Category
 import org.grails.forge.feature.Feature
-import org.grails.forge.feature.asciidoctor.template.asciidocGradle
-import org.grails.forge.feature.asciidoctor.template.indexAdoc
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 @Component
 @CompileStatic
@@ -62,14 +61,14 @@ class Asciidoctor implements Feature {
                 .map(Coordinate::getVersion).orElse('3.0.0')
         final String asciidoctorjDiagramVersion = coordinateResolver.resolve('asciidoctorj-diagram')
                 .map(Coordinate::getVersion).orElse('2.3.1')
-        generatorContext.addTemplate('asciidocGradle', new RockerTemplate('gradle/asciidoc.gradle', asciidocGradle.template(asciidoctorjVersion, asciidoctorjDiagramVersion)))
+        generatorContext.addTemplate('asciidocGradle', new GspTemplate('gradle/asciidoc.gradle', GspView.of('/forge/feature/asciidoctor/template/asciidocGradle.gsp', [asciidoctorjVersion: asciidoctorjVersion, asciidoctorjModuleDiagramVersion: asciidoctorjDiagramVersion])))
 
         generatorContext.addBuildPlugin(GradlePlugin.builder()
                 .id('org.asciidoctor.jvm.convert')
                 .lookupArtifactId('asciidoctor-gradle-jvm')
                 .build())
 
-        generatorContext.addTemplate('indexAdoc', new RockerTemplate('src/docs/asciidoc/index.adoc', indexAdoc.template()))
+        generatorContext.addTemplate('indexAdoc', new GspTemplate('src/docs/asciidoc/index.adoc', GspView.of('/forge/feature/asciidoctor/template/indexAdoc.gsp', [:])))
     }
 
     @Override
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/Gradle.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/Gradle.groovy
index 7e94ec9864..f64f5602a4 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/Gradle.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/Gradle.groovy
@@ -29,15 +29,12 @@ import org.grails.forge.build.gradle.GradleBuildCreator
 import org.grails.forge.build.gradle.GradlePlugin
 import org.grails.forge.feature.Feature
 import org.grails.forge.feature.build.BuildFeature
-import org.grails.forge.feature.build.gitignore
-import org.grails.forge.feature.build.gradle.templates.buildGradle
-import org.grails.forge.feature.build.gradle.templates.gradleProperties
-import org.grails.forge.feature.build.gradle.templates.gradleWrapperProperties
 import org.grails.forge.options.BuildTool
 import org.grails.forge.options.Options
 import org.grails.forge.template.BinaryTemplate
-import org.grails.forge.template.RockerTemplate
 import org.grails.forge.util.VersionInfo
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import org.springframework.stereotype.Component
 import java.util.function.Function
 
@@ -76,20 +73,13 @@ class Gradle implements BuildFeature {
         GradleBuild build = dependencyResolver.create(generatorContext)
 
         final Function<String, Coordinate> coordinateResolver = (artifactId) -> resolver.resolve(artifactId).orElseThrow(() -> new LookupFailedException(artifactId))
-        generatorContext.addTemplate('build', new RockerTemplate(buildTool.getBuildFileName(), buildGradle.template(
-                generatorContext.getApplicationType(),
-                generatorContext.getProject(),
-                coordinateResolver,
-                generatorContext.getFeatures(),
-                build,
-                VersionInfo.getGrailsVersion()
-        )))
+        generatorContext.addTemplate('build', new GspTemplate(buildTool.getBuildFileName(), GspView.of('/forge/feature/build/gradle/templates/buildGradle.gsp', [applicationType: generatorContext.getApplicationType(), project: generatorContext.getProject(), coordinateResolver: coordinateResolver, features: generatorContext.getFeatures(), gradleBuild: build, grailsVersion: VersionInfo.getGrailsVersion()])))
 
         configureDefaultGradleProps(generatorContext)
-        generatorContext.addTemplate('gitignore', new RockerTemplate('.gitignore', gitignore.template()))
-        generatorContext.addTemplate('projectProperties', new RockerTemplate('gradle.properties', gradleProperties.template(generatorContext.getBuildProperties().getProperties())))
+        generatorContext.addTemplate('gitignore', new GspTemplate('.gitignore', GspView.of('/forge/feature/build/gitignore.gsp', [:])))
+        generatorContext.addTemplate('projectProperties', new GspTemplate('gradle.properties', GspView.of('/forge/feature/build/gradle/templates/gradleProperties.gsp', [properties: generatorContext.getBuildProperties().getProperties()])))
 
-        generatorContext.addTemplate('gradleWrapperProperties', new RockerTemplate(WRAPPER_PROPS, gradleWrapperProperties.template(generatorContext.getProject(), build, coordinateResolver, generatorContext.getFeatures())))
+        generatorContext.addTemplate('gradleWrapperProperties', new GspTemplate(WRAPPER_PROPS, GspView.of('/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp', [project: generatorContext.getProject(), gradleBuild: build, coordinateResolver: coordinateResolver, features: generatorContext.getFeatures()])))
     }
 
     private void configureDefaultGradleProps(GeneratorContext generatorContext) {
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/GradleBuildSrc.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/GradleBuildSrc.groovy
index 666e5e9c41..c116e36fd8 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/GradleBuildSrc.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/GradleBuildSrc.groovy
@@ -24,10 +24,10 @@ import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.build.dependencies.CoordinateResolver
 import org.grails.forge.build.gradle.GradleBuild
 import org.grails.forge.build.gradle.GradleBuildCreator
-import org.grails.forge.feature.build.gradle.templates.buildSrcBuildGradle
 import org.grails.forge.options.BuildTool
-import org.grails.forge.template.RockerTemplate
 import org.grails.forge.util.VersionInfo
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import org.springframework.stereotype.Component
 
 @Component
@@ -67,13 +67,7 @@ class GradleBuildSrc implements GradleBuildSrcFeature {
         BuildTool buildTool = BuildTool.DEFAULT_OPTION
         GradleBuild build = dependencyResolver.create(generatorContext)
 
-        generatorContext.addTemplate('buildSrc/build', new RockerTemplate('buildSrc/' + buildTool.getBuildFileName(), buildSrcBuildGradle.template(
-                generatorContext.getApplicationType(),
-                generatorContext.getProject(),
-                generatorContext.getFeatures(),
-                build,
-                VersionInfo.getGrailsVersion()
-        )))
+        generatorContext.addTemplate('buildSrc/build', new GspTemplate('buildSrc/' + buildTool.getBuildFileName(), GspView.of('/forge/feature/build/gradle/templates/buildSrcBuildGradle.gsp', [applicationType: generatorContext.getApplicationType(), project: generatorContext.getProject(), features: generatorContext.getFeatures(), gradleBuild: build, grailsVersion: VersionInfo.getGrailsVersion()])))
     }
 
     @Override
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/GradleSettingsFile.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/GradleSettingsFile.groovy
index e1f61e86c5..29020f2e35 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/GradleSettingsFile.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/build/gradle/GradleSettingsFile.groovy
@@ -26,9 +26,9 @@ import org.grails.forge.build.dependencies.CoordinateResolver
 import org.grails.forge.build.dependencies.LookupFailedException
 import org.grails.forge.build.gradle.GradleBuild
 import org.grails.forge.build.gradle.GradleBuildCreator
-import org.grails.forge.feature.build.gradle.templates.settingsGradle
 import org.grails.forge.options.BuildTool
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import org.springframework.stereotype.Component
 import java.util.function.Function
 
@@ -71,7 +71,7 @@ class GradleSettingsFile implements GradleSettingsFileFeature {
 
         String settingsFile = 'settings.gradle'
         final Function<String, Coordinate> coordinateResolver = (artifactId) -> resolver.resolve(artifactId).orElseThrow(() -> new LookupFailedException(artifactId))
-        generatorContext.addTemplate('gradleSettings', new RockerTemplate(settingsFile, settingsGradle.template(generatorContext.getProject(), build, coordinateResolver, generatorContext.getFeatures())))
+        generatorContext.addTemplate('gradleSettings', new GspTemplate(settingsFile, GspView.of('/forge/feature/build/gradle/templates/settingsGradle.gsp', [project: generatorContext.getProject(), gradleBuild: build, coordinateResolver: coordinateResolver, features: generatorContext.getFeatures()])))
     }
 
     @Override
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/github/workflows/plain/PlainGithubWorkflowFeature.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/github/workflows/plain/PlainGithubWorkflowFeature.groovy
index 3d32862e58..193c3b633f 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/github/workflows/plain/PlainGithubWorkflowFeature.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/github/workflows/plain/PlainGithubWorkflowFeature.groovy
@@ -22,8 +22,8 @@ import groovy.transform.CompileStatic
 import org.springframework.stereotype.Component
 import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.feature.github.workflows.GitHubWorkflowFeature
-import org.grails.forge.feature.github.workflows.plain.templates.plainGithubWorkflow
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 @Component
 @CompileStatic
@@ -49,8 +49,8 @@ class PlainGithubWorkflowFeature extends GitHubWorkflowFeature {
     @Override
     void apply(GeneratorContext generatorContext) {
         final String workflowFilePath = getWorkflowFilePath()
-        generatorContext.addTemplate('javaWorkflow', new RockerTemplate(workflowFilePath,
-                plainGithubWorkflow.template(generatorContext.getProject(), generatorContext.getJdkVersion())))
+        generatorContext.addTemplate('javaWorkflow', new GspTemplate(workflowFilePath,
+                GspView.of('/forge/feature/github/workflows/plain/templates/plainGithubWorkflow.gsp', [project: generatorContext.getProject(), jdkVersion: generatorContext.getJdkVersion()])))
     }
 
     protected String getWorkflowFileName() {
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/grails/GrailsUrlMappings.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/grails/GrailsUrlMappings.groovy
index 8d54773c67..f3e54f3120 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/grails/GrailsUrlMappings.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/grails/GrailsUrlMappings.groovy
@@ -25,8 +25,8 @@ import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.feature.DefaultFeature
 import org.grails.forge.feature.Feature
 import org.grails.forge.options.Options
-import org.grails.forge.template.RockerTemplate
-import org.grails.forge.feature.grails.templates.urlMappings
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 @Component
 @CompileStatic
@@ -54,7 +54,7 @@ class GrailsUrlMappings implements DefaultFeature {
 
     @Override
     void apply(GeneratorContext generatorContext) {
-        generatorContext.addTemplate('urlMappings', new RockerTemplate(getPath(), urlMappings.template(generatorContext.getProject(), generatorContext.getApplicationType())))
+        generatorContext.addTemplate('urlMappings', new GspTemplate(getPath(), GspView.of('/forge/feature/grails/templates/urlMappings.gsp', [project: generatorContext.getProject(), applicationType: generatorContext.getApplicationType()])))
     }
 
     protected String getPath() {
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/lang/groovy/GrailsApplication.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/lang/groovy/GrailsApplication.groovy
index 9efbaa393f..1ec523ed9d 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/lang/groovy/GrailsApplication.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/lang/groovy/GrailsApplication.groovy
@@ -26,12 +26,9 @@ import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.build.gradle.GradlePlugin
 import org.grails.forge.feature.DefaultFeature
 import org.grails.forge.feature.Feature
-import org.grails.forge.feature.grails.templates.applicationController
-import org.grails.forge.feature.grails.templates.plugin
-import org.grails.forge.feature.lang.groovy.templates.application
-import org.grails.forge.feature.lang.groovy.templates.bootStrap
 import org.grails.forge.options.Options
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 @Component('grailsApplicationFeature')
 @CompileStatic
@@ -59,18 +56,18 @@ class GrailsApplication implements GrailsApplicationFeature, DefaultFeature {
         final ApplicationType applicationType = generatorContext.getApplicationType()
         if (shouldGenerateApplicationFile(applicationType, generatorContext)) {
             generatorContext.addBuildPlugin(GradlePlugin.builder().id('war').build())
-            generatorContext.addTemplate('application', new RockerTemplate(getPath(),
-                    application.template(applicationType, generatorContext.getProject(), generatorContext.getFeatures())))
+            generatorContext.addTemplate('application', new GspTemplate(getPath(),
+                    GspView.of('/forge/feature/lang/groovy/templates/application.gsp', [applicationType: applicationType, project: generatorContext.getProject(), features: generatorContext.getFeatures()])))
             if (applicationType == ApplicationType.REST_API) {
-                generatorContext.addTemplate('applicationController', new RockerTemplate('grails-app/controllers/{packagePath}/ApplicationController.groovy',
-                        applicationController.template(generatorContext.getProject())))
+                generatorContext.addTemplate('applicationController', new GspTemplate('grails-app/controllers/{packagePath}/ApplicationController.groovy',
+                        GspView.of('/forge/feature/grails/templates/applicationController.gsp', [project: generatorContext.getProject()])))
             }
         }
         if (applicationType == ApplicationType.PLUGIN || applicationType == ApplicationType.WEB_PLUGIN) {
-            generatorContext.addTemplate('plugin', new RockerTemplate(generatorContext.getSourcePath('/{packagePath}/{className}GrailsPlugin'),
-                    plugin.template(generatorContext.getProject(), applicationType)))
+            generatorContext.addTemplate('plugin', new GspTemplate(generatorContext.getSourcePath('/{packagePath}/{className}GrailsPlugin'),
+                    GspView.of('/forge/feature/grails/templates/plugin.gsp', [project: generatorContext.getProject(), applicationType: applicationType])))
         }
-        generatorContext.addTemplate('bootStrap', new RockerTemplate('grails-app/init/{packagePath}/BootStrap.groovy', bootStrap.template(generatorContext.getProject(), generatorContext.getFeatures())))
+        generatorContext.addTemplate('bootStrap', new GspTemplate('grails-app/init/{packagePath}/BootStrap.groovy', GspView.of('/forge/feature/lang/groovy/templates/bootStrap.gsp', [project: generatorContext.getProject(), features: generatorContext.getFeatures()])))
     }
 
     protected boolean shouldGenerateApplicationFile(ApplicationType applicationType, GeneratorContext generatorContext) {
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/logging/LogbackConfig.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/logging/LogbackConfig.groovy
index 71ad1efd72..2051c3164d 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/logging/LogbackConfig.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/logging/LogbackConfig.groovy
@@ -23,8 +23,8 @@ import org.springframework.stereotype.Component
 import org.grails.forge.application.ApplicationType
 import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.build.dependencies.Dependency
-import org.grails.forge.feature.logging.template.logback
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 /**
  * Opt-in logging feature that generates an editable
@@ -71,8 +71,8 @@ class LogbackConfig implements LoggingFeature {
         String projectName = generatorContext.getProject().getName()
         String packageName = generatorContext.getProject().getPackageName()
 
-        generatorContext.addTemplate('loggingConfig', new RockerTemplate('grails-app/conf/logback-spring.xml',
-                logback.template(projectName, packageName)))
+        generatorContext.addTemplate('loggingConfig', new GspTemplate('grails-app/conf/logback-spring.xml',
+                GspView.of('/forge/feature/logging/template/logback.gsp', [projectName: projectName, packageName: packageName])))
         generatorContext.addDependency(Dependency.builder()
                 .groupId('org.apache.grails')
                 .artifactId('grails-logging')
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/migration/DatabaseMigrationPlugin.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/migration/DatabaseMigrationPlugin.groovy
index 32f74d5e5e..17bac1ef55 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/migration/DatabaseMigrationPlugin.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/migration/DatabaseMigrationPlugin.groovy
@@ -23,10 +23,9 @@ import org.springframework.stereotype.Component
 import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.build.dependencies.Dependency
 import org.grails.forge.feature.database.GrailsDataHibernate7
-import org.grails.forge.feature.migration.templates.dbMigrationGradle
-import org.grails.forge.template.RockerWritable
 import org.grails.forge.template.URLTemplate
 import org.grails.forge.util.VersionInfo
+import org.grails.forge.template.GspView
 
 @Component
 @CompileStatic
@@ -70,7 +69,7 @@ class DatabaseMigrationPlugin implements MigrationFeature {
                 .groupId('org.apache.grails')
                 .artifactId(dbMigrationArtifactId)
                 .implementation()
-                .extension(new RockerWritable(dbMigrationGradle.template(srcDirPath))))
+                .extension(GspView.of('/forge/feature/migration/templates/dbMigrationGradle.gsp', [srcDirPath: srcDirPath])))
         final ClassLoader classLoader = Thread.currentThread().getContextClassLoader()
         generatorContext.addTemplate(srcDirPath, new URLTemplate(srcDirPath + '/.gitkeep', classLoader.getResource('.gitkeep')))
     }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/other/Readme.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/other/Readme.groovy
index 291061c728..ad50022791 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/other/Readme.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/other/Readme.groovy
@@ -26,12 +26,10 @@ import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.feature.DefaultFeature
 import org.grails.forge.feature.Feature
 import org.grails.forge.feature.FeaturePhase
-import org.grails.forge.feature.other.template.maindocs
-import org.grails.forge.feature.other.template.readme
 import org.grails.forge.options.Options
-import org.grails.forge.template.RockerWritable
 import org.grails.forge.template.Template
 import org.grails.forge.template.Writable
+import org.grails.forge.template.GspView
 import java.util.stream.Collectors
 
 @Component
@@ -62,7 +60,7 @@ class Readme implements DefaultFeature {
 
                 @Override
                 void write(OutputStream outputStream) throws IOException {
-                    Writable mainDocsWritable = new RockerWritable(maindocs.template())
+                    Writable mainDocsWritable = GspView.of('/forge/feature/other/template/maindocs.gsp', [:])
                     mainDocsWritable.write(outputStream)
 
                     for (Writable writable : generatorContext.getHelpTemplates()) {
@@ -70,7 +68,7 @@ class Readme implements DefaultFeature {
                     }
 
                     for (Feature feature : featuresWithDocumentationLinks) {
-                        Writable writable = new RockerWritable(readme.template(feature))
+                        Writable writable = GspView.of('/forge/feature/other/template/readme.gsp', [feature: feature])
                         writable.write(outputStream)
                     }
                 }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/GrailsSpringSecurity.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/GrailsSpringSecurity.groovy
index 2136be41dd..c6173acd72 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/GrailsSpringSecurity.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/GrailsSpringSecurity.groovy
@@ -22,11 +22,9 @@ import groovy.transform.CompileStatic
 import org.springframework.stereotype.Component
 import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.build.dependencies.Dependency
-import org.grails.forge.feature.security.template.securityApplicationGroovy
-import org.grails.forge.feature.security.template.userClassicService
-import org.grails.forge.feature.security.template.userController
 import org.grails.forge.feature.view.Scaffolding
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 /**
  * Secures the application with the Grails Spring Security Core plugin over the
@@ -79,14 +77,14 @@ class GrailsSpringSecurity extends SecurityFeature implements PrimarySecurityFea
 
         applyClassicDomainModel(generatorContext)
         generatorContext.addTemplate('securityUserService',
-                new RockerTemplate('grails-app/services/{packagePath}/UserService.groovy',
-                        userClassicService.template(generatorContext.getProject())))
+                new GspTemplate('grails-app/services/{packagePath}/UserService.groovy',
+                        GspView.of('/forge/feature/security/template/userClassicService.gsp', [project: generatorContext.getProject()])))
         generatorContext.addTemplate('securityUserController',
-                new RockerTemplate('grails-app/controllers/{packagePath}/UserController.groovy',
-                        userController.template(generatorContext.getProject())))
+                new GspTemplate('grails-app/controllers/{packagePath}/UserController.groovy',
+                        GspView.of('/forge/feature/security/template/userController.gsp', [project: generatorContext.getProject()])))
         boolean ui = generatorContext.getFeatures().contains('grails-spring-security-ui')
         generatorContext.addTemplate('securityApplicationGroovy',
-                new RockerTemplate('grails-app/conf/application.groovy',
-                        securityApplicationGroovy.template(generatorContext.getProject(), ui)))
+                new GspTemplate('grails-app/conf/application.groovy',
+                        GspView.of('/forge/feature/security/template/securityApplicationGroovy.gsp', [project: generatorContext.getProject(), ui: ui])))
     }
 }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/SecurityFeature.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/SecurityFeature.groovy
index b060757b3d..1cb4ca7d97 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/SecurityFeature.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/SecurityFeature.groovy
@@ -26,12 +26,9 @@ import org.grails.forge.feature.Category
 import org.grails.forge.feature.FeatureContext
 import org.grails.forge.feature.Feature
 import org.grails.forge.feature.FeaturePhase
-import org.grails.forge.feature.security.template.role
-import org.grails.forge.feature.security.template.userClassic
-import org.grails.forge.feature.security.template.userClassicSpec
-import org.grails.forge.feature.security.template.userRole
 import org.grails.forge.feature.view.Scaffolding
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 /**
  * Common ground of the security features: category, WEB-only support, the ordering
@@ -78,13 +75,13 @@ abstract class SecurityFeature implements Feature {
     protected void applyClassicDomainModel(GeneratorContext generatorContext) {
         final Project project = generatorContext.getProject()
         generatorContext.addTemplate('securityUser',
-                new RockerTemplate('grails-app/domain/{packagePath}/User.groovy',
-                        userClassic.template(project, generatorContext.getFeatures())))
+                new GspTemplate('grails-app/domain/{packagePath}/User.groovy',
+                        GspView.of('/forge/feature/security/template/userClassic.gsp', [project: project, features: generatorContext.getFeatures()])))
         generatorContext.addTemplate('securityRole',
-                new RockerTemplate('grails-app/domain/{packagePath}/Role.groovy', role.template(project)))
+                new GspTemplate('grails-app/domain/{packagePath}/Role.groovy', GspView.of('/forge/feature/security/template/role.gsp', [project: project])))
         generatorContext.addTemplate('securityUserRole',
-                new RockerTemplate('grails-app/domain/{packagePath}/UserRole.groovy', userRole.template(project)))
+                new GspTemplate('grails-app/domain/{packagePath}/UserRole.groovy', GspView.of('/forge/feature/security/template/userRole.gsp', [project: project])))
         generatorContext.addTemplate('securityUserSpec',
-                new RockerTemplate(generatorContext.getTestSourcePath('/{packagePath}/User'), userClassicSpec.template(project)))
+                new GspTemplate(generatorContext.getTestSourcePath('/{packagePath}/User'), GspView.of('/forge/feature/security/template/userClassicSpec.gsp', [project: project])))
     }
 }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/SpringBootStarterSecurity.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/SpringBootStarterSecurity.groovy
index 84ae7c8a3a..115cd16b4f 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/SpringBootStarterSecurity.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/security/SpringBootStarterSecurity.groovy
@@ -23,12 +23,9 @@ import org.springframework.stereotype.Component
 import org.grails.forge.application.Project
 import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.build.dependencies.Dependency
-import org.grails.forge.feature.security.template.user
-import org.grails.forge.feature.security.template.userController
-import org.grails.forge.feature.security.template.userService
-import org.grails.forge.feature.security.template.userSpec
 import org.grails.forge.feature.view.Scaffolding
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 /**
  * Secures the application with plain Spring Security: the spring-boot-starter-security
@@ -77,13 +74,13 @@ class SpringBootStarterSecurity extends SecurityFeature implements PrimarySecuri
 
         final Project project = generatorContext.getProject()
         generatorContext.addTemplate('securityUser',
-                new RockerTemplate('grails-app/domain/{packagePath}/User.groovy',
-                        user.template(project, generatorContext.getFeatures())))
+                new GspTemplate('grails-app/domain/{packagePath}/User.groovy',
+                        GspView.of('/forge/feature/security/template/user.gsp', [project: project, features: generatorContext.getFeatures()])))
         generatorContext.addTemplate('securityUserController',
-                new RockerTemplate('grails-app/controllers/{packagePath}/UserController.groovy', userController.template(project)))
+                new GspTemplate('grails-app/controllers/{packagePath}/UserController.groovy', GspView.of('/forge/feature/security/template/userController.gsp', [project: project])))
         generatorContext.addTemplate('securityUserService',
-                new RockerTemplate('grails-app/services/{packagePath}/UserService.groovy', userService.template(project)))
+                new GspTemplate('grails-app/services/{packagePath}/UserService.groovy', GspView.of('/forge/feature/security/template/userService.gsp', [project: project])))
         generatorContext.addTemplate('securityUserSpec',
-                new RockerTemplate(generatorContext.getTestSourcePath('/{packagePath}/User'), userSpec.template(project)))
+                new GspTemplate(generatorContext.getTestSourcePath('/{packagePath}/User'), GspView.of('/forge/feature/security/template/userSpec.gsp', [project: project])))
     }
 }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/spring/SpringResources.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/spring/SpringResources.groovy
index 47b6d97c2d..c8973c029c 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/spring/SpringResources.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/spring/SpringResources.groovy
@@ -25,9 +25,9 @@ import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.feature.Category
 import org.grails.forge.feature.DefaultFeature
 import org.grails.forge.feature.Feature
-import org.grails.forge.feature.spring.template.springResources
 import org.grails.forge.options.Options
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 @Component
 @CompileStatic
@@ -55,7 +55,7 @@ class SpringResources implements DefaultFeature {
 
     @Override
     void apply(GeneratorContext generatorContext) {
-        generatorContext.addTemplate('springResources', new RockerTemplate('grails-app/conf/spring/resources.groovy', springResources.template()))
+        generatorContext.addTemplate('springResources', new GspTemplate('grails-app/conf/spring/resources.groovy', GspView.of('/forge/feature/spring/template/springResources.gsp', [:])))
     }
 
     @Override
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/test/GebWithLocalBrowsers.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/test/GebWithLocalBrowsers.groovy
index 6a8dfdb523..b54d048b30 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/test/GebWithLocalBrowsers.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/test/GebWithLocalBrowsers.groovy
@@ -25,12 +25,11 @@ import org.grails.forge.application.Project
 import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.build.dependencies.Dependency
 import org.grails.forge.feature.FeatureContext
-import org.grails.forge.feature.test.template.gebConfig
-import org.grails.forge.feature.test.template.gebSpec
-import org.grails.forge.options.DefaultTestRockerModelProvider
+import org.grails.forge.options.DefaultTestViewProvider
 import org.grails.forge.options.TestFramework
-import org.grails.forge.options.TestRockerModelProvider
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.options.TestViewProvider
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 import java.util.stream.Stream
 
 @Component
@@ -106,19 +105,19 @@ class GebWithLocalBrowsers implements GebFeature {
         )
 
         Project project = generatorContext.getProject()
-        TestRockerModelProvider provider = new DefaultTestRockerModelProvider(
-                gebSpec.template(project)
+        TestViewProvider provider = new DefaultTestViewProvider(
+                GspView.of('/forge/feature/test/template/gebSpec.gsp', [project: project])
         )
         generatorContext.addTemplate('applicationTest',
-                new RockerTemplate(
+                new GspTemplate(
                         generatorContext.getIntegrationTestSourcePath('/{packagePath}/{className}'),
-                        provider.findModel(TestFramework.SPOCK)
+                        provider.findView(TestFramework.SPOCK)
                 )
         )
         generatorContext.addTemplate('gebConfig',
-                new RockerTemplate(
+                new GspTemplate(
                         'src/integration-test/resources/GebConfig.groovy',
-                        gebConfig.template(project)
+                        GspView.of('/forge/feature/test/template/gebConfig.gsp', [project: project])
                 )
         )
     }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/test/GebWithTestcontainers.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/test/GebWithTestcontainers.groovy
index 276f973b3c..093e0a5c2b 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/test/GebWithTestcontainers.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/test/GebWithTestcontainers.groovy
@@ -28,12 +28,12 @@ import org.grails.forge.build.dependencies.Dependency
 import org.grails.forge.feature.DefaultFeature
 import org.grails.forge.feature.Feature
 import org.grails.forge.feature.FeatureContext
-import org.grails.forge.feature.test.template.containerGebSpec
-import org.grails.forge.options.DefaultTestRockerModelProvider
+import org.grails.forge.options.DefaultTestViewProvider
 import org.grails.forge.options.Options
 import org.grails.forge.options.TestFramework
-import org.grails.forge.options.TestRockerModelProvider
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.options.TestViewProvider
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 @Component
 @CompileStatic
@@ -93,13 +93,13 @@ class GebWithTestcontainers implements GebFeature, DefaultFeature {
                 .integrationTestImplementationTestFixtures())
 
         Project project = generatorContext.getProject()
-        TestRockerModelProvider provider = new DefaultTestRockerModelProvider(
-                containerGebSpec.template(project)
+        TestViewProvider provider = new DefaultTestViewProvider(
+                GspView.of('/forge/feature/test/template/containerGebSpec.gsp', [project: project])
         )
         generatorContext.addTemplate('applicationTest',
-                new RockerTemplate(
+                new GspTemplate(
                         generatorContext.getIntegrationTestSourcePath('/{packagePath}/{className}'),
-                        provider.findModel(TestFramework.SPOCK)
+                        provider.findView(TestFramework.SPOCK)
                 )
         )
     }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/view/json/ViewJson.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/view/json/ViewJson.groovy
index afef99c127..079dc00510 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/view/json/ViewJson.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/view/json/ViewJson.groovy
@@ -28,14 +28,10 @@ import org.grails.forge.build.gradle.GradlePlugin
 import org.grails.forge.feature.DefaultFeature
 import org.grails.forge.feature.Feature
 import org.grails.forge.feature.view.GrailsViews
-import org.grails.forge.feature.view.json.templates._errors
-import org.grails.forge.feature.view.json.templates._object
-import org.grails.forge.feature.view.json.templates.error
-import org.grails.forge.feature.view.json.templates.index
-import org.grails.forge.feature.view.json.templates.notFound
 import org.grails.forge.feature.web.GrailsWeb
 import org.grails.forge.options.Options
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 @Component
 @CompileStatic
@@ -83,11 +79,11 @@ class ViewJson extends GrailsViews implements DefaultFeature {
                 .artifactId('grails-testing-support-views-gson')
                 .testImplementation())
 
-        generatorContext.addTemplate('application_index_gson', new RockerTemplate(getViewFolderPath() + 'application/index.gson', index.template()))
-        generatorContext.addTemplate('_errors_gson', new RockerTemplate(getViewFolderPath() + 'errors/_errors.gson', _errors.template()))
-        generatorContext.addTemplate('_object_gson', new RockerTemplate(getViewFolderPath() + 'object/_object.gson', _object.template()))
-        generatorContext.addTemplate('error_gson', new RockerTemplate(getViewFolderPath() + 'error.gson', error.template()))
-        generatorContext.addTemplate('notFound_gson', new RockerTemplate(getViewFolderPath() + 'notFound.gson', notFound.template()))
+        generatorContext.addTemplate('application_index_gson', new GspTemplate(getViewFolderPath() + 'application/index.gson', GspView.of('/forge/feature/view/json/templates/index.gsp', [:])))
+        generatorContext.addTemplate('_errors_gson', new GspTemplate(getViewFolderPath() + 'errors/_errors.gson', GspView.of('/forge/feature/view/json/templates/_errors.gsp', [:])))
+        generatorContext.addTemplate('_object_gson', new GspTemplate(getViewFolderPath() + 'object/_object.gson', GspView.of('/forge/feature/view/json/templates/_object.gsp', [:])))
+        generatorContext.addTemplate('error_gson', new GspTemplate(getViewFolderPath() + 'error.gson', GspView.of('/forge/feature/view/json/templates/error.gsp', [:])))
+        generatorContext.addTemplate('notFound_gson', new GspTemplate(getViewFolderPath() + 'notFound.gson', GspView.of('/forge/feature/view/json/templates/notFound.gsp', [:])))
     }
 
     @Override
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/view/markup/ViewMarkup.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/view/markup/ViewMarkup.groovy
index b27fcfe262..75a3c663a4 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/view/markup/ViewMarkup.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/feature/view/markup/ViewMarkup.groovy
@@ -26,13 +26,9 @@ import org.grails.forge.build.dependencies.Dependency
 import org.grails.forge.build.gradle.GradlePlugin
 import org.grails.forge.feature.Feature
 import org.grails.forge.feature.view.GrailsViews
-import org.grails.forge.feature.view.markup.templates._errors
-import org.grails.forge.feature.view.markup.templates._object
-import org.grails.forge.feature.view.markup.templates.error
-import org.grails.forge.feature.view.markup.templates.index
-import org.grails.forge.feature.view.markup.templates.notFound
 import org.grails.forge.feature.web.GrailsWeb
-import org.grails.forge.template.RockerTemplate
+import org.grails.forge.template.GspTemplate
+import org.grails.forge.template.GspView
 
 @Component
 @CompileStatic
@@ -71,11 +67,11 @@ class ViewMarkup extends GrailsViews implements Feature {
                 .artifactId('grails-views-markup')
                 .implementation())
 
-        generatorContext.addTemplate('application_index_gml', new RockerTemplate(getViewFolderPath() + 'application/index.gml', index.template()))
-        generatorContext.addTemplate('_errors_gml', new RockerTemplate(getViewFolderPath() + 'errors/_errors.gml', _errors.template()))
-        generatorContext.addTemplate('_object_gml', new RockerTemplate(getViewFolderPath() + 'object/_object.gml', _object.template()))
-        generatorContext.addTemplate('error_gml', new RockerTemplate(getViewFolderPath() + 'error.gml', error.template()))
-        generatorContext.addTemplate('notFound_gml', new RockerTemplate(getViewFolderPath() + 'notFound.gml', notFound.template()))
+        generatorContext.addTemplate('application_index_gml', new GspTemplate(getViewFolderPath() + 'application/index.gml', GspView.of('/forge/feature/view/markup/templates/index.gsp', [:])))
+        generatorContext.addTemplate('_errors_gml', new GspTemplate(getViewFolderPath() + 'errors/_errors.gml', GspView.of('/forge/feature/view/markup/templates/_errors.gsp', [:])))
+        generatorContext.addTemplate('_object_gml', new GspTemplate(getViewFolderPath() + 'object/_object.gml', GspView.of('/forge/feature/view/markup/templates/_object.gsp', [:])))
+        generatorContext.addTemplate('error_gml', new GspTemplate(getViewFolderPath() + 'error.gml', GspView.of('/forge/feature/view/markup/templates/error.gsp', [:])))
+        generatorContext.addTemplate('notFound_gml', new GspTemplate(getViewFolderPath() + 'notFound.gml', GspView.of('/forge/feature/view/markup/templates/notFound.gsp', [:])))
     }
 
 }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/DefaultTestRockerModelProvider.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/DefaultTestViewProvider.groovy
similarity index 81%
rename from grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/DefaultTestRockerModelProvider.groovy
rename to grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/DefaultTestViewProvider.groovy
index 76bfe190c5..82cefb6662 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/DefaultTestRockerModelProvider.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/DefaultTestViewProvider.groovy
@@ -19,19 +19,19 @@
 package org.grails.forge.options
 
 import groovy.transform.CompileStatic
-import com.fizzed.rocker.RockerModel
+import org.grails.forge.template.GspView
 
 @CompileStatic
-class DefaultTestRockerModelProvider implements TestRockerModelProvider {
+class DefaultTestViewProvider implements TestViewProvider {
 
-    private final RockerModel spock
+    private final GspView spock
 
-    DefaultTestRockerModelProvider(RockerModel spock) {
+    DefaultTestViewProvider(GspView spock) {
         this.spock = spock
     }
 
     @Override
-    RockerModel spock() {
+    GspView spock() {
         return spock
     }
 
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/TestRockerModelProvider.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/TestViewProvider.groovy
similarity index 78%
rename from grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/TestRockerModelProvider.groovy
rename to grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/TestViewProvider.groovy
index dc618d5f74..77d64c7082 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/TestRockerModelProvider.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/options/TestViewProvider.groovy
@@ -19,29 +19,29 @@
 package org.grails.forge.options
 
 import groovy.transform.CompileStatic
-import com.fizzed.rocker.RockerModel
+import org.grails.forge.template.GspView
 
 @CompileStatic
-interface TestRockerModelProvider {
+interface TestViewProvider {
 
     /**
      *
      * @param testFramework selected test framework
-     * @return A {@link RockerModel}
+     * @return A {@link GspView}
      * @throws IllegalArgumentException if the test framework / language combination is not handled
      */
-    default RockerModel findModel(TestFramework testFramework) throws IllegalArgumentException {
+    default GspView findView(TestFramework testFramework) throws IllegalArgumentException {
         switch (testFramework) {
             case TestFramework.SPOCK:
                 return spock()
             default:
-                throw new IllegalArgumentException('unable to find a RockerModel for testFramework: ' + testFramework.getName())
+                throw new IllegalArgumentException('unable to find a GspView for testFramework: ' + testFramework.getName())
         }
     }
 
     /**
      *
-     * @return {@link RockerModel} for {@link TestFramework#SPOCK}
+     * @return {@link GspView} for {@link TestFramework#SPOCK}
      */
-    RockerModel spock()
+    GspView spock()
 }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/ForgePages.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/ForgePages.groovy
new file mode 100644
index 0000000000..a80daf1774
--- /dev/null
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/ForgePages.groovy
@@ -0,0 +1,106 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.template
+
+import java.util.concurrent.ConcurrentHashMap
+
+import groovy.transform.CompileStatic
+import groovy.transform.PackageScope
+
+import org.grails.gsp.GroovyPagesTemplateEngine
+import org.grails.gsp.io.DefaultGroovyPageLocator
+import org.grails.gsp.io.GroovyPageScriptSource
+
+/**
+ * Renders the generator's pages: the GSPs of {@code grails-app/views/forge}, compiled when the module
+ * declaring them is built and registered in its {@code gsp/views.properties}. They are rendered by
+ * the GSP engine alone, without a web request, so the generator renders them the same way inside the
+ * web application, the command line application and a test.
+ */
+@CompileStatic
+@PackageScope
+final class ForgePages {
+
+    /**
+     * The views registry every module compiling pages writes, the Forge plugin's and the command line
+     * application's among them.
+     */
+    static final String VIEWS_REGISTRY = 'gsp/views.properties'
+
+    /**
+     * The URI prefix, in the registry, of the generator's pages.
+     */
+    static final String PAGES_PREFIX = '/WEB-INF/grails-app/views/forge/'
+
+    private final GroovyPagesTemplateEngine engine
+    private final Map<String, groovy.text.Template> pages = new ConcurrentHashMap<>()
+
+    private ForgePages(ClassLoader classLoader) {
+        DefaultGroovyPageLocator locator = new DefaultGroovyPageLocator() {
+            @Override
+            protected boolean isDevelopmentMode() {
+                // the pages are only ever used compiled: their sources are not on the class path
+                false
+            }
+        }
+        locator.precompiledGspMap = compiledPages(classLoader)
+        engine = new GroovyPagesTemplateEngine()
+        engine.groovyPageLocator = locator
+        engine.classLoader = classLoader
+        engine.afterPropertiesSet()
+    }
+
+    static void render(String uri, Map<String, Object> model, Writer out) {
+        Holder.INSTANCE.page(uri).make(model).writeTo(out)
+    }
+
+    private groovy.text.Template page(String uri) {
+        pages.computeIfAbsent(uri) { String key ->
+            GroovyPageScriptSource source = engine.findScriptSource(key)
+            if (source == null) {
+                throw new IllegalArgumentException("No compiled page ${key}: a page of the generator lives " +
+                        'under grails-app/views/forge of a module compiling its pages')
+            }
+            engine.createTemplate(source)
+        }
+    }
+
+    private static Map<String, String> compiledPages(ClassLoader classLoader) {
+        Map<String, String> compiled = [:]
+        for (URL registry : Collections.list(classLoader.getResources(VIEWS_REGISTRY))) {
+            Properties views = new Properties()
+            registry.withInputStream { InputStream input -> views.load(input) }
+            for (String name : views.stringPropertyNames()) {
+                if (name.startsWith(PAGES_PREFIX)) {
+                    compiled[name] = views.getProperty(name)
+                }
+            }
+        }
+        compiled
+    }
+
+    private static final class Holder {
+
+        static final ForgePages INSTANCE = new ForgePages(ForgePages.classLoader)
+
+        private Holder() {
+        }
+    }
+}
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/RockerTemplate.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/GspTemplate.groovy
similarity index 72%
rename from grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/RockerTemplate.groovy
rename to grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/GspTemplate.groovy
index 14f0e78e3b..a513bc79f4 100644
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/RockerTemplate.groovy
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/GspTemplate.groovy
@@ -16,32 +16,34 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+
 package org.grails.forge.template
 
 import groovy.transform.CompileStatic
-import com.fizzed.rocker.RockerModel
 
+/**
+ * A file of the generated project written by rendering a page of the generator.
+ */
 @CompileStatic
-class RockerTemplate implements Template {
+class GspTemplate implements Template {
 
     private final String path
-    private final RockerWritable writable
-
+    private final GspView view
     private final boolean executable
 
-    RockerTemplate(String path, RockerModel delegate) {
-        this(path, delegate, false)
+    GspTemplate(String path, GspView view) {
+        this(path, view, false)
     }
 
-    RockerTemplate(String path, RockerModel delegate, boolean executable) {
+    GspTemplate(String path, GspView view, boolean executable) {
         this.path = path
-        this.writable = new RockerWritable(delegate)
+        this.view = view
         this.executable = executable
     }
 
     @Override
-    void write(OutputStream outputStream) {
-        writable.write(outputStream)
+    void write(OutputStream outputStream) throws IOException {
+        view.write(outputStream)
     }
 
     @Override
@@ -53,4 +55,8 @@ class RockerTemplate implements Template {
     boolean isExecutable() {
         return executable
     }
+
+    GspView getView() {
+        return view
+    }
 }
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/GspView.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/GspView.groovy
new file mode 100644
index 0000000000..0c07fe090c
--- /dev/null
+++ b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/GspView.groovy
@@ -0,0 +1,69 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.template
+
+import java.nio.charset.StandardCharsets
+
+import groovy.transform.CompileStatic
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+/**
+ * A page of the generator and the model it is rendered with. The pages are GSPs compiled with the
+ * Forge plugin, under {@code grails-app/views/forge}, and are named by their URI, such as
+ * {@code /forge/feature/build/gradle/templates/buildGradle.gsp}.
+ */
+@CompileStatic
+@EqualsAndHashCode
+@ToString(includeNames = true)
+final class GspView implements Writable {
+
+    final String uri
+    final Map<String, Object> model
+
+    private GspView(String uri, Map<String, Object> model) {
+        this.uri = uri
+        this.model = Collections.unmodifiableMap(new LinkedHashMap<String, Object>(model))
+    }
+
+    /**
+     * @param uri the URI of the page, such as {@code /forge/feature/cli.gsp}
+     * @param model the values of the page's model, by name
+     */
+    static GspView of(String uri, Map<String, ?> model) {
+        new GspView(uri, (Map<String, Object>) model)
+    }
+
+    /**
+     * @return the page rendered with the model
+     */
+    String render() {
+        StringWriter out = new StringWriter()
+        ForgePages.render(uri, model, out)
+        out.toString()
+    }
+
+    @Override
+    void write(OutputStream outputStream) throws IOException {
+        Writer writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)
+        ForgePages.render(uri, model, writer)
+        writer.flush()
+    }
+}
diff --git a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/RockerWritable.groovy b/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/RockerWritable.groovy
deleted file mode 100644
index 66162ef70c..0000000000
--- a/grails-forge/grails-forge-core/src/main/groovy/org/grails/forge/template/RockerWritable.groovy
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.template
-
-import groovy.transform.CompileStatic
-import com.fizzed.rocker.RockerModel
-import com.fizzed.rocker.runtime.OutputStreamOutput
-
-@CompileStatic
-class RockerWritable implements Writable {
-
-    private final RockerModel model
-
-    RockerWritable(RockerModel model) {
-        this.model = model
-    }
-
-    @Override
-    void write(OutputStream outputStream) {
-        model.render((contentType, charsetName) ->
-                new OutputStreamOutput(contentType, outputStream, charsetName))
-    }
-}
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw
deleted file mode 100644
index 4c00ea737f..0000000000
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw
+++ /dev/null
@@ -1,156 +0,0 @@
-@*
-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.
-*@
-
-@import java.util.function.Function
-@import org.grails.forge.application.ApplicationType
-@import org.grails.forge.build.dependencies.CoordinateResolver
-@import org.grails.forge.application.Project
-@import org.grails.forge.build.dependencies.Coordinate
-@import org.grails.forge.build.gradle.GradleBuild
-@import org.grails.forge.build.gradle.GradleDsl
-@import org.grails.forge.build.gradle.GradlePlugin
-@import org.grails.forge.feature.Features
-@import org.grails.forge.util.VersionInfo
-@import org.grails.forge.options.JdkVersion
-@import org.grails.forge.build.gradle.GradleDependency
-@import org.grails.forge.build.gradle.GradleRepository
-
-@args (
-ApplicationType applicationType,
-Project project,
-Function<String, Coordinate> coordinateResolver,
-Features features,
-GradleBuild gradleBuild,
-String grailsVersion
-)
-
-@seleniumVersion => {@coordinateResolver.apply("selenium-api").getVersion()}
-
-
-@if (!features.contains("gradle-build-src") && !gradleBuild.getBuildscriptDependencies().isEmpty()) {
-buildscript {
-    repositories {
-    @for (GradleRepository repo : gradleBuild.getBuildRepositories()) {
-        @repo.toSnippet("        ")
-    }
-    }
-    dependencies { // Not Published to Gradle Plugin Portal
-    @for (GradleDependency dependency : gradleBuild.getBuildscriptDependencies()) {
-        @dependency.toSnippet()
-    }
-    }
-}
-
-}
-
-@for (String importLine : gradleBuild.getPluginsImports()) {
-@(importLine)
-}
-plugins {
-@for (GradlePlugin gradlePlugin : gradleBuild.getPluginsWithoutApply()) {
-    @if(gradlePlugin.getVersion() != null) {
-    id "@gradlePlugin.getId()" version "@gradlePlugin.getVersion()"
-    } else {
-    id "@gradlePlugin.getId()"
-    }
-}
-}
-
-@if(!gradleBuild.getPluginsWithApply().isEmpty()) {
-// Not Published to Gradle Plugin Portal
-@for (GradlePlugin gradlePlugin : gradleBuild.getPluginsWithApply()) {
-apply plugin: "@gradlePlugin.getId()"
-}
-}
-
-
-group = "@project.getPackageName()"
-
-@if (features.contains("asciidoctor")) {
-apply from: "gradle/asciidoc.gradle"
-}
-
-repositories {
-@for (GradleRepository repo : gradleBuild.getRepositories()) {
-    @repo.toSnippet("    ")
-}
-}
-
-@dependencies.template(applicationType, project, features, gradleBuild)
-
-compileJava.options.release = @features.getTargetJdk()
-
-@if (features.contains("jrebel")) {
-tasks.named('bootRun') {
-    dependsOn(generateRebel)
-    if (project.hasProperty("rebelAgent")) {
-        jvmArgs(rebelAgent)
-    }
-}
-
-}
-
-@if (features.contains("spock")) {
-tasks.withType(Test).configureEach {
-    useJUnitPlatform()
-    @if (features.contains("geb-with-local-browsers")) {
-    def gebEnv = providers.systemProperty('geb.env')
-    if (gebEnv.present) {
-        systemProperty('geb.env', gebEnv.get())
-    }
-    }
-}
-}
-
-@gradleBuild.renderExtensions()
-
-@if (features.contains("grails-compile-static")) {
-grails {
-    compileStatic {
-        controllers = true
-        services = true
-        tagLibs = true
-@if (features.contains("gsp")) {
-        gsp = true
-}
-    }
-}
-
-}
-@if(features.contains("asset-pipeline-grails")) {
-assets {
-@if (applicationType == ApplicationType.WEB_PLUGIN) {
-    packagePlugin = true
-}
-    excludes = [
-            'webjars/jquery/**',
-            'webjars/bootstrap/**',
-            'webjars/bootstrap-icons/**'
-    ]
-    includes = [
-            'webjars/jquery/*/dist/jquery.js',
-            'webjars/bootstrap/*/dist/js/bootstrap.bundle.js',
-            'webjars/bootstrap/*/dist/css/bootstrap.css',
-            'webjars/bootstrap-icons/*/font/bootstrap-icons.css',
-            'webjars/bootstrap-icons/*/font/fonts/*',
-    ]
-}
-
-}
-
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleProperties.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleProperties.rocker.raw
deleted file mode 100644
index de121e769b..0000000000
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleProperties.rocker.raw
+++ /dev/null
@@ -1,33 +0,0 @@
-@*
-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.
-*@
-
-@import org.grails.forge.build.Property
-@import java.util.List
-
-@args (
-    List<Property> properties
-)
-
-@for (Property prop : properties) {
-@if (prop.isComment()) {
-#@prop.getComment()
-} else {
-@prop.getKey()=@prop.getValue()
-}
-}
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/settingsGradle.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/settingsGradle.rocker.raw
deleted file mode 100644
index 8c2063e77d..0000000000
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/settingsGradle.rocker.raw
+++ /dev/null
@@ -1,35 +0,0 @@
-@*
-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.
-*@
-
-@import java.util.function.Function
-@import org.grails.forge.application.Project
-@import org.grails.forge.build.dependencies.CoordinateResolver
-@import org.grails.forge.build.dependencies.Coordinate
-@import org.grails.forge.build.gradle.GradleBuild
-@import org.grails.forge.build.gradle.GradlePlugin
-@import org.grails.forge.feature.Features
-
-@args (
-Project project,
-GradleBuild gradleBuild,
-Function<String, Coordinate> coordinateResolver,
-Features features)
-
-@gradleBuild.renderSettingsExtensions()
-rootProject.name = "@project.getName()"
\ No newline at end of file
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/cli.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/cli.rocker.raw
deleted file mode 100644
index 884900ffb3..0000000000
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/cli.rocker.raw
+++ /dev/null
@@ -1,48 +0,0 @@
-@*
-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.
-*@
-
-@import org.grails.forge.options.Language
-@import org.grails.forge.options.DevelopmentReloading
-@import org.grails.forge.options.BuildTool
-@import org.grails.forge.options.GormImpl
-@import org.grails.forge.options.ServletImpl
-@import org.grails.forge.application.Project
-@import org.grails.forge.application.ApplicationType
-@import java.util.List
-
-
-@args (
-Language language,
-DevelopmentReloading reloading,
-BuildTool buildTool,
-GormImpl gormImpl,
-ServletImpl servletImpl,
-Project project,
-List<String> features,
-ApplicationType applicationType
-)
-
-applicationType: @applicationType.getName()
-defaultPackage: @project.getPackageName()
-reloading: @reloading.getName()
-sourceLanguage: @language.getName()
-buildTool: @buildTool.getName()
-gormImpl: @gormImpl.getName()
-servletImpl: @servletImpl.getName()
-features: @features.toString()
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/template/readme.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/template/readme.rocker.raw
deleted file mode 100644
index 89a6067e60..0000000000
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/template/readme.rocker.raw
+++ /dev/null
@@ -1,41 +0,0 @@
-@*
-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.
-*@
-
-@import org.grails.forge.feature.Feature
-
-@args (
-Feature feature
-)
-
-@if (feature.getDocumentation() != null || feature.getThirdPartyDocumentation() != null) {
-
-
-## Feature @feature.getName() documentation
-
-    @if (feature.getDocumentation() != null) {
-
-- [Grails @feature.getTitle().replaceFirst("^Grails\\s+(.*)", "$1") documentation](@feature.getDocumentation())
-
-    }
-    @if (feature.getThirdPartyDocumentation() != null) {
-
-- [@feature.getThirdPartyDocumentation()](@feature.getThirdPartyDocumentation())
-
-    }
-}
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/BuildBuilder.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/BuildBuilder.groovy
index 53e505c648..f8d86d05df 100644
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/BuildBuilder.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/BuildBuilder.groovy
@@ -29,12 +29,11 @@ import org.grails.forge.build.dependencies.LookupFailedException
 import org.grails.forge.build.gradle.GradleBuild
 import org.grails.forge.build.gradle.GradleBuildCreator
 import org.grails.forge.feature.Features
-import org.grails.forge.feature.build.gradle.templates.buildGradle
-import org.grails.forge.feature.build.gradle.templates.buildSrcBuildGradle
 import org.grails.forge.fixture.ContextFixture
 import org.grails.forge.fixture.ProjectFixture
 import org.grails.forge.options.*
 import org.grails.forge.util.VersionInfo
+import org.grails.forge.template.GspView
 import org.springframework.context.ApplicationContext
 
 import java.util.function.Function
@@ -116,7 +115,7 @@ class BuildBuilder implements ProjectFixture, ContextFixture {
         CoordinateResolver resolver = ctx.getBean(CoordinateResolver);
         Function<String, Coordinate> coordinateResolver = (artifactId) -> resolver.resolve(artifactId).orElseThrow(() -> new LookupFailedException(artifactId))
         String grailsVersion = VersionInfo.grailsVersion
-        return buildGradle.template(type, project, coordinateResolver, features, build, grailsVersion).render().toString()
+        return GspView.of('/forge/feature/build/gradle/templates/buildGradle.gsp', [applicationType: type, project: project, coordinateResolver: coordinateResolver, features: features, gradleBuild: build, grailsVersion: grailsVersion]).render()
     }
 
     String renderBuildSrc() {
@@ -131,7 +130,7 @@ class BuildBuilder implements ProjectFixture, ContextFixture {
         Features features = getFeatures(featureNames, options, type)
         String grailsVersion = VersionInfo.grailsVersion
         GradleBuild build = gradleBuild(options, features, project, type)
-        return buildSrcBuildGradle.template(type, project, features, build, grailsVersion).render().toString()
+        return GspView.of('/forge/feature/build/gradle/templates/buildSrcBuildGradle.gsp', [applicationType: type, project: project, features: features, gradleBuild: build, grailsVersion: grailsVersion]).render()
     }
 
     private GradleBuildCreator getGradleDependencyResolver() {
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/options/TestRockerModelProviderSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/options/TestViewProviderSpec.groovy
similarity index 83%
rename from grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/options/TestRockerModelProviderSpec.groovy
rename to grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/options/TestViewProviderSpec.groovy
index 5016309681..21f9eeca1c 100644
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/options/TestRockerModelProviderSpec.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/options/TestViewProviderSpec.groovy
@@ -19,25 +19,25 @@
 
 package org.grails.forge.options
 
-import com.fizzed.rocker.RockerModel
 import spock.lang.Specification
 import spock.lang.Unroll
+import org.grails.forge.template.GspView
 
-class TestRockerModelProviderSpec extends Specification {
+class TestViewProviderSpec extends Specification {
 
     @Unroll
     void "a delegate method is defined for test framework: #testFramework "(TestFramework testFramework) {
         given:
-        TestRockerModelProvider provider = new TestRockerModelProvider() {
+        TestViewProvider provider = new TestViewProvider() {
 
             @Override
-            RockerModel spock() {
+            GspView spock() {
                 return null
             }
         }
 
         when:
-        provider.findModel(testFramework)
+        provider.findView(testFramework)
 
         then:
         noExceptionThrown()
diff --git a/grails-forge/grails-forge-web/src/main/groovy/org/grails/forge/api/ForgeApplicationService.groovy b/grails-forge/grails-forge-web/src/main/groovy/org/grails/forge/api/ForgeApplicationService.groovy
index 7196afd42f..851d00cbb8 100644
--- a/grails-forge/grails-forge-web/src/main/groovy/org/grails/forge/api/ForgeApplicationService.groovy
+++ b/grails-forge/grails-forge-web/src/main/groovy/org/grails/forge/api/ForgeApplicationService.groovy
@@ -25,12 +25,10 @@ import org.grails.forge.options.GormImpl
 import org.grails.forge.options.JdkVersion
 import org.grails.forge.options.Options
 import org.grails.forge.options.ServletImpl
-import org.grails.forge.template.RockerWritable
-import org.grails.forge.template.api.grailsForgeApi
 import org.grails.forge.util.VersionInfo
+import org.grails.forge.template.GspView
 import org.springframework.context.MessageSource
 import org.springframework.stereotype.Service
-import java.nio.charset.StandardCharsets
 import java.util.stream.Collectors
 
 @Service
@@ -56,12 +54,10 @@ class ForgeApplicationService {
     }
 
     String homeText(RequestInfo info) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream()
-        new RockerWritable(new grailsForgeApi()
-                .serverURL(info.getServerURL())
-                .grailsVersion(VersionInfo.getGrailsVersion()))
-                .write(outputStream)
-        return outputStream.toString(StandardCharsets.UTF_8)
+        return GspView.of('/forge/template/api/grailsForgeApi.gsp', [
+                serverURL: info.getServerURL(),
+                grailsVersion: VersionInfo.getGrailsVersion()
+        ]).render()
     }
 
     ApplicationTypeList list(RequestInfo info) {
diff --git a/grails-forge/test-core/build.gradle b/grails-forge/test-core/build.gradle
index f09bdcc2b7..dfdd5fa869 100644
--- a/grails-forge/test-core/build.gradle
+++ b/grails-forge/test-core/build.gradle
@@ -22,7 +22,6 @@ plugins {
     id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
     id 'org.apache.grails.buildsrc.dependency-validator'
-    id 'org.grails.forge.rocker'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.gradle.grails-code-style'
 }
@@ -30,14 +29,6 @@ plugins {
 version = projectVersion
 group = 'org.apache.grails.forge'
 
-sourceSets {
-    test {
-        rocker {
-            srcDir('src/test/groovy')
-        }
-    }
-}
-
 configurations.register('generateConfig')
 configurations.configureEach {
     resolutionStrategy {
diff --git a/grails-gradle/gradle/wrapper/gradle-wrapper.properties b/grails-gradle/gradle/wrapper/gradle-wrapper.properties
index 814d929a9f..d609ab0bb9 100644
--- a/grails-gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/grails-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 # Keep gradle version synced with .sdkmanrc, gradle.properties (gradleToolingApiVersion), all other gradle-wrapper.properties files,
-# and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
+# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
diff --git a/grails-profiles/base/skeleton/gradle/wrapper/gradle-wrapper.properties b/grails-profiles/base/skeleton/gradle/wrapper/gradle-wrapper.properties
index 6736918147..da6719cc98 100644
--- a/grails-profiles/base/skeleton/gradle/wrapper/gradle-wrapper.properties
+++ b/grails-profiles/base/skeleton/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 # Keep gradle version synced with .sdkmanrc, gradle.properties (gradleToolingApiVersion), all other gradle-wrapper.properties files,
-# and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
+# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
diff --git a/grails-profiles/profile/skeleton/gradle/wrapper/gradle-wrapper.properties b/grails-profiles/profile/skeleton/gradle/wrapper/gradle-wrapper.properties
index 6736918147..da6719cc98 100644
--- a/grails-profiles/profile/skeleton/gradle/wrapper/gradle-wrapper.properties
+++ b/grails-profiles/profile/skeleton/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 # Keep gradle version synced with .sdkmanrc, gradle.properties (gradleToolingApiVersion), all other gradle-wrapper.properties files,
-# and grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw
+# and grails-forge/grails-forge-core/grails-app/views/forge/feature/build/gradle/templates/gradleWrapperProperties.gsp
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip


(grails-core) 03/07: Make Forge a Grails plugin hosted by a web application and a CLI application

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 46ff841f4e3eaf2a92c171620a9d36bb45c29bb3
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Oct 7 10:14:14 2026 -0400

    Make Forge a Grails plugin hosted by a web application and a CLI application
    
    Forge stays its own composite build, consuming the framework by coordinates through the
    includeBuild substitution, and is now built with Grails itself, in Groovy compiled statically:
    
    - grails-forge-core is a Grails plugin. ForgeGrailsPlugin imports ForgeCoreConfiguration, which
      registers the feature catalogue, the project generator and the context factory as the components
      under org.grails.forge; the descriptor is listed as the plugin's Spring Boot auto-configuration.
      The message bundles and GSPs under its resources are templates the generator writes into
      generated applications, so they stay in the plugin's resources as written.
    - grails-forge-web is the Grails web application serving the hosted generator's HTTP API. The REST
      services and DTOs of the former grails-forge-api module live in it, the controllers are Grails
      controllers with typed action parameters, and the option messages are its i18n bundle. The JSON
      is written by Spring Boot's Jackson mapper, configured in application.yml, with a mixin that
      leaves out the metaClass of the Groovy DTOs. The OpenAPI description is derived by grails-openapi
      from the URL mappings and the controllers, enriched by their annotations, and served by springdoc
      with Swagger UI beside it. The hosted service keeps accepting what the Micronaut service accepted:
      application types named hyphenated, underscored or upper case, and features listed comma
      separated. A name the generator rejects is a client error, and a generation that fails once the
      archive is being streamed is logged.
    - grails-forge-cli is a Grails application without a web server, started through
      GrailsAppBuilder.web(WebApplicationType.NONE) by Application.builder(), which main, the
      interactive shell and the specs all run. The launcher assembles it with the shell CLI into one
      jar, so it declares the plugins it runs (core and Forge) through an explicit PluginDiscovery
      instead of discovering descriptors on the class path, and defaults its Grails environment to
      production so no development watcher starts in the user's directory. The shadow jars merge the
      Spring Boot auto-configuration imports and spring.factories the application needs.
    - The Postgres analytics module and the Micronaut Netty host are gone with the Micronaut runtime.
    - Forge-local style and ignore configuration is gone; the modules apply the repository's code style
      plugin and the root ignore rules, and the Forge build conventions come from build-logic.
    - The TestKit publish of the framework into build/local-maven is wired only for the two modules
      whose specs build generated applications. Those specs take TestKit without the Groovy Gradle
      itself runs on, so the Groovy compiler and runtime of the suite are the ones of grails-bom.
    
    What Groovy reads differently from Java, and what changed for it: a lowercase class name is a
    variable unless it is imported, so the two templates that lived beside their feature moved into a
    templates package; Type::isInstance and Type::cast bind to an instance of the type, so the stream
    filters say it instanceof Type; == in an equals implementation calls equals, so the identity checks
    use is(); an enum constant in a case label is qualified; a char is not concatenated with a String;
    and the stream collectors and comparators whose type arguments Groovy cannot infer became loops and
    closures. The Rocker templates stay as they are.
    
    Co-authored-by: James Fredley <ja...@users.noreply.github.com>
---
 .agents/skills/gradle-developer/SKILL.md           |   2 +-
 .github/workflows/forge-deploy-aws.yml             |   4 +-
 .gitignore                                         |   3 +
 AGENTS.md                                          |   2 +-
 RELEASE.md                                         |   6 +-
 THREAT_MODEL.md                                    |   6 +-
 gradle/rat-root-config.gradle                      |   2 +-
 grails-forge/.gitattributes                        |   5 -
 grails-forge/.gitignore                            |  20 -
 grails-forge/README.md                             |  46 +-
 grails-forge/build.gradle                          |   5 -
 grails-forge/buildSrc/build.gradle                 |  63 ---
 grails-forge/buildSrc/settings.gradle              |  35 --
 .../buildsrc/WriteGrailsVersionInfoTask.groovy     | 106 -----
 .../GrailsGroovyExtensionTransformer.groovy        | 112 -----
 .../shadowjar/GrailsShadowLicenseTransform.groovy  | 265 ------------
 .../shadowjar/GrailsShadowNoticeTransform.groovy   |  45 --
 .../internal/tasks/GenerateManpageAsciidoc.java    |  68 ---
 .../internal/tasks/PicocliBuildCompletionTask.java |  63 ---
 .../forge/rocker/plugin/JavaGeneratorRunnable.java | 166 --------
 .../forge/rocker/plugin/RockerConfiguration.java   |  99 -----
 .../grails/forge/rocker/plugin/RockerPlugin.java   |  92 ----
 .../rocker/plugin/RockerSourceSetProperty.java     |  80 ----
 .../org/grails/forge/rocker/plugin/RockerTask.java | 186 --------
 .../forge/rocker/plugin/TemplateDirectorySet.java  | 124 ------
 .../forge/rocker/plugin/WhitespaceProcessor.java   |  52 ---
 grails-forge/config/checkstyle/checkstyle.xml      | 227 ----------
 grails-forge/config/spotless.license.java          |  18 -
 grails-forge/docs/aws-elastic-beanstalk.md         |   6 +-
 grails-forge/docs/choose-postgresql.png            | Bin 108993 -> 0 bytes
 grails-forge/docs/cloud_sql_create_intance.png     | Bin 100207 -> 0 bytes
 grails-forge/docs/create-database.png              | Bin 150843 -> 0 bytes
 grails-forge/docs/create-two-databases.png         | Bin 175471 -> 0 bytes
 grails-forge/docs/dbinstance-options.png           | Bin 100921 -> 0 bytes
 grails-forge/docs/enable-cloud-sql-admin-api.png   | Bin 151032 -> 0 bytes
 grails-forge/docs/enable-compute-engine-api.png    | Bin 79831 -> 0 bytes
 .../etc/bin/generate-build-artifact-hashes.groovy  |  79 ----
 grails-forge/etc/bin/test-reproducible-builds.sh   |  64 ---
 grails-forge/gradle.properties                     |  32 +-
 grails-forge/gradle/code-style-config.gradle       |  63 ---
 grails-forge/gradle/doc-config.gradle              |   8 +-
 grails-forge/gradle/groovy-version-pin.gradle      |  29 --
 .../gradle/micronaut-openapi-config.gradle         |  53 ---
 grails-forge/gradle/test-config.gradle             |  24 +-
 grails-forge/grails-cli-shadow/build.gradle        |  10 +
 grails-forge/grails-cli/build.gradle               |  15 +-
 .../grails/cli/DelegatingShellApplication.groovy   |   2 +-
 .../grails-forge-analytics-postgres/build.gradle   | 120 ------
 .../analytics/postgres/AnalyticsController.java    |  98 -----
 .../forge/analytics/postgres/Application.java      | 140 ------
 .../analytics/postgres/ApplicationRepository.java  |  53 ---
 .../grails/forge/analytics/postgres/Feature.java   |  79 ----
 .../analytics/postgres/FeatureRepository.java      | 121 ------
 .../org/grails/forge/analytics/postgres/Main.java  |  49 ---
 .../postgres/gcp/GoogleCloudSqlSetup.java          |  58 ---
 .../native-image.properties                        |  24 --
 .../src/main/resources/application-dev.yml         |   9 -
 .../src/main/resources/application.yml             |  14 -
 .../resources/databasemigrations/V1__schema.sql    |  21 -
 .../src/main/resources/logback.xml                 |  15 -
 .../postgres/StoreGeneratedProjectStatsSpec.groovy | 125 ------
 grails-forge/grails-forge-api/build.gradle         |  83 ----
 .../grails/forge/api/ApplicationController.java    | 240 -----------
 .../org/grails/forge/api/ApplicationTypeDTO.java   | 129 ------
 .../forge/api/ApplicationTypeOperations.java       |  75 ----
 .../org/grails/forge/api/DevelopmentReloading.java |  50 ---
 .../grails/forge/api/DevelopmentReloadingDTO.java  | 103 -----
 .../main/java/org/grails/forge/api/FeatureDTO.java | 153 -------
 .../java/org/grails/forge/api/FeatureService.java  | 104 -----
 .../java/org/grails/forge/api/GormImplDTO.java     | 111 -----
 .../java/org/grails/forge/api/JdkVersionDTO.java   | 110 -----
 .../java/org/grails/forge/api/LanguageDTO.java     | 124 ------
 .../main/java/org/grails/forge/api/LinkDTO.java    |  63 ---
 .../java/org/grails/forge/api/RequestInfo.java     | 139 ------
 .../java/org/grails/forge/api/SelectOptionDTO.java |  62 ---
 .../java/org/grails/forge/api/ServletImplDTO.java  | 100 -----
 .../forge/api/analytics/GenerationListener.java    |  68 ---
 .../forge/api/bind/RequestInfoArgumentBinder.java  |  93 ----
 .../forge/api/create/AbstractCreateController.java | 117 -----
 .../forge/api/create/zip/ZipCreateController.java  | 196 ---------
 .../forge/api/create/zip/ZipCreateOperation.java   |  69 ---
 .../org/grails/forge/api/diff/DiffController.java  | 228 ----------
 .../org/grails/forge/api/diff/DiffOperations.java  |  92 ----
 .../api/options/ApplicationTypeSelectOptions.java  |  42 --
 .../options/DevelopmentReloadingSelectOptions.java |  42 --
 .../forge/api/options/JdkVersionSelectOptions.java |  42 --
 .../forge/api/options/LanguageSelectOptions.java   |  42 --
 .../forge/api/options/SelectOptionsController.java |  60 ---
 .../forge/api/options/SelectOptionsOperations.java |  27 --
 .../api/options/ServletImplSelectOptions.java      |  42 --
 .../forge/api/preview/PreviewController.java       | 120 ------
 .../forge/api/preview/PreviewOperations.java       |  61 ---
 .../grails-forge-api/reflect-config.json           |  52 ---
 .../grails-forge-api/resource-config.json          |  11 -
 .../src/main/resources/application.yml             |   5 -
 .../src/main/resources/select_options.properties   |   1 -
 .../forge/api/ApplicationControllerSpec.groovy     |  98 -----
 .../grails/forge/api/ApplicationTypeClient.groovy  |  42 --
 .../org/grails/forge/api/CreateClient.groovy       |  57 ---
 .../groovy/org/grails/forge/api/DiffClient.groovy  |  56 ---
 .../org/grails/forge/api/DiffControllerSpec.groovy |  85 ----
 .../grails/forge/api/FeatureControllerSpec.groovy  | 211 ---------
 .../org/grails/forge/api/PreviewClient.groovy      |  42 --
 .../grails/forge/api/PreviewControllerSpec.groovy  |  62 ---
 .../forge/api/ZipCreateControllerSpec.groovy       | 145 -------
 .../src/test/resources/features_es.properties      |   4 -
 .../src/test/resources/logback.xml                 |  17 -
 grails-forge/grails-forge-cli/build.gradle         |  82 ++--
 .../grails-app/conf/application.yml                |  28 ++
 .../init/org/grails/forge/cli/Application.groovy   |  83 ++++
 .../org/grails/forge/cli/CodeGenConfig.groovy      | 189 +++++++++
 .../grails/forge/cli/CommonOptionsMixin.groovy}    |  28 +-
 .../groovy/org/grails/forge/cli/ForgeCli.groovy    | 133 ++++++
 .../org/grails/forge/cli/ForgeCommand.groovy       |  67 +++
 .../grails/forge/cli/GrailsPicocliFactory.groovy   |  59 +++
 .../org/grails/forge/cli/InteractiveShell.groovy}  | 107 ++---
 .../forge/cli/command/AddPropertyCommand.groovy    | 169 ++++++++
 .../grails/forge/cli/command/BaseCommand.groovy    |  88 ++++
 .../grails/forge/cli/command/CodeGenCommand.groovy | 118 ++++++
 .../forge/cli/command/CreateAppCommand.groovy}     |  45 +-
 .../grails/forge/cli/command/CreateCommand.groovy  | 126 ++++++
 .../cli/command/CreateControllerCommand.groovy     |  85 ++++
 .../cli/command/CreateDomainClassCommand.groovy    |  85 ++++
 .../cli/command/CreateInterceptorCommand.groovy    |  85 ++++
 .../forge/cli/command/CreateJobCommand.groovy      |  85 ++++
 .../forge/cli/command/CreatePluginCommand.groovy}  |  45 +-
 .../forge/cli/command/CreateRestApiCommand.groovy} |  45 +-
 .../forge/cli/command/CreateServiceCommand.groovy  |  85 ++++
 .../forge/cli/command/CreateTagLibCommand.groovy   |  85 ++++
 .../cli/command/CreateWebPluginCommand.groovy}     |  45 +-
 .../forge/cli/command/CreateWebappCommand.groovy}  |  45 +-
 .../command/DevelopmentReloadingCandidates.groovy} |  18 +-
 .../command/DevelopmentReloadingConverter.groovy}  |  20 +-
 .../forge/cli/command/GormImplCandidates.groovy}   |  17 +-
 .../forge/cli/command/GormImplConverter.groovy}    |  22 +-
 .../forge/cli/command/LanguageCandidates.groovy}   |  17 +-
 .../forge/cli/command/LanguageConverter.groovy}    |  18 +-
 .../grails/forge/cli/command/ListFeatures.groovy   | 106 +++++
 .../cli/command/ServletImplCandidates.groovy}      |  17 +-
 .../forge/cli/command/ServletImplConverter.groovy} |  20 +-
 .../forge/cli/util/GrailsVersionProvider.groovy}   |  28 +-
 .../java/org/grails/forge/cli/Application.java     | 128 ------
 .../java/org/grails/forge/cli/CodeGenConfig.java   | 180 --------
 .../org/grails/forge/cli/GrailsPicocliFactory.java |  57 ---
 .../forge/cli/command/AddPropertyCommand.java      | 181 --------
 .../org/grails/forge/cli/command/BaseCommand.java  |  92 ----
 .../grails/forge/cli/command/CodeGenCommand.java   | 123 ------
 .../grails/forge/cli/command/CreateCommand.java    | 137 ------
 .../forge/cli/command/CreateControllerCommand.java |  88 ----
 .../cli/command/CreateDomainClassCommand.java      |  88 ----
 .../cli/command/CreateInterceptorCommand.java      |  88 ----
 .../grails/forge/cli/command/CreateJobCommand.java |  87 ----
 .../forge/cli/command/CreateServiceCommand.java    |  88 ----
 .../forge/cli/command/CreateTagLibCommand.java     |  88 ----
 .../org/grails/forge/cli/command/ListFeatures.java | 111 -----
 .../grails-forge-cli/native-image.properties       |   2 -
 .../grails-forge-cli/resource-config.json          |   7 -
 .../src/main/resources/simplelogger.properties     |  23 +
 .../org/grails/forge/cli/ApplicationSpec.groovy    |  78 ++++
 .../CodeGenConfigDevelopmentReloadingSpec.groovy   |  24 +-
 .../org/grails/forge/cli/CommandFixture.groovy     |   6 +-
 .../groovy/org/grails/forge/cli/CommandSpec.groovy |   8 +
 .../org/grails/forge/cli/ForgeCliSpec.groovy       |  57 +++
 .../cli/command/ApplicationCommandSpec.groovy      |  18 +-
 .../forge/cli/command/CodeGenCommandSpec.groovy    |  16 +-
 .../forge/cli/command/CreateAppCommandSpec.groovy  |  34 +-
 .../cli/command/CreateControllerCommandSpec.groovy |   8 -
 .../command/CreateDomainClassCommandSpec.groovy    |   7 -
 .../command/CreateInterceptorCommandSpec.groovy    |   9 -
 .../forge/cli/command/CreateJobCommandSpec.groovy  |   8 -
 .../cli/command/CreateServiceCommandSpec.groovy    |   8 -
 .../cli/command/CreateTagLibCommandSpec.groovy     |  12 -
 .../groovy/org/grails/forge/cli/CliRunner.groovy}  |  21 +-
 grails-forge/grails-forge-core/build.gradle        |  61 +--
 .../org/grails/forge/ForgeCoreConfiguration.groovy |  50 +++
 .../org/grails/forge/ForgeGrailsPlugin.groovy      |  49 +++
 .../forge/application/ApplicationType.groovy}      |  44 +-
 .../forge/application/ContextFactory.groovy}       | 110 ++---
 .../forge/application/OperatingSystem.groovy}      |  27 +-
 .../application/PluginAvailableFeatures.groovy}    |  29 +-
 .../org/grails/forge/application/Project.groovy    |  93 ++++
 .../forge/application/ProjectIdentifier.groovy}    |  26 +-
 .../application/RestApiAvailableFeatures.groovy}   |  20 +-
 .../forge/application/WebAvailableFeatures.groovy} |  23 +-
 .../application/WebPluginAvailableFeatures.groovy} |  20 +-
 .../generator/DefaultProjectGenerator.groovy}      |  96 ++---
 .../application/generator/GeneratorContext.groovy  | 399 +++++++++++++++++
 .../application/generator/ProjectGenerator.groovy} |  30 +-
 .../org/grails/forge/build/BuildPlugin.groovy}     |  28 +-
 .../org/grails/forge/build/BuildProperties.groovy} |  36 +-
 .../org/grails/forge/build/Comment.groovy}         |  15 +-
 .../org/grails/forge/build/Property.groovy}        |  15 +-
 .../forge/build/dependencies/Coordinate.groovy}    |  45 +-
 .../build/dependencies/CoordinateResolver.groovy}  |  10 +-
 .../dependencies/DefaultCoordinateResolver.groovy} |  32 +-
 .../forge/build/dependencies/Dependency.groovy     | 393 +++++++++++++++++
 .../build/dependencies/DependencyContext.groovy}   |  41 +-
 .../build/dependencies/DependencyCoordinate.groovy | 120 ++++++
 .../dependencies/LookupFailedException.groovy}     |  12 +-
 .../grails/forge/build/dependencies/Phase.groovy}  |   8 +-
 .../PomDependencyVersionResolver.groovy            | 150 +++++++
 .../grails/forge/build/dependencies/Scope.groovy}  |  97 ++---
 .../grails/forge/build/dependencies/Source.groovy} |   8 +-
 .../build/gradle/DefaultGradleRepository.groovy    | 141 ++++++
 .../grails/forge/build/gradle/GradleBuild.groovy   | 162 +++++++
 .../forge/build/gradle/GradleBuildCreator.groovy}  |  58 +--
 .../forge/build/gradle/GradleConfiguration.groovy} | 134 +++---
 .../forge/build/gradle/GradleDependency.groovy     | 123 ++++++
 .../grails/forge/build/gradle/GradleDsl.groovy}    |   8 +-
 .../grails/forge/build/gradle/GradlePlugin.groovy  | 256 +++++++++++
 .../forge/build/gradle/GradleRepository.groovy}    |  97 ++---
 .../build/gradle/MavenCentralRepository.groovy}    |  25 +-
 .../build/gradle/MavenLocalRepository.groovy}      |  25 +-
 .../build/gradle/VersionRegexRepoFilter.groovy     |  56 +++
 .../grails/forge/build/gradle/VersionType.groovy}  |   8 +-
 .../grails/forge/defaults/HasDefaultBuild.groovy}  |  11 +-
 .../HasDefaultDevelopmentReloading.groovy}         |  12 +-
 .../grails/forge/defaults/IncludesDefaults.groovy} |  10 +-
 .../grails/forge/defaults/LanguageDefaults.groovy} |  32 +-
 .../org/grails/forge/diff/FeatureDiffer.groovy}    | 114 +++--
 .../forge/feature/ApplicationFeature.groovy}       |  14 +-
 .../grails/forge/feature/AvailableFeatures.groovy} |  20 +-
 .../forge/feature/BaseAvailableFeatures.groovy     |  88 ++++
 .../org/grails/forge/feature/Category.groovy       |  64 +++
 .../grails/forge/feature/DefaultFeature.groovy}    |  14 +-
 .../org/grails/forge/feature/Feature.groovy}       |  50 +--
 .../org/grails/forge/feature/FeatureContext.groovy | 133 ++++++
 .../org/grails/forge/feature/FeaturePhase.groovy}  |  17 +-
 .../grails/forge/feature/FeaturePredicate.groovy}  |  11 +-
 .../grails/forge/feature/FeatureRegistry.groovy    |  94 ++++
 .../org/grails/forge/feature/Features.groovy       | 134 ++++++
 .../org/grails/forge/feature/OneOfFeature.groovy}  |   9 +-
 .../org/grails/forge/feature/api/OpenApi.groovy    |  87 ++++
 .../forge/feature/asciidoctor/Asciidoctor.groovy   |  84 ++++
 .../feature/assetPipeline/AssetPipeline.groovy     | 159 +++++++
 .../forge/feature/build/BuildFeature.groovy}       |  18 +-
 .../forge/feature/build/gradle/Dockerfile.groovy   |  85 ++++
 .../forge/feature/build/gradle/Gradle.groovy       | 109 +++++
 .../feature/build/gradle/GradleBuildSrc.groovy     |  83 ++++
 .../build/gradle/GradleBuildSrcFeature.groovy}     |  22 +-
 .../feature/build/gradle/GradleSettingsFile.groovy |  81 ++++
 .../build/gradle/GradleSettingsFileFeature.groovy} |  22 +-
 .../forge/feature/cache/CacheFeature.groovy}       |  18 +-
 .../org/grails/forge/feature/cache/EHCache.groovy  |  67 +++
 .../grails/forge/feature/cache/GrailsCache.groovy  |  76 ++++
 .../config/ApplicationConfiguration.groovy}        |  38 +-
 .../feature/config/BootstrapConfiguration.groovy}  |  24 +-
 .../forge/feature/config/Configuration.groovy}     | 157 ++++---
 .../feature/config/ConfigurationFeature.groovy}    |  39 +-
 .../grails/forge/feature/config/Properties.groovy} |  47 +-
 .../org/grails/forge/feature/config/Yaml.groovy}   |  54 +--
 .../forge/feature/database/AsyncGorm.groovy}       |  68 +--
 .../DatabaseDriverConfigurationFeature.groovy}     |  57 ++-
 .../feature/database/DatabaseDriverFeature.groovy  |  88 ++++
 .../forge/feature/database/GormFeature.groovy}     |  26 +-
 .../feature/database/GormOneOfFeature.groovy}      |  12 +-
 .../feature/database/GrailsDataHibernate5.groovy   | 128 ++++++
 .../feature/database/GrailsDataHibernate7.groovy   | 124 ++++++
 .../database/GrailsDataHibernateValidator.groovy}  |  35 +-
 .../feature/database/GrailsDataMongoDB.groovy}     |  91 ++--
 .../forge/feature/database/GraphqlGorm.groovy}     |  68 +--
 .../org/grails/forge/feature/database/H2.groovy    | 106 +++++
 .../forge/feature/database/JpaFeature.groovy}      |   8 +-
 .../feature/database/MongoDBTestingSupport.groovy  |  78 ++++
 .../MongoDBTestingSupportValidator.groovy}         |  28 +-
 .../forge/feature/database/MongoFeature.groovy}    |  30 +-
 .../grails/forge/feature/database/MongoSync.groovy |  85 ++++
 .../org/grails/forge/feature/database/MySQL.groovy |  98 +++++
 .../grails/forge/feature/database/Neo4jGorm.groovy |  77 ++++
 .../forge/feature/database/PostgreSQL.groovy       |  99 +++++
 .../grails/forge/feature/database/SQLServer.groovy |  98 +++++
 .../forge/feature/database/TestContainers.groovy   | 134 ++++++
 .../github/workflows/GitHubWorkflowFeature.groovy} |  33 +-
 .../forge/feature/github/workflows/Secret.groovy}  |  37 +-
 .../plain/PlainGithubWorkflowFeature.groovy}       |  42 +-
 .../grails/forge/feature/grails/GrailsBase.groovy  | 117 +++++
 .../feature/grails/GrailsCompileStatic.groovy}     |  38 +-
 .../feature/grails/GrailsDefaultPlugins.groovy     |  91 ++++
 .../forge/feature/grails/GrailsGradlePlugin.groovy |  82 ++++
 .../forge/feature/grails/GrailsUrlMappings.groovy} |  52 +--
 .../forge/feature/grails/GrailsWebConsole.groovy   |  74 ++++
 .../feature/grailsProfiles/GrailsProfiles.groovy   |  79 ++++
 .../feature/grailsWrapper/GrailsWrapper.groovy     |  81 ++++
 .../forge/feature/lang/LanguageFeature.groovy}     |  22 +-
 .../feature/lang/groovy/GrailsApplication.groovy}  |  76 ++--
 .../lang/groovy/GrailsApplicationFeature.groovy}   |  10 +-
 .../grails/forge/feature/logging/Logback.groovy}   |  56 +--
 .../forge/feature/logging/LogbackConfig.groovy}    |  56 +--
 .../forge/feature/logging/LoggingFeature.groovy}   |  18 +-
 .../forge/feature/micronaut/GrailsMicronaut.groovy | 103 +++++
 .../micronaut/GrailsMicronautValidator.groovy}     |  29 +-
 .../feature/micronaut/MicronautHttpClient.groovy   | 117 +++++
 .../migration/DatabaseMigrationPlugin.groovy}      |  66 +--
 .../feature/migration/MigrationFeature.groovy}     |  18 +-
 .../org/grails/forge/feature/other/AppName.groovy  |  66 +++
 .../grails/forge/feature/other/GrailsQuartz.groovy |  74 ++++
 .../feature/other/GrailsStartupProgress.groovy     |  79 ++++
 .../forge/feature/other/HibernateValidator.groovy  |  70 +++
 .../org/grails/forge/feature/other/Readme.groovy   |  96 +++++
 .../grails/forge/feature/other/ShadePlugin.groovy  |  77 ++++
 .../grails/forge/feature/reloading/Jrebel.groovy   |  74 ++++
 .../feature/reloading/ReloadingFeature.groovy}     |  26 +-
 .../feature/reloading/SpringBootDevTools.groovy    |  93 ++++
 .../feature/security/GrailsSpringSecurity.groovy   |  92 ++++
 .../feature/security/GrailsSpringSecurityUi.groovy |  97 +++++
 .../security/PrimarySecurityFeature.groovy}        |  10 +-
 .../forge/feature/security/SecurityFeature.groovy  |  90 ++++
 .../security/SpringBootStarterSecurity.groovy      |  89 ++++
 .../forge/feature/sitemesh3/Sitemesh3.groovy}      |  54 +--
 .../feature/spring/SpringBootAutoconfigure.groovy  |  67 +++
 .../spring/SpringBootEmbeddedServlet.groovy}       |  22 +-
 .../feature/spring/SpringBootJettyFeature.groovy   |  63 +++
 .../feature/spring/SpringBootStarterFeature.groovy |  76 ++++
 .../feature/spring/SpringBootTomcatFeature.groovy} |  60 +--
 .../spring/SpringBootUndertowFeature.groovy}       |  54 ++-
 .../spring/SpringBootVirtualThreads.groovy}        |  46 +-
 .../forge/feature/spring/SpringResources.groovy    |  65 +++
 .../feature/spring/SpringThreadingFeature.groovy}  |  18 +-
 .../grails/forge/feature/test/GebFeature.groovy}   |  22 +-
 .../forge/feature/test/GebWithLocalBrowsers.groovy | 125 ++++++
 .../feature/test/GebWithTestcontainers.groovy      | 106 +++++
 .../forge/feature/test/GormTestingSupport.groovy   |  67 +++
 .../feature/test/GrailsWebTestingSupport.groovy    |  67 +++
 .../org/grails/forge/feature/test/Mockito.groovy   |  77 ++++
 .../forge/feature/test/MockitoValidator.groovy}    |  25 +-
 .../org/grails/forge/feature/test/Spock.groovy     |  73 ++++
 .../feature/test/ViewsJsonTestingSupport.groovy    |  67 +++
 .../validation/CompositeFeatureValidator.groovy}   |  35 +-
 .../feature/validation/FeatureValidator.groovy}    |  18 +-
 .../validation/OneOfFeatureValidator.groovy}       |  39 +-
 .../org/grails/forge/feature/view/GrailsGsp.groovy | 106 +++++
 .../grails/forge/feature/view/GrailsLayout.groovy} |  34 +-
 .../grails/forge/feature/view/GrailsViews.groovy   |  72 ++++
 .../grails/forge/feature/view/GspLayout.groovy}    |  24 +-
 .../grails/forge/feature/view/Scaffolding.groovy   |  88 ++++
 .../grails/forge/feature/view/json/ViewJson.groovy |  97 +++++
 .../forge/feature/view/markup/ViewMarkup.groovy    |  81 ++++
 .../org/grails/forge/feature/web/GrailsWeb.groovy} |  36 +-
 .../org/grails/forge/io/ConsoleOutput.groovy}      |  37 +-
 .../grails/forge/io/FileSystemOutputHandler.groovy | 144 +++++++
 .../org/grails/forge/io/MapOutputHandler.groovy}   |  45 +-
 .../org/grails/forge/io/OutputHandler.groovy}      |  17 +-
 .../org/grails/forge/io/OutputUtils.groovy}        |  43 +-
 .../org/grails/forge/io/ZipOutputHandler.groovy    | 146 +++++++
 .../org/grails/forge/options/BuildTool.groovy      |  78 ++++
 .../options/DefaultTestRockerModelProvider.groovy} |  19 +-
 .../forge/options/DevelopmentReloading.groovy}     |  48 +--
 .../org/grails/forge/options/FeatureFilter.groovy} |  53 ++-
 .../org/grails/forge/options/GormImpl.groovy}      |  52 +--
 .../org/grails/forge/options/JdkVersion.groovy}    |  29 +-
 .../org/grails/forge/options/Language.groovy       |  99 +++++
 .../groovy/org/grails/forge/options/Options.groovy | 128 ++++++
 .../org/grails/forge/options/ServletImpl.groovy}   |  38 +-
 .../org/grails/forge/options/TestFramework.groovy} |  53 ++-
 .../forge/options/TestRockerModelProvider.groovy}  |  16 +-
 .../grails/forge/template/BinaryTemplate.groovy}   |  19 +-
 .../grails/forge/template/Config4kTemplate.groovy} |  43 +-
 .../forge/template/DefaultTemplateRenderer.groovy} |  63 ++-
 .../forge/template/PropertiesTemplate.groovy}      |  65 ++-
 .../org/grails/forge/template/RenderResult.groovy} |  69 +--
 .../grails/forge/template/RockerTemplate.groovy}   |  49 +--
 .../grails/forge/template/RockerWritable.groovy}   |  22 +-
 .../grails/forge/template/StringTemplate.groovy}   |  28 +-
 .../org/grails/forge/template/Template.groovy}     |  13 +-
 .../grails/forge/template/TemplateModel.groovy}    |   8 +-
 .../grails/forge/template/TemplateRenderer.groovy} |  22 +-
 .../org/grails/forge/template/URLTemplate.groovy}  |  45 +-
 .../org/grails/forge/template/Writable.groovy}     |   9 +-
 .../org/grails/forge/template/YamlTemplate.groovy  |  89 ++++
 .../org/grails/forge/util/IOFeatureUtil.groovy}    |  42 +-
 .../org/grails/forge/util/NameUtils.groovy}        | 471 +++++++++++----------
 .../org/grails/forge/util/ThrowingSupplier.groovy} |  10 +-
 .../org/grails/forge/util/VersionInfo.groovy       | 166 ++++++++
 .../org/grails/forge/util/ZipUtil.groovy}          |  72 ++--
 .../java/org/grails/forge/analytics/Generated.java | 112 -----
 .../grails/forge/analytics/SelectedFeature.java    |  38 --
 .../forge/application/PluginAvailableFeatures.java |  35 --
 .../java/org/grails/forge/application/Project.java |  94 ----
 .../application/RestApiAvailableFeatures.java      |  34 --
 .../forge/application/WebAvailableFeatures.java    |  35 --
 .../application/WebPluginAvailableFeatures.java    |  34 --
 .../application/generator/GeneratorContext.java    | 387 -----------------
 .../forge/build/dependencies/Dependency.java       | 393 -----------------
 .../build/dependencies/DependencyCoordinate.java   | 121 ------
 .../build/dependencies/LookupFailedException.java  |  26 --
 .../dependencies/PomDependencyVersionResolver.java | 136 ------
 .../build/gradle/DefaultGradleRepository.java      | 142 -------
 .../org/grails/forge/build/gradle/GradleBuild.java | 167 --------
 .../forge/build/gradle/GradleDependency.java       | 125 ------
 .../grails/forge/build/gradle/GradlePlugin.java    | 256 -----------
 .../grails/forge/defaults/IncludesDefaults.java    |  23 -
 .../forge/feature/BaseAvailableFeatures.java       |  86 ----
 .../java/org/grails/forge/feature/Category.java    |  60 ---
 .../org/grails/forge/feature/FeatureContext.java   | 133 ------
 .../java/org/grails/forge/feature/Features.java    | 137 ------
 .../java/org/grails/forge/feature/api/OpenApi.java |  87 ----
 .../forge/feature/asciidoctor/Asciidoctor.java     |  82 ----
 .../forge/feature/assetPipeline/AssetPipeline.java | 160 -------
 .../forge/feature/build/gradle/Dockerfile.java     |  85 ----
 .../grails/forge/feature/build/gradle/Gradle.java  | 108 -----
 .../forge/feature/build/gradle/GradleBuildSrc.java |  81 ----
 .../feature/build/gradle/GradleSettingsFile.java   |  80 ----
 .../org/grails/forge/feature/cache/EHCache.java    |  67 ---
 .../grails/forge/feature/cache/GrailsCache.java    |  76 ----
 .../feature/config/ApplicationConfiguration.java   |  40 --
 .../feature/database/DatabaseDriverFeature.java    |  89 ----
 .../feature/database/GrailsDataHibernate5.java     | 129 ------
 .../feature/database/GrailsDataHibernate7.java     | 125 ------
 .../java/org/grails/forge/feature/database/H2.java | 106 -----
 .../feature/database/MongoDBTestingSupport.java    |  76 ----
 .../grails/forge/feature/database/MongoSync.java   |  85 ----
 .../org/grails/forge/feature/database/MySQL.java   |  96 -----
 .../grails/forge/feature/database/Neo4jGorm.java   |  78 ----
 .../grails/forge/feature/database/PostgreSQL.java  |  97 -----
 .../grails/forge/feature/database/SQLServer.java   |  96 -----
 .../forge/feature/database/TestContainers.java     | 134 ------
 .../grails/forge/feature/grails/GrailsBase.java    | 117 -----
 .../forge/feature/grails/GrailsDefaultPlugins.java |  91 ----
 .../forge/feature/grails/GrailsGradlePlugin.java   |  82 ----
 .../forge/feature/grails/GrailsWebConsole.java     |  74 ----
 .../feature/grailsProfiles/GrailsProfiles.java     |  80 ----
 .../forge/feature/grailsWrapper/GrailsWrapper.java |  81 ----
 .../groovy/{ => templates}/application.rocker.raw  |   0
 .../groovy/{ => templates}/bootStrap.rocker.raw    |   0
 .../forge/feature/micronaut/GrailsMicronaut.java   | 103 -----
 .../feature/micronaut/MicronautHttpClient.java     | 117 -----
 .../org/grails/forge/feature/other/AppName.java    |  67 ---
 .../grails/forge/feature/other/GrailsQuartz.java   |  72 ----
 .../forge/feature/other/GrailsStartupProgress.java |  78 ----
 .../forge/feature/other/HibernateValidator.java    |  68 ---
 .../org/grails/forge/feature/other/Readme.java     |  99 -----
 .../grails/forge/feature/other/ShadePlugin.java    |  75 ----
 .../org/grails/forge/feature/reloading/Jrebel.java |  74 ----
 .../feature/reloading/SpringBootDevTools.java      |  94 ----
 .../feature/security/GrailsSpringSecurity.java     |  91 ----
 .../feature/security/GrailsSpringSecurityUi.java   |  98 -----
 .../forge/feature/security/SecurityFeature.java    |  88 ----
 .../security/SpringBootStarterSecurity.java        |  88 ----
 .../feature/spring/SpringBootAutoconfigure.java    |  66 ---
 .../feature/spring/SpringBootJettyFeature.java     |  63 ---
 .../feature/spring/SpringBootStarterFeature.java   |  76 ----
 .../forge/feature/spring/SpringResources.java      |  64 ---
 .../forge/feature/test/GebWithLocalBrowsers.java   | 124 ------
 .../forge/feature/test/GebWithTestcontainers.java  | 106 -----
 .../forge/feature/test/GormTestingSupport.java     |  66 ---
 .../feature/test/GrailsWebTestingSupport.java      |  66 ---
 .../org/grails/forge/feature/test/Mockito.java     |  77 ----
 .../java/org/grails/forge/feature/test/Spock.java  |  73 ----
 .../feature/test/ViewsJsonTestingSupport.java      |  66 ---
 .../org/grails/forge/feature/view/GrailsGsp.java   | 107 -----
 .../org/grails/forge/feature/view/GrailsViews.java |  70 ---
 .../org/grails/forge/feature/view/Scaffolding.java |  88 ----
 .../grails/forge/feature/view/json/ViewJson.java   |  93 ----
 .../forge/feature/view/markup/ViewMarkup.java      |  75 ----
 .../grails/forge/io/FileSystemOutputHandler.java   | 149 -------
 .../java/org/grails/forge/io/ZipOutputHandler.java | 133 ------
 .../java/org/grails/forge/options/BuildTool.java   |  79 ----
 .../org/grails/forge/options/FeatureFilter.java    |  66 ---
 .../forge/options/GormImplTypeConverter.java       |  47 --
 .../java/org/grails/forge/options/Language.java    | 100 -----
 .../java/org/grails/forge/options/Options.java     | 158 -------
 .../org/grails/forge/template/TemplateModel.java   |  22 -
 .../org/grails/forge/template/YamlTemplate.java    |  93 ----
 .../forge/template/api/grailsForgeApi.rocker.raw   |   2 -
 .../java/org/grails/forge/util/VersionInfo.java    | 173 --------
 .../grails-forge-core/resource-config.json         |  14 -
 ...rk.boot.autoconfigure.AutoConfiguration.imports |   1 +
 .../org/grails/forge/ApplicationContextSpec.groovy |   8 +-
 .../groovy/org/grails/forge/BuildBuilder.groovy    |   5 +-
 ...tionContextSpec.groovy => ForgeContexts.groovy} |  30 +-
 ...ec.groovy => ForgeCoreConfigurationSpec.groovy} |  18 +-
 .../org/grails/forge/ForgeGrailsPluginSpec.groovy  | 116 +++++
 .../PomDependencyVersionResolverSpec.groovy        |  10 +-
 .../forge/build/gradle/GradleRepositorySpec.groovy |  16 +
 .../grails/forge/build/gradle/GradleSpec.groovy    |   5 +-
 .../forge/feature/BaseAvailableFeaturesSpec.groovy |   6 +-
 .../grails/forge/feature/cache/CacheSpec.groovy    |   4 +-
 .../forge/feature/config/PropertiesSpec.groovy     |   4 +-
 .../grails/forge/feature/config/YamlSpec.groovy    |   4 +-
 .../feature/database/GrailsDataMongoDBSpec.groovy  |   2 +-
 .../grails/forge/feature/database/MySQLSpec.groovy |   2 +-
 .../forge/feature/database/Neo4JGormSpec.groovy    |   2 +-
 .../forge/feature/database/PostgresSpec.groovy     |   2 +-
 .../forge/feature/database/SQLServerSpec.groovy    |   2 +-
 .../feature/database/TestContainersSpec.groovy     |   6 +-
 .../workflows/PlainGithubWorkflowSpec.groovy       |   4 +-
 .../forge/feature/grails/GrailsBaseSpec.groovy     |   4 +-
 .../feature/grails/GrailsGradlePluginSpec.groovy   |   4 +-
 .../feature/grails/GrailsWebConsoleSpec.groovy     |   4 +-
 .../feature/lang/GrailsApplicationSpec.groovy      |   4 +-
 .../feature/micronaut/GrailsMicronautSpec.groovy   |   4 +-
 .../micronaut/MicronautHttpClientSpec.groovy       |   4 +-
 .../forge/feature/spring/SpringBootSpec.groovy     |   4 +-
 .../spring/SpringBootVirtualThreadsSpec.groovy     |   4 +-
 .../forge/fixture/CommandOutputFixture.groovy      |   4 +-
 .../org/grails/forge/fixture/ContextFixture.groovy |   9 +-
 .../org/grails/forge/options/GormImplSpec.groovy   |   1 +
 .../plugintest/ForgePluginTestApplication.groovy}  |  46 +-
 grails-forge/grails-forge-web-netty/build.gradle   | 156 -------
 .../java/org/grails/forge/netty/Application.java   |  41 --
 .../forge/netty/analytics/AnalyticsClient.java     |  43 --
 .../grails-forge-web-netty/native-image.properties |  18 -
 .../grails-forge-web-netty/resource-config.json    |   8 -
 .../src/main/resources/application-dev.yml         |   5 -
 .../src/main/resources/application.yml             |  37 --
 .../src/main/resources/logback.xml                 |  15 -
 .../aws/.platform/nginx/conf.d/proxy.conf          |   0
 .../aws/Procfile                                   |   0
 .../aws/start.sh                                   |   4 +-
 grails-forge/grails-forge-web/build.gradle         | 122 ++++++
 .../grails-app/conf/application.yml                |  42 ++
 .../grails-app/conf/logback.xml}                   |  24 +-
 .../org/grails/forge/web/DiffController.groovy     | 138 ++++++
 .../forge/web/ForgeApplicationController.groovy    | 142 +++++++
 .../org/grails/forge/web/PreviewController.groovy  |  98 +++++
 .../forge/web/SelectOptionsController.groovy       |  52 +++
 .../org/grails/forge/web/UrlMappings.groovy        |  37 ++
 .../grails/forge/web/ZipCreateController.groovy    | 124 ++++++
 .../grails-app/i18n/messages.properties            |  19 +
 .../init/org/grails/forge/web/Application.groovy}  |  36 +-
 .../forge/web/ForgeApiIntegrationSpec.groovy       | 369 ++++++++++++++++
 .../org/grails/forge/api/ApplicationTypeDTO.groovy | 112 +++++
 .../grails/forge/api/ApplicationTypeList.groovy}   |  30 +-
 .../forge/api/ApplicationTypeOperations.groovy}    |  24 +-
 .../forge/api/DevelopmentReloadingDTO.groovy       |  90 ++++
 .../groovy/org/grails/forge/api/FeatureDTO.groovy  | 136 ++++++
 .../org/grails/forge/api/FeatureList.groovy}       |  30 +-
 .../org/grails/forge/api/FeatureOperations.groovy} |  22 +-
 .../org/grails/forge/api/FeatureService.groovy     |  77 ++++
 .../forge/api/ForgeApplicationService.groovy       | 118 ++++++
 .../org/grails/forge/api/ForgeMessages.groovy}     |  16 +-
 .../groovy/org/grails/forge/api/GormImplDTO.groovy |  98 +++++
 .../forge/api/GrailsForgeConfiguration.groovy}     |  69 ++-
 .../org/grails/forge/api/JdkVersionDTO.groovy      |  97 +++++
 .../groovy/org/grails/forge/api/LanguageDTO.groovy | 109 +++++
 .../groovy/org/grails/forge/api/LinkDTO.groovy}    |  40 +-
 .../groovy/org/grails/forge/api/Linkable.groovy}   |  34 +-
 .../org/grails/forge/api/Relationship.groovy}      |  35 +-
 .../groovy/org/grails/forge/api/RequestInfo.groovy |  78 ++++
 .../org/grails/forge/api/SelectOptionDTO.groovy}   |  39 +-
 .../org/grails/forge/api/SelectOptionsDTO.groovy}  | 150 ++++---
 .../groovy/org/grails/forge/api/Selectable.groovy} |  14 +-
 .../org/grails/forge/api/ServletImplDTO.groovy     |  86 ++++
 .../org/grails/forge/api/UserAgentParser.groovy}   |  39 +-
 .../groovy/org/grails/forge/api/VersionDTO.groovy} |  24 +-
 .../forge/api/create/CreateProjectService.groovy   |  88 ++++
 .../options/ApplicationTypeSelectOptions.groovy}   |  24 +-
 .../DevelopmentReloadingSelectOptions.groovy}      |  25 +-
 .../api/options/GormImplSelectOptions.groovy}      |  25 +-
 .../api/options/JdkVersionSelectOptions.groovy}    |  25 +-
 .../api/options/LanguageSelectOptions.groovy}      |  25 +-
 .../api/options/SelectOptionsOperations.groovy}    |  14 +-
 .../api/options/ServletImplSelectOptions.groovy}   |  25 +-
 .../grails/forge/api/preview/PreviewDTO.groovy}    |  33 +-
 .../grails/forge/web/ForgeRequestSupport.groovy    | 175 ++++++++
 .../grails/forge/web/GroovyObjectJsonMixin.groovy} |  20 +-
 .../src/main/resources/openapi-base.yml            |  22 +
 .../forge/web/ForgeRequestSupportSpec.groovy       | 136 ++++++
 .../forge/web}/GrailsForgeConfigurationSpec.groovy |  21 +-
 grails-forge/grailsforgearchitecture.jpeg          | Bin 218395 -> 0 bytes
 grails-forge/infrastructure/README.md              |   2 +-
 grails-forge/infrastructure/environment.yaml       |   9 -
 grails-forge/infrastructure/shared.yaml            |   2 +-
 grails-forge/sam-local.yml                         |  43 --
 grails-forge/settings.gradle                       |   8 +-
 grails-forge/test-core/build.gradle                |  30 +-
 .../forge/cli/command/CreateControllerSpec.groovy  |   6 +-
 .../forge/cli/command/CreateInterceptorSpec.groovy |   6 +-
 .../forge/cli/command/CreateServiceSpec.groovy     |   6 +-
 .../forge/cli/command/CreateTagLibSpec.groovy      |   6 +-
 .../org/grails/forge/utils/CommandSpec.groovy      |  13 +-
 threat-model.yaml                                  |   4 +-
 572 files changed, 16423 insertions(+), 20954 deletions(-)

diff --git a/.agents/skills/gradle-developer/SKILL.md b/.agents/skills/gradle-developer/SKILL.md
index 57add9ef7a..5d2f3dd8ee 100644
--- a/.agents/skills/gradle-developer/SKILL.md
+++ b/.agents/skills/gradle-developer/SKILL.md
@@ -67,7 +67,7 @@ This git repo is **several independent Gradle builds**, not one flat multiprojec
 | **Root framework** | repo root | 60+ published modules, BOMs, test-examples, profiles, docs | `./gradlew …` from root |
 | **build-logic** | `build-logic/` | Shared **convention plugins** via `includeBuild` | `cd build-logic && ./gradlew …` (or root pluginManagement includeBuild) |
 | **grails-gradle** | `grails-gradle/` | **Published** Grails Gradle plugins for apps | `cd grails-gradle && ./gradlew …` |
-| **grails-forge** | `grails-forge/` | App generator (own wrapper, own deps) | `cd grails-forge && ./gradlew …` |
+| **grails-forge** | `grails-forge/` | App generator: a Grails plugin and two Grails applications built against the framework by coordinates (`includeBuild('..')` substitution) | `cd grails-forge && ./gradlew …` |
 | **end-to-end** | `end-to-end/` | Tests against **published** artifacts in `build/local-maven` | Full 3-step flow below (see `end-to-end/README.md`) |
 | **gradle-bootstrap** | `gradle-bootstrap/` | Regenerates shared wrappers from `.sdkmanrc` | `gradle -p gradle-bootstrap` (see wrapper section) |
 
diff --git a/.github/workflows/forge-deploy-aws.yml b/.github/workflows/forge-deploy-aws.yml
index f9aa13f92b..c8b8a3f359 100644
--- a/.github/workflows/forge-deploy-aws.yml
+++ b/.github/workflows/forge-deploy-aws.yml
@@ -112,7 +112,7 @@ jobs:
       - name: "Package Forge for Elastic Beanstalk"
         working-directory: grails-forge
         shell: bash
-        run: ./gradlew grails-forge-web-netty:awsElasticBeanstalk
+        run: ./gradlew grails-forge-web:awsElasticBeanstalk
 
       - name: "Configure AWS credentials through OIDC"
         uses: aws-actions/configure-aws-credentials@e1253824e5c10ff9df46874f81ed3ec929e19cfd # v6.3.0
@@ -156,7 +156,7 @@ jobs:
           VERSION_LABEL: ${{ steps.target.outputs.version-label }}
         run: |
           set -Eeuo pipefail
-          artifact='grails-forge/grails-forge-web-netty/build/distributions/grails-forge-web-netty-aws.zip'
+          artifact='grails-forge/grails-forge-web/build/distributions/grails-forge-web-aws.zip'
           test -s "${artifact}"
           aws s3 cp "${artifact}" "s3://${ARTIFACT_BUCKET}/${S3_KEY}" --only-show-errors
 
diff --git a/.gitignore b/.gitignore
index 778e996d62..222a8cd356 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,9 @@ stacktrace.log
 target
 tmp/
 !grails-fields/src/main/groovy/org/grails/scaffolding/registry/output
+!grails-forge/*/src/**/build/
+# copied from the grails-wrapper build by the Forge plugin's copyGrailsWrapper task
+grails-forge/grails-forge-core/src/main/resources/grails-wrapper/
 !etc/bin
 etc/bin/results
 .vscode/
diff --git a/AGENTS.md b/AGENTS.md
index b6667e17ae..c8611e4454 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -131,7 +131,7 @@ This repository contains multiple independent Gradle projects:
 | **grails-core** (root) | Main framework with 60+ modules | `./gradlew build` |
 | **build-logic/** | Gradle convention plugins for the build | `cd build-logic && ./gradlew build` |
 | **grails-gradle/** | Grails Gradle plugins | `cd grails-gradle && ./gradlew build` |
-| **grails-forge/** | Application generator (like Spring Initializr) | `cd grails-forge && ./gradlew build` |
+| **grails-forge/** | Application generator (like Spring Initializr): a Grails plugin (`grails-forge-core`) hosted by a Grails web application (`grails-forge-web`) and a non-web Grails application (`grails-forge-cli`), consuming the framework by coordinates | `cd grails-forge && ./gradlew build` |
 | **end-to-end/** | End-to-end tests consuming published Grails artifacts (see `end-to-end/README.md` for required setup) | `cd end-to-end && ./gradlew check` |
 
 Each project has its own `settings.gradle` and independent build. When working on a specific project, run Gradle commands from that project's directory.
diff --git a/RELEASE.md b/RELEASE.md
index 554155cb6b..9de39b160f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -327,13 +327,13 @@ 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.
 
-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:
+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 the `aws/` directory of the Forge web module from the matching maintenance branch (`grails-forge/grails-forge-web-netty/aws/` on the Micronaut-based lines, `grails-forge/grails-forge-web/aws/` since Forge became a Grails [...]
 
 ```bash
-./gradlew grails-forge-web-netty:awsElasticBeanstalk
+./gradlew grails-forge-web:awsElasticBeanstalk
 ```
 
-The bundle is `grails-forge-web-netty/build/distributions/grails-forge-web-netty-aws.zip`. See [AWS Elastic Beanstalk Deployment Runbook](grails-forge/docs/aws-elastic-beanstalk.md).
+The bundle is `grails-forge-web/build/distributions/grails-forge-web-aws.zip`. See [AWS Elastic Beanstalk Deployment Runbook](grails-forge/docs/aws-elastic-beanstalk.md).
 
 (The `release` job in the `Release` workflow includes a step titled `🚀 MANUAL - Deploy Grails Forge` that serves as a reminder to perform the deployment described above.)
 
diff --git a/THREAT_MODEL.md b/THREAT_MODEL.md
index c5dbda8754..b7b1c59a04 100644
--- a/THREAT_MODEL.md
+++ b/THREAT_MODEL.md
@@ -38,7 +38,7 @@ limitations under the License.
 
 **Primary intended use**: building server-side web applications in Groovy/Java on the JVM, deployed as Spring Boot executable JARs or WARs running under an operator the application owner controls. *(documented: [README.md](./README.md))*
 
-**Secondary intended use**: project scaffolding and code generation via the CLI tools and `grails-forge` HTTP API at <https://start.grails.org>. *(documented: [README.md](./README.md))*
+**Secondary intended use**: project scaffolding and code generation via the CLI tools and the hosted `grails-forge` HTTP APIs. The browser UI and redirect target are at <https://start.grails.org>. *(documented: [README.md](./README.md))*
 
 **Caller roles** (the model distinguishes three; this is not a network-service split since the framework is in-process within the user's app):
 
@@ -65,7 +65,7 @@ The framework is large; not every module has the same threat profile. The model
 | Compile-time AST transforms | [`GlobalGrailsClassInjectorTransformation`](./grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy), [`ResourceTransform`](./grails-rest-transforms/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy), [`ViewsTransform`](./grails-views-core/src/main/groovy/grails/views/compiler/ViewsTransform.groovy) | No (build only) | **In** (developer-trusted inputs only - see §6) |
 | CLI / shell (`grails-shell-cli`) | [`GrailsCli`](./grails-shell-cli/src/main/groovy/org/grails/cli/GrailsCli.groovy), [`MavenProfileRepository`](./grails-shell-cli/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy) | Yes - network (Maven), filesystem | **In** (with caveats - see §3 and §7) |
 | Interactive consoles (`grails-console`) | [`GrailsShell`](./grails-console/src/main/groovy/grails/ui/shell/GrailsShell.groovy), `GroovyConsoleApplicationContext` | Local I/O | **Out** - developer-only tool, see §3 |
-| `grails-forge` HTTP API (start.grails.org) | [`ZipCreateController`](./grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/zip/ZipCreateController.java) | Yes - network | **Out** - separate Micronaut-based service deployed independently from any application built with Grails; modeled separately by the operators of start.grails.org. *(inferred)* |
+| Hosted `grails-forge` HTTP APIs | [`ZipCreateController`](./grails-forge/grails-forge-web/grails-app/controllers/org/grails/forge/web/ZipCreateController.groovy) and sibling controllers | Yes - network | **Out** - separate Grails 8 web application deployed independently from user applications built with Grails; modeled separately by the Forge service operators. *(inferred)* |
 | Generated application scaffolding | `grails-profiles/`, files emitted by `create-app` | n/a | **Out** - separately authored; the framework's contract does not extend to scaffolded code once it is in the user's repository. See §3. |
 | `grails-test-examples/`, demo apps | n/a | n/a | **Out** - test/demo code, not shipped. See §3. |
 
@@ -83,7 +83,7 @@ The framework **does not** attempt to defend against, and **does not** model, th
 - **Generated application scaffolding output** (files emitted by `create-app` or `grails-forge`). Once written to the user's filesystem, the output is the user's code. The generator does not promise the generated code remains free of advisories as Grails evolves. *(inferred)*
 - **`grails-test-examples/`, demo and reproducer modules**, and any `examples/` or scaffold output checked into the repository. Not shipped in framework distributions; threat-model separately if used as a starting point. *(inferred)*
 - **Interactive consoles (`grails-console` module: `GrailsShell`, `GroovyConsole`).** These provide arbitrary Groovy code execution with full application-context access **by design**. They are developer tools. Reachability of these consoles from a deployed application is a deployment-configuration finding against the operator, not a framework vulnerability. *(inferred)*
-- **`grails-forge` HTTP service at start.grails.org**, including the `ZipCreateController` endpoints. The Micronaut-based service is deployed independently, has its own operator, and is modeled separately. The Grails framework neither runs this service inside user applications nor inherits its risk. *(inferred)*
+- **Hosted `grails-forge` HTTP service**, including the `ZipCreateController` endpoints. The Grails 8 web application is deployed independently, has its own operator, and is modeled separately. The Grails framework neither runs this service inside user applications nor inherits its risk. *(inferred)*
 - **Build-time supply chain** (Gradle plugin portal, Maven Central, signing, reproducible builds, GitHub Action pinning). Important, but not threat-model content per the rubric §1. *(inferred)*
 - **Side-channel attacks** (timing, cache, power, micro-architectural). No constant-time guarantees are made anywhere in the framework. *(inferred)*
 
diff --git a/gradle/rat-root-config.gradle b/gradle/rat-root-config.gradle
index fd3d857597..fb864e972d 100644
--- a/gradle/rat-root-config.gradle
+++ b/gradle/rat-root-config.gradle
@@ -142,7 +142,7 @@ tasks.named('rat') {
             'grails-data-hibernate7/dbmigration-core/src/test/java/liquibase/ext/hibernate/snapshot/NativeGeneratorSequenceTest.java',
             'grails-data-hibernate7/dbmigration-core/src/test/java/liquibase/ext/hibernate/snapshot/SequenceGeneratorTest.java',
             'grails-data-hibernate7/dbmigration-core/src/test/java/liquibase/harness/**',
-            'grails-forge/grails-forge-web-netty/aws/Procfile', // Elastic Beanstalk Procfile cannot contain comments
+            'grails-forge/grails-forge-web/aws/Procfile', // Elastic Beanstalk Procfile cannot contain comments
             'grails-forge/**/src/main/resources/**', // src/main/resources are included in generated application and should not include a license
             'grails-forge/**/src/test/resources/**', // src/test/resources are used in tests against files included in generated application and should not include a license
             'grails-gradle/**/build/**', // grails-gradle does not have a build package name so exclude any build directories
diff --git a/grails-forge/.gitattributes b/grails-forge/.gitattributes
deleted file mode 100644
index 32e17cc37b..0000000000
--- a/grails-forge/.gitattributes
+++ /dev/null
@@ -1,5 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Files that will always have CRLF line endings on checkout
-*.bat text eol=crlf
diff --git a/grails-forge/.gitignore b/grails-forge/.gitignore
deleted file mode 100644
index 3138e17a04..0000000000
--- a/grails-forge/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-classes/
-.DS_Store
-.gradle/
-.nb-gradle
-.idea/
-.idea_modules
-build/
-/buildSrc/build
-!grails-forge-core/src/**/build/
-**/out/
-*.iml
-*.ipr
-*.iws
-*.classpath
-*.project
-*.settings
-*.patch
-application-dev.yml
-etc/bin/results
-grails-forge-core/src/main/resources/grails-wrapper
\ No newline at end of file
diff --git a/grails-forge/README.md b/grails-forge/README.md
index a2a388c1aa..13689188c1 100644
--- a/grails-forge/README.md
+++ b/grails-forge/README.md
@@ -20,6 +20,27 @@ limitations under the License.
 
 Generates Grails applications.
 
+Forge is itself built with Grails: `grails-forge-core` is a Grails plugin holding the feature catalogue, the
+project generator and the templates, `grails-forge-web` is the Grails web application serving the hosted
+generator's HTTP API, and `grails-forge-cli` is a Grails application without a web server that runs the
+same generator from the command line. Both applications consume the framework the way a generated
+application does, by Maven coordinates, so building Forge is also the first use of the Grails that was just
+built. The `grails` launcher (`grails-cli`) assembles the CLI with the Grails shell CLI into one distribution.
+
+## Building
+
+Forge is a separate Gradle build next to the framework build, run with its own wrapper from this directory:
+
+```bash
+$ ./gradlew build
+```
+
+The framework it consumes is substituted from the root build (`includeBuild('..')`), so a change to the
+framework is visible here without publishing. Specs that build generated applications publish the framework to
+`build/local-maven` first, which is why a first `test` run takes a while. To start the hosted generator locally
+run `./gradlew :grails-forge-web:bootRun`; to run the CLI from this build, `./gradlew :grails-cli:installDist`
+and use `grails-cli/build/install/apache-grails-bin/bin/grails-forge-cli`.
+
 ## Installation
 
 The CLI application comes in various flavours from a universal Java applications to native applications for Windows, Linux and OS X. These are available for direct download on the [releases page](https://github.com/apache/grails-core/releases). For installation see the [Grails documentation](https://grails.apache.org/docs/latest/guide/index.html#buildCLI).
@@ -33,7 +54,7 @@ $ cd demo
 $ ./gradlew run
 ```
 
-Run `curl https://latest.grails.org/` for more information on how to use the API or see the API documentation referenced below.
+Run `curl https://latest.grails.org/` for more information on how to use the API.
 
 ## UI
 
@@ -43,15 +64,19 @@ The user interface is [written in React](https://github.com/apache/grails-forge-
 
 ## API
 
-API documentation for the production instance can be found at:
+The hosted generator answers `GET /` with a plain-text usage summary. Its OpenAPI description is derived from the application itself by the `grails-openapi` module, from the URL mappings and the controllers of `grails-forge-web` and the OpenAPI annotations they carry, and is served by springdoc with Swagger UI beside it.
+
+API documentation for the production instance:
 
-* [Swagger / OpenAPI Doc](https://latest.grails.org/swagger-ui/index.html)
-* [RAPI Doc](https://latest.grails.org/rapidoc/index.html)
+* [Swagger UI](https://latest.grails.org/swagger-ui/index.html)
+* [OpenAPI document](https://latest.grails.org/v3/api-docs)
+* [Plain-text usage](https://latest.grails.org/)
 
-API documentation for the snapshot / development instance can be found at:
+API documentation for the snapshot / development instance:
 
-* [Swagger / OpenAPI Doc](https://snapshot.grails.org/swagger-ui/index.html)
-* [RAPI Doc](https://snapshot.grails.org/rapidoc/index.html)
+* [Swagger UI](https://snapshot.grails.org/swagger-ui/index.html)
+* [OpenAPI document](https://snapshot.grails.org/v3/api-docs)
+* [Plain-text usage](https://snapshot.grails.org/)
 
 ## Snapshots and Releases
 
@@ -63,18 +88,13 @@ A release is performed with the following steps:
 * [Monitor the Workflow](https://github.com/apache/grails-core/actions?query=workflow%3ARelease) to check it passed successfully.
 * Celebrate!
 
-## Architecture
-
-![Grails Forge Architecture](grailsforgearchitecture.jpeg)
-
 ## Distribution to AWS Elastic Beanstalk
 
 The seven Forge API slots run on AWS Elastic Beanstalk behind one shared application load balancer. The UI remains at `https://start.grails.org`.
 
 The API hosts are `latest.grails.org`, `snapshot.grails.org`, `next.grails.org`, `next-snapshot.grails.org`, `prev.grails.org`, `prev-snapshot.grails.org`, and `older.grails.org`. GitHub Actions authenticates to AWS through OIDC using the repository variable `AWS_FORGE_DEPLOY_ROLE_ARN`; it does not use static AWS access keys.
 
-Deployments package the normal Forge executable JAR in a ZIP source bundle. Analytics is not deployed. When its endpoint and analytics environment variables are absent, reporting is disabled without affecting application generation. The unused server-side GitHub create / OAuth integration is also omitted.
+Deployments package the Grails 8 `grails-forge-web` Tomcat `bootJar` as `app.jar` in the `grails-forge-web-aws.zip` source bundle. The bundle also contains `Procfile` and `start.sh`. Analytics is not deployed.
 
 For deployment, rollback, monitoring, and GCP decommissioning, see [AWS Elastic Beanstalk Deployment Runbook](docs/aws-elastic-beanstalk.md).
 
-
diff --git a/grails-forge/build.gradle b/grails-forge/build.gradle
index a149ee6e11..c725f800cb 100644
--- a/grails-forge/build.gradle
+++ b/grails-forge/build.gradle
@@ -68,11 +68,6 @@ final class ActiveProcessorCountArgumentProvider implements CommandLineArgumentP
 
 allprojects {
     tasks.withType(Test).configureEach { testTask ->
-        testTask.dependsOn(
-                gradle.includedBuild('grails-core').task(':publishAllPublicationsToTestCaseMavenRepoRepository'),
-                gradle.includedBuild('grails-gradle').task(':publishAllPublicationsToTestCaseMavenRepoRepository')
-        )
-
         // Honor DO_NOT_CACHE_TESTS=1 so developers can repeatedly invoke the same test command
         // without --rerun-tasks (and without recompiling everything else).
         testTask.outputs.cacheIf { !doNotCacheTests }
diff --git a/grails-forge/buildSrc/build.gradle b/grails-forge/buildSrc/build.gradle
deleted file mode 100644
index db7cabed7d..0000000000
--- a/grails-forge/buildSrc/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  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.
- */
-
-plugins {
-    id 'java-gradle-plugin'
-    id 'groovy-gradle-plugin'
-    id 'org.apache.grails.buildsrc.properties'
-    id 'org.apache.grails.buildsrc.dependency-validator'
-}
-
-apply {
-    from file('../../dependencies.gradle')
-}
-
-configurations.configureEach {
-    exclude group: 'io.github.groovylang.groovydoc', module: 'io.github.groovylang.groovydoc.gradle.plugin'
-}
-
-dependencies {
-    implementation "${gradleBomDependencies['grails-publish-plugin']}"
-    implementation "io.micronaut.build.internal:micronaut-gradle-plugins:$micronautGradlePlugins"
-    implementation "com.fizzed:rocker-compiler:$rockerVersion"
-    implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
-    implementation "io.sdkman:gradle-sdkvendor-plugin:$gradleSdkvendorPluginVersion"
-    implementation "org.asciidoctor:asciidoctor-gradle-jvm:$asciidoctorGradleJvmVersion"
-    implementation "com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion"
-    implementation "io.spring.nohttp:nohttp-gradle:$nohttpGradleVersion"
-    implementation "com.gradleup.shadow:shadow-gradle-plugin:$shadowVersion"
-    implementation "org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:$apacheRatVersion"
-    implementation "org.apache.grails:grails-gradle-plugins:$projectVersion", {
-        exclude group: 'org.yaml'
-        exclude group: 'org.asciidoctor'
-    }
-    implementation "org.antlr:antlr4-runtime:$antlr4Version"
-    implementation "org.apache.ant:ant:$antVersion"
-    implementation "org.apache.grails.gradle:grails-gradle-common:$projectVersion"
-    implementation "org.cyclonedx.bom:org.cyclonedx.bom.gradle.plugin:$gradleCycloneDxPluginVersion"
-}
-
-gradlePlugin {
-    plugins {
-        rockerPlugin {
-            id = 'org.grails.forge.rocker'
-            implementationClass = 'org.grails.forge.rocker.plugin.RockerPlugin'
-        }
-    }
-}
diff --git a/grails-forge/buildSrc/settings.gradle b/grails-forge/buildSrc/settings.gradle
deleted file mode 100644
index 312e2aeb1e..0000000000
--- a/grails-forge/buildSrc/settings.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  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.
- */
-pluginManagement {
-    includeBuild('../../build-logic') {
-        name = 'build-logic-root'
-    }
-    apply from: file('../../gradle/plugin-repositories.gradle')
-    repositories {
-        configurePluginRepositories(delegate)
-    }
-}
-
-plugins {
-    id 'org.apache.grails.buildsrc.repo'
-}
-
-includeBuild('../../build-logic') {
-    name = 'build-logic-root'
-}
\ No newline at end of file
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
deleted file mode 100644
index 7aee8f8240..0000000000
--- a/grails-forge/buildSrc/src/main/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTask.groovy
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  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.
- */
-
-package org.apache.grails.buildsrc
-
-import groovy.transform.CompileStatic
-import groovy.xml.XmlSlurper
-import groovy.xml.slurpersupport.GPathResult
-import groovy.xml.slurpersupport.NodeChild
-import org.gradle.api.DefaultTask
-import org.gradle.api.GradleException
-import org.gradle.api.Project
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.model.ObjectFactory
-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.OutputDirectories
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.PathSensitive
-import org.gradle.api.tasks.PathSensitivity
-import org.gradle.api.tasks.TaskAction
-import org.xml.sax.SAXException
-
-import javax.inject.Inject
-import javax.xml.parsers.ParserConfigurationException
-import java.nio.charset.StandardCharsets
-import java.nio.file.Files
-
-@CompileStatic
-@CacheableTask
-abstract class WriteGrailsVersionInfoTask extends DefaultTask {
-
-    @Input
-    final Property<String> projectVersion
-
-    @InputFile
-    @PathSensitive(PathSensitivity.RELATIVE)
-    final RegularFileProperty bomPublicationFile
-
-    @OutputDirectory
-    final DirectoryProperty versionsDirectory
-
-    @Inject
-    WriteGrailsVersionInfoTask(ObjectFactory objects, Project project) {
-        projectVersion = objects.property(String).convention(project.provider {
-            project.version as String
-        })
-        bomPublicationFile = objects.fileProperty()
-        versionsDirectory = objects.directoryProperty()
-    }
-
-    @TaskAction
-    void writeVersionInfo() {
-        File versionsDirectory = versionsDirectory.get().asFile
-        if (versionsDirectory.exists()) {
-            versionsDirectory.deleteDir()
-        }
-        versionsDirectory.mkdirs()
-
-        File versions = new File(versionsDirectory, 'grails-versions.properties')
-
-        File pomFile = bomPublicationFile.get().asFile
-
-        GPathResult pom = null
-        try {
-            pom = new XmlSlurper().parse(pomFile)
-        } catch (IOException | SAXException | ParserConfigurationException e) {
-            new GradleException("Unable to parse BOM publication file: ${pomFile.absolutePath}", e)
-        }
-
-        TreeMap<String, String> props = []
-        props.put("grails.version", getProjectVersion().get())
-        ((GPathResult) pom.getProperty("properties")).children().forEach(child -> {
-            NodeChild node = (NodeChild) child
-            props.put(node.name(), node.text())
-        })
-
-        try (OutputStream out = Files.newOutputStream(versions.toPath())) {
-            for (Map.Entry<String, String> entry : props.entrySet()) {
-                getLogger().info("Writing version property: {} => {}", entry.getKey(), entry.getValue())
-                String line = "${entry.getKey()}=${entry.getValue()}\n" as String
-                out.write(line.getBytes(StandardCharsets.ISO_8859_1))
-            }
-        }
-    }
-}
diff --git a/grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsGroovyExtensionTransformer.groovy b/grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsGroovyExtensionTransformer.groovy
deleted file mode 100644
index 7a2537b369..0000000000
--- a/grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsGroovyExtensionTransformer.groovy
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  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.
- */
-package org.apache.grails.forge.buildlogic.shadowjar
-
-import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
-import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
-import groovy.transform.CompileStatic
-import org.apache.grails.gradle.common.PropertyFileUtils
-import org.apache.tools.zip.ZipEntry
-import org.apache.tools.zip.ZipOutputStream
-import org.gradle.api.file.FileTreeElement
-
-/**
- * Based on com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionModuleTransformer but with
- * reproducible property file support
- */
-@CompileStatic
-class GrailsGroovyExtensionTransformer implements Transformer {
-
-    private static final String GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH = 'META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule'
-
-    private static final String MODULE_NAME_KEY = 'moduleName'
-    private static final String MODULE_VERSION_KEY = 'moduleVersion'
-    private static final String EXTENSION_CLASSES_KEY = 'extensionClasses'
-    private static final String STATIC_EXTENSION_CLASSES_KEY = 'staticExtensionClasses'
-
-    private static final String MERGED_MODULE_NAME = 'MergedByGrailsShadowJar'
-    private static final String MERGED_MODULE_VERSION = '1.0.0'
-
-    private final Properties module = new Properties()
-
-    @Override
-    boolean canTransformResource(FileTreeElement element) {
-        def path = element.relativePath.pathString
-        path == GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH
-    }
-
-    @Override
-    void transform(TransformerContext context) {
-        def props = new Properties()
-        props.load(context.is)
-        props.entrySet().each { Map.Entry<Object, Object> entry ->
-            String key = entry.key as String
-            String value = entry.value as String
-            switch (key) {
-                case MODULE_NAME_KEY:
-                    handle(key, value) {
-                        module.setProperty(key, MERGED_MODULE_NAME)
-                    }
-                    break
-                case MODULE_VERSION_KEY:
-                    handle(key, value) {
-                        module.setProperty(key, MERGED_MODULE_VERSION)
-                    }
-                    break
-                case [EXTENSION_CLASSES_KEY, STATIC_EXTENSION_CLASSES_KEY]:
-                    handle(key, value) { String existingValue ->
-                        def newValue = "${existingValue},${value}"
-                        module.setProperty(key, newValue)
-                    }
-                    break
-            }
-        }
-    }
-
-    private handle(String key, String value, Closure mergeValue) {
-        def existingValue = module.getProperty(key)
-        if (existingValue) {
-            mergeValue(existingValue)
-        } else {
-            module.setProperty(key, value)
-        }
-    }
-
-    @Override
-    boolean hasTransformedResource() {
-        return module.size() > 0
-    }
-
-    @Override
-    void modifyOutputStream(ZipOutputStream os, boolean preserveFileTimestamps) {
-        ZipEntry entry = new ZipEntry(GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH)
-        entry.time = TransformerContext.getEntryTimestamp(preserveFileTimestamps, entry.time)
-        os.putNextEntry(entry)
-
-        os.write()
-        try (InputStream inputStream = toInputStream(module)) {
-            inputStream.transferTo(os)
-        }
-        os.closeEntry()
-    }
-
-    private static InputStream toInputStream(Properties props) {
-        def baos = new ByteArrayOutputStream()
-        props.store(baos, null)
-        return PropertyFileUtils.makePropertiesOutputReproducible(baos)
-    }
-}
diff --git a/grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowLicenseTransform.groovy b/grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowLicenseTransform.groovy
deleted file mode 100644
index 90898120ba..0000000000
--- a/grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowLicenseTransform.groovy
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- *  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.
- */
-package org.apache.grails.forge.buildlogic.shadowjar
-
-import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
-import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
-import groovy.transform.CompileDynamic
-import groovy.transform.CompileStatic
-import org.apache.tools.zip.ZipEntry
-import org.apache.tools.zip.ZipOutputStream
-import org.gradle.api.file.FileTreeElement
-import org.gradle.api.tasks.Input
-
-import java.util.regex.Pattern
-
-/**
- * This transformer assists in combining all known licenses into a single META-INF/LICENSE file. Please note that the
- * shadow plugin will initially copy all dependencies that are in the local project and then it will copy all other external
- * dependencies. Transformers only apply to the copied jar file dependencies, and not to the local project dependencies.
- */
-@CompileStatic
-class GrailsShadowLicenseTransform implements Transformer {
-
-    private static final List<Pattern> LICENSE_PATTERNS = [
-            ~'(?i)META-INF/[^/]*LICENSE[^/]*',
-            ~'(?i)META-INF/LICENSES/.*',
-            ~'(?i)[^/]*LICENSE[^/]*',
-            ~'(?i)LICENSES/.*'
-    ]
-
-    private static final String LICENSE_PATH = 'META-INF/LICENSE'
-
-    private LinkedHashMap<String, LicenseHolder> licenses = [:]
-
-    @Input
-    String licenseAppendixEnding = 'LIMITATIONS UNDER THE LICENSE.'
-
-    @Input
-    String licenseTermsEnding = 'END OF TERMS AND CONDITIONS'
-
-    @Input
-    String licenseTermsStart = 'APACHE LICENSE VERSION 2.0'
-
-    @Input
-    String licenseText // to be loaded by file
-
-    @Input
-    Boolean separators = false
-
-    /**
-     * Whether this transformer can process the given resource. If set to true, it's expected the transformer will
-     * write the resource.
-     */
-    @Override
-    boolean canTransformResource(FileTreeElement element) {
-        def path = element.relativePath.pathString
-        LICENSE_PATTERNS.any { pattern -> pattern.matcher(path).matches() }
-    }
-
-    /**
-     * Parses any file that matches the license patterns and extracts the license text, deduplicating & combining where
-     * possible.
-     *
-     * @param context contains the input stream of the resource to transform
-     */
-    @Override
-    // Multiple assignments without list expressions on the right hand side are unsupported in static type checking mode
-    @CompileDynamic
-    void transform(TransformerContext context) {
-        if (!licenses) {
-            // Add our license as previously seen so we can dedupe - this transformer only applies to the copy of other jars
-            def (grailsLicense, grailsIndexMappings) = normalize(licenseText)
-            licenses[grailsLicense] = new LicenseHolder(license: licenseText, indexMappings: grailsIndexMappings)
-        }
-
-        context.is.withReader {
-            BufferedReader reader = new BufferedReader(it)
-
-            def license = stripJavaBlockComment(reader.text)
-            def (String normalized, List<Integer> indexMappings) = normalize(license)
-
-            // resect Apache License
-            String resected = resectLicense(license, normalized, indexMappings)
-            if (!resected.trim()) {
-                return // only contained duplicated license terms with the ASF license
-            }
-
-            def (String resectedNormalized, List<Integer> resectedIndexMappings) = normalize(resected)
-            def previouslySeen = getVariations(resectedNormalized).any { licenses.containsKey(it) }
-            if (!previouslySeen) {
-                licenses[resectedNormalized] = new LicenseHolder(license: resected, indexMappings: resectedIndexMappings)
-            }
-        }
-    }
-
-    /**
-     * Some libraries ship with a license.header file that contains a Java block comment. This method strips the
-     * Java block comment syntax and returns the text without the comment.
-     */
-    private static String stripJavaBlockComment(String text) {
-        if (!text.startsWith('/*')) {
-            return text
-        }
-
-        return text
-                .replaceAll('^/\\*+|\\*+/\\s*$', '') // opening & closing comment
-                .readLines()
-                .collect {
-                    it.replaceFirst(/^(\s*\*)?/, '').trim()
-                } // leading whitespace & *
-                .join('\n')
-    }
-
-    /**
-     * Normalizes the license text by collapsing whitespace and uppercasing all characters. It also returns a mapping
-     * of the normalized text to the original license text, where each character in the normalized text maps to its
-     * original index in the license text. This allows us to index into the normalized text from sections of the license text
-     * for deduplication purposes.
-     *
-     * @param license the original license text
-     * @return a tuple containing the normalized license text and a list of index mappings
-     */
-    private static Tuple2<String, List<Integer>> normalize(String license) {
-        def sb = new StringBuilder()
-        List<Integer> indexMappings = [] // each char in sb maps to original index
-
-        boolean previousWhitespace = false
-        for (int i = 0; i < license.length(); i++) {
-            char c = license.charAt(i)
-            if (c.isWhitespace()) {
-                if (!previousWhitespace) {
-                    sb.append(' ')
-                    indexMappings << i
-                    previousWhitespace = true
-                }
-            } else {
-                sb.append(Character.toUpperCase(c))
-                indexMappings << i
-                previousWhitespace = false
-            }
-        }
-
-        String normalized = sb.toString().trim()
-        int startTrim = sb.indexOf(normalized)
-        int endTrim = startTrim + normalized.length()
-        new Tuple2<String, List<Integer>>(normalized, indexMappings[startTrim..<endTrim])
-    }
-
-    /**
-     * For a given license, this method will extract the duplicate license text and return the remaining text
-     * @param license the original license text
-     * @param normalized a normalized version of the license text, with all whitespace collapsed and all characters uppercased
-     * @param indexMappings a mapping of the normalized text to the original license text, where each character in the normalized text maps to its original index in the license text
-     * @return either null if no additional license text was found or the additional license text
-     */
-    private String resectLicense(String license, String normalized, List<Integer> indexMappings) {
-        if (!normalized.startsWith(licenseTermsStart.toUpperCase())) {
-            return license // not ASF license, return as is
-        }
-
-        // try to search on the appendix first
-        String endOfLicenseMarker = normalize(licenseAppendixEnding).v1
-        int end1Index = normalized.indexOf(endOfLicenseMarker)
-        if (end1Index >= 0) {
-            // license included the appendix
-            def originalEnding = indexMappings[end1Index + endOfLicenseMarker.size() - 1] + 1
-            if (originalEnding > license.length()) {
-                // only the license is present
-                return null
-            }
-
-            return license.substring(originalEnding)
-        }
-
-        // try to search on the terms ending
-        String endMarker = normalize(licenseTermsEnding).v1
-        int end2Index = normalized.indexOf(endMarker)
-        if (end2Index >= 0) {
-            // bare license
-            def originalEnding = indexMappings[end2Index + endMarker.size() - 1] + 1
-            if (originalEnding > license.length()) {
-                // only the license is present
-                return null
-            }
-
-            return license.substring(originalEnding)
-        }
-
-        license
-    }
-
-    /**
-     * Some licenses mix http & https links, handles simple variations of the license to ensure the license can be
-     * deduplicated.
-     *
-     * @param license the license text
-     * @return a list of variations of the license text
-     */
-    private static List<String> getVariations(String license) {
-        [license.trim()].collectMany {
-            [it, it.replace('http://', 'https://'), it.replace('https://', 'http://')]
-        }
-    }
-
-    /**
-     * Whether this transformer will modify the output stream.
-     */
-    @Override
-    boolean hasTransformedResource() {
-        // Must always be true since we want to write the LICENSE file and all license files originate from jar files
-        // after our project restructure
-        true
-    }
-
-    /**
-     * Writes the combined license file to the output stream. The file will be written to
-     * META-INF/LICENSE and will contain all licenses found in the project
-     *
-     * @param os the jar file output stream
-     * @param preserveFileTimestamps whether to preserve file timestamps in the output jar
-     */
-    @Override
-    void modifyOutputStream(ZipOutputStream os, boolean preserveFileTimestamps) {
-        ZipEntry zipEntry = new ZipEntry(LICENSE_PATH)
-        zipEntry.time = TransformerContext.getEntryTimestamp(preserveFileTimestamps, zipEntry.time)
-        os.putNextEntry(zipEntry)
-
-        os.withPrintWriter { writer ->
-            licenses.entrySet().withIndex().each { license ->
-                if (license.v1.value == null) {
-                    return // skip the license that will be copied by shadow from our existing jars
-                }
-
-                writer.println(license.v1.value.license)
-                if (separators && license.v2 < licenses.size() - 1) {
-                    writer.println("-------------------------${license.v2}---------------------------")
-                }
-            }
-
-            writer.flush()
-        }
-
-        licenses = [:]
-    }
-
-    private static class LicenseHolder {
-
-        String license
-        List<Integer> indexMappings
-    }
-}
\ No newline at end of file
diff --git a/grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowNoticeTransform.groovy b/grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowNoticeTransform.groovy
deleted file mode 100644
index a4b7dded9c..0000000000
--- a/grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowNoticeTransform.groovy
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  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.
- */
-package org.apache.grails.forge.buildlogic.shadowjar
-
-import com.github.jengelman.gradle.plugins.shadow.transformers.ApacheNoticeResourceTransformer
-import groovy.transform.CompileStatic
-import org.gradle.api.file.FileTreeElement
-
-import java.util.regex.Pattern
-
-/**
- * jakarta is eclipse licensed, so we need to include the NOTICE.md file
- */
-@CompileStatic
-class GrailsShadowNoticeTransform extends ApacheNoticeResourceTransformer {
-
-    private static final List<Pattern> NOTICE_PATTERNS = [
-            ~'(?i)META-INF/[^/]*NOTICE[^/]*',
-            ~'(?i)[^/]*NOTICE[^/]*'
-    ]
-
-    @Override
-    boolean canTransformResource(FileTreeElement element) {
-        if (super.canTransformResource(element)) {
-            return true
-        }
-
-        def path = element.relativePath.pathString
-        NOTICE_PATTERNS.any { pattern -> pattern.matcher(path).matches() }
-    }
-}
diff --git a/grails-forge/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/GenerateManpageAsciidoc.java b/grails-forge/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/GenerateManpageAsciidoc.java
deleted file mode 100644
index 9516d7763e..0000000000
--- a/grails-forge/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/GenerateManpageAsciidoc.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.internal.tasks;
-
-import org.gradle.api.DefaultTask;
-import org.gradle.api.file.ConfigurableFileCollection;
-import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.CacheableTask;
-import org.gradle.api.tasks.Classpath;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.process.ExecOperations;
-
-import javax.inject.Inject;
-
-@CacheableTask
-public abstract class GenerateManpageAsciidoc extends DefaultTask {
-
-    @Input
-    public abstract Property<String> getMainClass();
-
-    @Classpath
-    public abstract ConfigurableFileCollection getClasspath();
-
-    @OutputDirectory
-    public abstract DirectoryProperty getOutputDirectory();
-
-    @Inject
-    protected abstract ExecOperations getExecOperations();
-
-    public GenerateManpageAsciidoc() {
-        setGroup("Documentation");
-        setDescription("Generate AsciiDoc manpage");
-    }
-
-    @TaskAction
-    void generate() {
-        getExecOperations().javaexec(spec -> {
-            spec.getMainClass().set("picocli.codegen.docgen.manpage.ManPageGenerator");
-            spec.setClasspath(getClasspath());
-            spec.args(
-                    "--outdir=" + getOutputDirectory().getAsFile().get(),
-                    "-v",
-                    "--factory=org.grails.forge.cli.GrailsPicocliFactory",
-                    //, "--template-dir=src/docs/mantemplates"
-                    getMainClass().get()
-            );
-        });
-    }
-}
diff --git a/grails-forge/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java b/grails-forge/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java
deleted file mode 100644
index 5125d6fa16..0000000000
--- a/grails-forge/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.internal.tasks;
-
-import org.gradle.api.DefaultTask;
-import org.gradle.api.file.ConfigurableFileCollection;
-import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.CacheableTask;
-import org.gradle.api.tasks.Classpath;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.process.ExecOperations;
-
-import javax.inject.Inject;
-
-@CacheableTask
-public abstract class PicocliBuildCompletionTask extends DefaultTask {
-    @Input
-    public abstract Property<String> getMainClass();
-
-    @Classpath
-    public abstract ConfigurableFileCollection getClasspath();
-
-    @OutputDirectory
-    public abstract DirectoryProperty getOutputDirectory();
-
-    @Inject
-    protected abstract ExecOperations getExecOperations();
-
-    @TaskAction
-    public void execute() {
-        getExecOperations().javaexec(spec -> {
-            spec.setClasspath(getClasspath());
-            spec.getMainClass().set("picocli.AutoComplete");
-            spec.jvmArgs("-Dpicocli.autocomplete.systemExitOnError");
-            spec.args(
-                    getMainClass().get(),
-                    "--completionScript=" + getOutputDirectory().file("grails_forge_cli_completion").get().getAsFile().getAbsolutePath(),
-                    "--force",
-                    "--factory=org.grails.forge.cli.GrailsPicocliFactory"
-            );
-        });
-    }
-
-}
diff --git a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/JavaGeneratorRunnable.java b/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/JavaGeneratorRunnable.java
deleted file mode 100644
index 4b6e889c98..0000000000
--- a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/JavaGeneratorRunnable.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import com.fizzed.rocker.compiler.GeneratorException;
-import com.fizzed.rocker.compiler.JavaGenerator;
-import com.fizzed.rocker.compiler.JavaGeneratorMain;
-import com.fizzed.rocker.compiler.PlainTextStrategy;
-import com.fizzed.rocker.compiler.RockerConfiguration;
-import com.fizzed.rocker.compiler.RockerUtil;
-import com.fizzed.rocker.compiler.TemplateParser;
-import com.fizzed.rocker.model.TemplateModel;
-import com.fizzed.rocker.runtime.ParserException;
-import com.fizzed.rocker.runtime.RockerRuntime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class JavaGeneratorRunnable implements Runnable {
-
-    private static final Logger log = LoggerFactory.getLogger(JavaGeneratorMain.class);
-
-    private final com.fizzed.rocker.compiler.RockerConfiguration configuration;
-    private final TemplateParser parser;
-    private final JavaGenerator generator;
-    private final List<File> templateFiles;
-    private String suffixRegex;
-    private boolean failOnError;
-
-    public JavaGeneratorRunnable() {
-        this.configuration = new RockerConfiguration();
-        this.parser = new TemplateParser(this.configuration);
-        this.generator = new JavaGenerator(this.configuration);
-        this.generator.setPlainTextStrategy(PlainTextStrategy.STATIC_STRINGS);
-        this.templateFiles = new ArrayList<>();
-        this.suffixRegex = ".*\\.rocker\\.(raw|html)$";
-        this.failOnError = true;
-    }
-
-    public String getSuffixRegex() {
-        return suffixRegex;
-    }
-
-    public void setSuffixRegex(String suffixRegex) {
-        this.suffixRegex = suffixRegex;
-    }
-
-    public boolean isFailOnError() {
-        return failOnError;
-    }
-
-    public void setFailOnError(boolean failOnError) {
-        this.failOnError = failOnError;
-    }
-
-    public TemplateParser getParser() {
-        return parser;
-    }
-
-    public JavaGenerator getGenerator() {
-        return generator;
-    }
-
-    public void run() throws RuntimeException{
-        if (this.configuration.getTemplateDirectory() == null) {
-            throw new RuntimeException("Template directory was null");
-        }
-
-        if (!this.configuration.getTemplateDirectory().exists() || !this.configuration.getTemplateDirectory().isDirectory()) {
-            throw new RuntimeException("Template directory does not exist: " + this.configuration.getTemplateDirectory());
-        }
-
-        // loop thru template directory and match templates
-        Collection<File> allFiles = RockerUtil.listFileTree(this.configuration.getTemplateDirectory());
-        for (File f : allFiles) {
-            if (f.getName().matches(suffixRegex)) {
-                templateFiles.add(f);
-            }
-        }
-
-        log.info("Parsing " + templateFiles.size() + " rocker template files");
-
-        int errors = 0;
-        int generated = 0;
-
-        for (File f : templateFiles) {
-            TemplateModel model = null;
-
-            try {
-                // parse model
-                model = parser.parse(f);
-            } catch (IOException | ParserException e) {
-                if (e instanceof ParserException) {
-                    ParserException pe = (ParserException) e;
-                    log.error("Parsing failed for " + f + ":[" + pe.getLineNumber() + "," + pe.getColumnNumber() + "] " + pe.getMessage());
-                } else {
-                    log.error("Unable to parse template", e);
-                }
-                errors++;
-            }
-
-            try {
-                File outputFile = generator.generate(model);
-                generated++;
-
-                log.debug("Generated java source: " + outputFile);
-            } catch (GeneratorException | IOException e) {
-                throw new RuntimeException("Generating java source failed for " + f + ": " + e.getMessage(), e);
-            }
-
-        }
-
-        log.info("Generated " + generated + " rocker java source files");
-
-        if (errors > 0 && failOnError) {
-            throw new RuntimeException("Caught " + errors + " errors.");
-        }
-
-        if (!configuration.getOptions().getOptimize()) {
-            // save configuration
-            this.configuration.getClassDirectory().mkdirs();
-
-            // use resource name, but strip leading slash
-            // place it into the classes directory (not the compile directory)
-            try{
-                File configFile = new File(this.configuration.getClassDirectory(), RockerRuntime.CONF_RESOURCE_NAME.substring(1));
-                this.configuration.write(configFile);
-                log.info("Generated rocker configuration " + configFile);
-            }catch(IOException iox){
-                throw new RuntimeException(iox);
-            }
-        } else {
-            log.info("Optimize flag on. Did not generate rocker configuration file");
-        }
-    }
-
-    public void setTemplateDirectory(File templateDirectory) {
-        this.parser.getConfiguration().setTemplateDirectory(templateDirectory);
-    }
-
-    public void setOutputDirectory(File outputDirectory) {
-        this.generator.getConfiguration().setOutputDirectory(outputDirectory);
-    }
-}
diff --git a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerConfiguration.java b/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerConfiguration.java
deleted file mode 100644
index 09583504b8..0000000000
--- a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerConfiguration.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import com.fizzed.rocker.model.JavaVersion;
-import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.provider.ListProperty;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.Internal;
-import org.gradle.api.tasks.Optional;
-
-/**
- * Bean for the configuration options of Rocker Compiler
- */
-public abstract class RockerConfiguration {
-    private String[] postProcessing;
-    private Boolean markAsGenerated;
-
-    public RockerConfiguration() {
-        getSkip().convention(false);
-        getFailOnError().convention(true);
-        getSkipTouch().convention(true);
-        getJavaVersion().convention(JavaVersion.current());
-        getOptimize().convention(true);
-        getDiscardLogicWhitespace().convention(true);
-    }
-
-    @Internal
-    public abstract Property<Boolean> getSkip();
-
-    @Internal
-    public abstract Property<Boolean> getFailOnError();
-
-    @Internal
-    public abstract Property<Boolean> getSkipTouch();
-
-    @Optional
-    @Input
-    public abstract Property<String> getTouchFile();
-
-    @Input
-    public abstract Property<String> getJavaVersion();
-
-    @Optional
-    @Input
-    public abstract Property<String> getExtendsClass();
-
-    @Optional
-    @Input
-    public abstract Property<String> getExtendsModelClass();
-
-    @Optional
-    @Input
-    public abstract Property<Boolean> getOptimize();
-
-    @Optional
-    @Input
-    public abstract Property<Boolean> getDiscardLogicWhitespace();
-
-    @Optional
-    @Input
-    public abstract Property<String> getTargetCharset();
-
-    @Optional
-    @Input
-    public abstract Property<String> getSuffixRegex();
-
-    @Internal
-    public abstract DirectoryProperty getOutputBaseDirectory();
-
-    @Internal
-    public abstract DirectoryProperty getClassBaseDirectory();
-
-    @Optional
-    @Input
-    public abstract ListProperty<String> getPostProcessing();
-
-    @Optional
-    @Input
-    public abstract Property<Boolean> getMarkAsGenerated();
-}
diff --git a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerPlugin.java b/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerPlugin.java
deleted file mode 100644
index b519161c3d..0000000000
--- a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerPlugin.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.plugins.ExtensionAware;
-import org.gradle.api.plugins.JavaLibraryPlugin;
-import org.gradle.api.plugins.JavaPluginExtension;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.SourceSetContainer;
-import org.gradle.api.tasks.TaskProvider;
-
-/**
- * A plugin that for gradle that provides the `generateRockerTemplateSource`
- * tasks.
- */
-public class RockerPlugin implements Plugin<Project> {
-    /**
-     * Create `rockerCompile` task in group build and describe the task
-     *
-     * @param project - gradle project
-     */
-    @Override
-    public void apply(Project project) {
-        // Make sure that we have the objects from the java task available
-        project.getPluginManager().apply(JavaLibraryPlugin.class);
-
-        // Create own project extension (configuration)
-        RockerConfiguration rockerConfig = project.getExtensions().create("rocker", RockerConfiguration.class);
-        rockerConfig.getOutputBaseDirectory().convention(
-                project.getLayout().getBuildDirectory().dir("generated-src/rocker")
-        );
-        rockerConfig.getClassBaseDirectory().convention(
-                project.getLayout().getBuildDirectory().dir("classes")
-        );
-
-        // Create own source set extension using the modern JavaPluginExtension API
-        SourceSetContainer sourceSets = project.getExtensions()
-                .getByType(JavaPluginExtension.class).getSourceSets();
-        sourceSets.all(sourceSet -> processSourceSet(project, sourceSet, rockerConfig));
-
-    }
-
-    private static void processSourceSet(Project project, SourceSet sourceSet,
-                                         RockerConfiguration rockerConfig) {
-        // for each source set we will:
-        // 1) Add a new 'rocker' extension to the source set
-        RockerSourceSetProperty rockerProperty
-                = new RockerSourceSetProperty(project);
-        ((ExtensionAware) sourceSet).getExtensions().add(
-                "rocker", rockerProperty);
-
-        // 2) Create a rocker task for this sourceSet following the gradle
-        //    naming conventions
-        String taskName = sourceSet.getTaskName(
-                "generate", "RockerTemplateSource");
-        TaskProvider<RockerTask> rockerTaskProvider = project.getTasks().register(taskName, RockerTask.class, rockerTask -> {
-            rockerTask.setGroup("build");
-            rockerTask.setDescription("Generate Sources from "
-                    + sourceSet.getName() + " Rocker Templates");
-            rockerTask.getRockerProjectConfig().set(rockerConfig);
-            rockerTask.getOutputDir().convention(
-                    rockerConfig.getOutputBaseDirectory().dir(sourceSet.getName())
-            );
-            rockerTask.getClassDir().convention(
-                    rockerConfig.getClassBaseDirectory().dir(sourceSet.getName())
-            );
-            rockerTask.getTemplateDirs().from(rockerProperty.getRocker().getSrcDirs());
-        });
-
-        sourceSet.getJava().srcDir(rockerTaskProvider);
-    }
-
-}
diff --git a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerSourceSetProperty.java b/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerSourceSetProperty.java
deleted file mode 100644
index 5aef586e2b..0000000000
--- a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerSourceSetProperty.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import groovy.lang.Closure;
-import org.gradle.api.Action;
-import org.gradle.api.Project;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.util.internal.ClosureBackedAction;
-
-import java.io.File;
-import java.util.Set;
-
-/**
- * The rocker property added to the {@link SourceSet}.
- */
-public class RockerSourceSetProperty {
-
-    private final TemplateDirectorySet templateDirs;
-
-    /**
-     * @param project - main gradle project
-     */
-    public RockerSourceSetProperty(Project project) {
-        super();
-        templateDirs = new TemplateDirectorySet(project);
-    }
-
-    public TemplateDirectorySet getRocker() {
-        return templateDirs;
-    }
-
-    public RockerSourceSetProperty rocker(Closure<?> configureClosure) {
-        new ClosureBackedAction<>(configureClosure).execute(getRocker());
-        return this;
-    }
-
-    public RockerSourceSetProperty rocker(
-        Action<? super TemplateDirectorySet> configureAction) {
-        configureAction.execute(getRocker());
-        return this;
-    }
-
-    // Delegate methods to TemplateDirectorySet for DSL compatibility
-    public RockerSourceSetProperty srcDir(Object srcDir) {
-        templateDirs.srcDir(srcDir);
-        return this;
-    }
-
-    public RockerSourceSetProperty srcDirs(Object... srcDirs) {
-        templateDirs.srcDirs(srcDirs);
-        return this;
-    }
-
-    public RockerSourceSetProperty setSrcDirs(Iterable<?> srcPaths) {
-        templateDirs.setSrcDirs(srcPaths);
-        return this;
-    }
-
-    public Set<File> getSrcDirs() {
-        return templateDirs.getSrcDirs();
-    }
-}
diff --git a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerTask.java b/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerTask.java
deleted file mode 100644
index 218b1d1a59..0000000000
--- a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/RockerTask.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import com.fizzed.rocker.compiler.RockerOptions;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.file.ConfigurableFileCollection;
-import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.file.FileSystemOperations;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.CacheableTask;
-import org.gradle.api.tasks.Classpath;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.Nested;
-import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.PathSensitive;
-import org.gradle.api.tasks.PathSensitivity;
-import org.gradle.api.tasks.TaskAction;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-@CacheableTask
-public abstract class RockerTask extends DefaultTask {
-
-
-    /**
-     * @return the config
-     */
-    @Nested
-    public abstract Property<RockerConfiguration> getRockerProjectConfig();
-
-    /**
-     * @return the templateDirs
-     */
-    @InputFiles
-    @PathSensitive(PathSensitivity.RELATIVE)
-    public abstract ConfigurableFileCollection getTemplateDirs();
-
-    /**
-     * @return the outputDir
-     */
-    @OutputDirectory
-    public abstract DirectoryProperty getOutputDir();
-
-    @Classpath
-    public abstract DirectoryProperty getClassDir();
-
-    @Inject
-    protected abstract FileSystemOperations getFileSystemOperations();
-
-    /**
-     * Sets up the logger and runs the rocker compiler
-     */
-    @TaskAction
-    public void compileRocker() {
-        RockerConfiguration ext = (RockerConfiguration)
-                getProject().getExtensions().findByName("rocker");
-        File outputDir = getOutputDir().get().getAsFile();
-        // Rocker only writes files, so remove sources generated from templates that no longer exist
-        getFileSystemOperations().delete(spec -> spec.delete(outputDir));
-        Set<File> templateDirs = getTemplateDirs().getFiles();
-        for (File templateDir : templateDirs) {
-            doCompileRocker(ext, getLogger(), templateDir, outputDir, getClassDir().get().getAsFile());
-        }
-    }
-
-    /**
-     * Uses the project to get GradleExtension and runs the generator
-     */
-    public static void doCompileRocker(RockerConfiguration ext,
-                                       Logger logger,
-                                       File templateDir, File outputDir, File classDir) {
-
-        runJavaGeneratorMain(ext, logger, templateDir, outputDir, classDir);
-    }
-
-    /**
-     * Run the Rocker compiler with the RockerGradleExtension as configuration
-     * options.
-     *
-     * @param ext the extension from the project object
-     */
-    private static void runJavaGeneratorMain(RockerConfiguration ext,
-                                             Logger logger,
-                                             File templateDir, File outputDir, File classDir) {
-        if (ext.getSkip().get()) {
-            logger.info("Skip flag is on, will skip goal.");
-            return;
-        }
-
-        logger.info("Targeting java version " + ext.getJavaVersion().get());
-
-        try {
-            JavaGeneratorRunnable jgm = new JavaGeneratorRunnable();
-
-            jgm.getParser().getConfiguration().setTemplateDirectory(templateDir);
-            jgm.getGenerator().getConfiguration().setOutputDirectory(outputDir);
-            jgm.getGenerator().getConfiguration().setClassDirectory(classDir);
-            jgm.setFailOnError(ext.getFailOnError().get());
-
-            // passthru other config
-            if (ext.getSuffixRegex().isPresent()) {
-                jgm.setSuffixRegex(ext.getSuffixRegex().get());
-            }
-            RockerOptions rockerOptions = jgm.getParser().getConfiguration().getOptions();
-            rockerOptions.setJavaVersion(ext.getJavaVersion().get());
-            if (ext.getExtendsClass().isPresent()) {
-                rockerOptions.setExtendsClass(ext.getExtendsClass().get());
-            }
-            if (ext.getExtendsModelClass().isPresent()) {
-                rockerOptions.setExtendsModelClass(ext.getExtendsModelClass().get());
-            }
-            if (ext.getDiscardLogicWhitespace().isPresent()) {
-                rockerOptions.setDiscardLogicWhitespace(ext.getDiscardLogicWhitespace().get());
-            }
-            if (ext.getTargetCharset().isPresent()) {
-                rockerOptions.setTargetCharset(ext.getTargetCharset().get());
-            }
-            if (ext.getOptimize().isPresent()) {
-                rockerOptions.setOptimize(ext.getOptimize().get());
-            }
-            if (ext.getPostProcessing().isPresent()) {
-                List<String> postProcessing = ext.getPostProcessing().get();
-                if (!postProcessing.isEmpty()) {
-                    rockerOptions.setPostProcessing(postProcessing.toArray(new String[0]));
-                }
-            }
-            if (ext.getMarkAsGenerated().isPresent()) {
-                rockerOptions.setMarkAsGenerated(ext.getMarkAsGenerated().get());
-            }
-
-            jgm.run();
-
-        } catch (Exception e) {
-            throw new RockerGradleException(e.getMessage(), e);
-        }
-
-        if (!ext.getSkipTouch().get()) {
-            String touchFile = ext.getTouchFile().orElse("").get();
-            if (touchFile.length() == 0) {
-                throw new RockerGradleException(
-                        "If skipTouch is equal to false, then "
-                                + "touchFile must not be empty");
-            }
-            if (ext.getTouchFile().isPresent()) {
-                File f = new File(touchFile);
-                logger.info("Touching file " + f);
-                try {
-                    if (!f.exists()) {
-                        new FileOutputStream(f).close();
-                    }
-                    if (!f.setLastModified(System.currentTimeMillis())) {
-                        throw new IOException("Could not set Last Modified");
-                    }
-                } catch (IOException e) {
-                    logger.debug("Unable to touch file: " + f.getAbsolutePath(), e);
-                }
-            }
-        }
-    }
-
-}
diff --git a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/TemplateDirectorySet.java b/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/TemplateDirectorySet.java
deleted file mode 100644
index 2ce6084ed1..0000000000
--- a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/TemplateDirectorySet.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import org.gradle.api.PathValidation;
-import org.gradle.api.Project;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.util.PatternFilterable;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A simplified version of {@link SourceSet}. Gradle's {@link SourceSet}
- * inherits from {@link PatternFilterable}, but rocker works on complete
- * directories. So instead of using {@link SourceSet} and allowing
- * the user to specify filters without any effect, this simplified
- * source set implementation is used.
- * <P>
- * It would be tempting to provide e.g. {@code templateDir} instead of
- * {@code srcDir}, but this would break established use and templates are
- * the source in this context.
- */
-public class TemplateDirectorySet  {
-    private Project project;
-    private final Set<File> templateDirs = new HashSet<>();
-
-    /**
-     * Create a new instance. The project is used to immediately check
-     * (with {@code project.file()} the validity of added directories.
-     *
-     * @param project the project
-     */
-    public TemplateDirectorySet(Project project) {
-        super();
-        this.project = project;
-    }
-
-    /**
-     * Adds the given source directory to this set.
-     *
-     * @param srcDir the directory
-     * @return the template set for easy chaining
-     */
-    public TemplateDirectorySet srcDir(Object srcDir) {
-        templateDirs.add(project.file(srcDir, PathValidation.DIRECTORY));
-        return this;
-    }
-
-    /**
-     * Adds the given source directories to this set.
-     *
-     * @param srcDirs the directories
-     * @return the template set for easy chaining
-     */
-    public TemplateDirectorySet srcDirs(Object... srcDirs) {
-        for (Object srcDir : srcDirs) {
-            srcDir(srcDir);
-        }
-        return this;
-    }
-
-    /**
-     * Sets the source directories for this set.
-     *
-     * @param srcPaths the source directories
-     * @return the template set for easy chaining
-     */
-    public TemplateDirectorySet setSrcDirs(Iterable<?> srcPaths) {
-        templateDirs.clear();
-        srcPaths.forEach(this::srcDir);
-        return this;
-    }
-
-    /**
-     * Adds the given source to this set.
-     *
-     * @param source the source
-     * @return the template set for easy chaining
-     */
-    public TemplateDirectorySet source(TemplateDirectorySet source) {
-        source.getSrcDirs().forEach(this::srcDir);
-        return this;
-    }
-
-    /**
-     * Returns the source directories that make up this set.
-     *
-     * @return the directories
-     */
-    public Set<File> getSrcDirs() {
-        return templateDirs;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("TemplateDirectorySet [");
-        if (!templateDirs.isEmpty()) {
-            builder.append("templateDirs=");
-            builder.append(templateDirs);
-        }
-        builder.append("]");
-        return builder.toString();
-    }
-}
diff --git a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/WhitespaceProcessor.java b/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/WhitespaceProcessor.java
deleted file mode 100644
index a24f929dfc..0000000000
--- a/grails-forge/buildSrc/src/main/java/org/grails/forge/rocker/plugin/WhitespaceProcessor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.rocker.plugin;
-
-import com.fizzed.rocker.model.PlainText;
-import com.fizzed.rocker.model.PostProcessorException;
-import com.fizzed.rocker.model.TemplateModel;
-import com.fizzed.rocker.model.TemplateModelPostProcessor;
-import com.fizzed.rocker.model.TemplateUnit;
-
-import java.util.List;
-
-public class WhitespaceProcessor implements TemplateModelPostProcessor {
-
-    @Override
-    public TemplateModel process(TemplateModel templateModel, int ppIndex) throws PostProcessorException {
-        List<TemplateUnit> units = templateModel.getUnits();
-        int length = units.size();
-        PlainText lastPlainText = null;
-        for (int i = 0; i < length; i ++) {
-            TemplateUnit tu = units.get(i);
-            if (tu instanceof PlainText) {
-                PlainText pt = (PlainText)tu;
-                if ((lastPlainText == null || lastPlainText.getText().endsWith("\n")) && pt.getText().startsWith("\n")) {
-                    PlainText replacementPt = new PlainText(pt.getSourceRef(), pt.getText().substring(1));
-                    // replace the unit
-                    units.add(i, replacementPt);
-                    units.remove(i + 1);
-                }
-                lastPlainText = pt;
-            }
-        }
-        return templateModel;
-    }
-}
diff --git a/grails-forge/config/checkstyle/checkstyle.xml b/grails-forge/config/checkstyle/checkstyle.xml
deleted file mode 100644
index c39c160c77..0000000000
--- a/grails-forge/config/checkstyle/checkstyle.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-     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
-
-       http://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.
-
--->
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-    <!--
-        If you set the basedir property below, then all reported file
-        names will be relative to the specified directory. See
-        http://checkstyle.sourceforge.net/5.x/config.html#Checker
-
-        <property name="basedir" value="${basedir}"/>
-    -->
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-
-    <!-- Checks that a package-info.java file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
-    <!--<module name="JavadocPackage"/>-->
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile">
-        <property name="lineSeparator" value="lf_cr_crlf"/>
-    </module>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!-- Checks for Size Violations.                    -->
-    <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <module name="FileLength"/>
-
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See http://checkstyle.sf.net/config_misc.html -->
-    <!--     <module name="RegexpSingleline">
-            <property name="format" value="\s+$"/>
-            <property name="minimum" value="0"/>
-            <property name="maximum" value="0"/>
-            <property name="message" value="Line has trailing spaces."/>
-        </module> -->
-
-    <!-- Be able to ignore violations with @SuppressWarnings -->
-    <!-- See http://checkstyle.sf.net/config_filters.html#SuppressWarningsFilter -->
-    <module name="SuppressWarningsFilter"/>
-
-    <!-- See http://checkstyle.sourceforge.net/config_filters.html#SuppressionFilter -->
-    <module name="SuppressionFilter">
-        <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
-        <property name="optional" value="false"/>
-    </module>
-
-    <module name="TreeWalker">
-
-        <!-- Needed for SuppressWarningsFilter -->
-        <module name="SuppressWarningsHolder"/>
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocMethod">
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-        </module>
-        <module name="JavadocType">
-        </module>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalVariableName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <!-- <module name="AvoidStarImport"/> -->
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports">
-            <property name="processJavadoc" value="false"/>
-        </module>
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <!-- <module name="LineLength"/> -->
-        <module name="ParameterNumber">
-            <property name="max" value="12"/>
-        </module>
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <!-- <module name="EmptyForIteratorPad"/> -->
-        <module name="GenericWhitespace"/>
-        <!-- <module name="MethodParamPad"/> -->
-        <!-- <module name="NoWhitespaceAfter"/> -->
-        <!-- <module name="NoWhitespaceBefore"/> -->
-        <!-- <module name="OperatorWrap"/> -->
-        <module name="ParenPad"/>
-        <!-- <module name="TypecastParenPad"/> -->
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-            <property name="allowMultipleEmptyLines" value="false"/>
-            <property name="tokens" value="CTOR_DEF, VARIABLE_DEF, METHOD_DEF"/>
-        </module>
-        <module name="NoLineWrap"/>
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier">
-            <property name="tokens" value="METHOD_DEF,VARIABLE_DEF,ANNOTATION_FIELD_DEF,RESOURCE"/>
-        </module>
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <!--<module name="MagicNumber">-->
-            <!--<property name="ignoreFieldDeclaration" value="true"/>-->
-            <!--<property name="ignoreHashCodeMethod" value="true"/>-->
-        <!--</module>-->
-        <module name="MissingSwitchDefault"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for Inner assigment -->
-        <!-- See http://checkstyle.sourceforge.net/config_coding.html#InnerAssignment -->
-        <module name="InnerAssignment">
-            <property name="tokens" value="ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN"/>
-        </module>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <module name="DesignForExtension">
-            <property name="ignoredAnnotations" value="Override"/>
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="FinalClass"/>
-        <module name="VisibilityModifier">
-            <property name="protectedAllowed" value="true"/>
-            <property name="packageAllowed" value="true"/>
-        </module>
-        <module name="InnerTypeLast"/>
-        <module name="ModifierOrder"/>
-        <module name="DeclarationOrder"/>
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <!-- <module name="FinalParameters"/> -->
-        <module name="UpperEll"/>
-
-        <!-- TodoComments -->
-        <!-- See http://checkstyle.sourceforge.net/config_misc.html#TodoComment -->
-        <module name="TodoComment">
-            <property name="severity" value="warning"/>
-        </module>
-    </module>
-
-</module>
diff --git a/grails-forge/config/spotless.license.java b/grails-forge/config/spotless.license.java
deleted file mode 100644
index 52c486d14a..0000000000
--- a/grails-forge/config/spotless.license.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  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.
- */
\ No newline at end of file
diff --git a/grails-forge/docs/aws-elastic-beanstalk.md b/grails-forge/docs/aws-elastic-beanstalk.md
index 8728312088..7f210bb81d 100644
--- a/grails-forge/docs/aws-elastic-beanstalk.md
+++ b/grails-forge/docs/aws-elastic-beanstalk.md
@@ -52,6 +52,8 @@ Create or identify a GitHub Actions OIDC provider and record its ARN. Set the re
 
 Do not store a GitHub OAuth app client ID or secret. The start.grails.org UI removed Push to GitHub, and the unused server-side create/OAuth integration is not part of this deployment. Keep `GITHUB_REDIRECT_URL` as the browser redirect to the Forge UI.
 
+The Grails application reads its configurable CORS origins from `CORS_ALLOWED_ORIGIN`, which defaults to `https://start.grails.org`, and `CORS_ALLOWED_ORIGIN_APACHE`, which defaults to `https://grails.apache.org`. It also always allows `https://grails.github.io`. These are browser origins, not API slot hostnames.
+
 Grails 7 and Grails 8 both run on Java 25, so select a concrete Corretto 25 Elastic Beanstalk `PlatformArn`. Prefer an `arm64` platform with `t4g.small` only when that platform supports `arm64`; otherwise select an `x86_64` platform with `t3.small`.
 
 ```bash
@@ -130,10 +132,10 @@ Repeat that command for the other six rows. Before the first Forge deployment, r
 From `grails-forge`, build the Elastic Beanstalk bundle with the repository task:
 
 ```bash
-./gradlew grails-forge-web-netty:awsElasticBeanstalk
+./gradlew grails-forge-web:awsElasticBeanstalk
 ```
 
-The output is `grails-forge-web-netty/build/distributions/grails-forge-web-netty-aws.zip`. Its ZIP root contains `app.jar`, `Procfile`, `start.sh`, and `.platform`. Do not create an `application.jar` archive manually. The workflow uploads this ZIP and creates a distinct immutable Elastic Beanstalk application version for the selected slot; it does not require the same artifact to be deployed to all seven slots.
+The output is `grails-forge-web/build/distributions/grails-forge-web-aws.zip`. Its ZIP root contains the Grails 8 application as an executable Tomcat `bootJar` named `app.jar`, plus `Procfile`, `start.sh`, and `.platform`. Do not create an `application.jar` archive manually. The workflow uploads this ZIP and creates a distinct immutable Elastic Beanstalk application version for the selected slot; it does not require the same artifact to be deployed to all seven slots.
 
 ## GitHub Actions Deployment
 
diff --git a/grails-forge/docs/choose-postgresql.png b/grails-forge/docs/choose-postgresql.png
deleted file mode 100644
index b1461240a3..0000000000
Binary files a/grails-forge/docs/choose-postgresql.png and /dev/null differ
diff --git a/grails-forge/docs/cloud_sql_create_intance.png b/grails-forge/docs/cloud_sql_create_intance.png
deleted file mode 100644
index 9128781c40..0000000000
Binary files a/grails-forge/docs/cloud_sql_create_intance.png and /dev/null differ
diff --git a/grails-forge/docs/create-database.png b/grails-forge/docs/create-database.png
deleted file mode 100644
index 2f68d493b9..0000000000
Binary files a/grails-forge/docs/create-database.png and /dev/null differ
diff --git a/grails-forge/docs/create-two-databases.png b/grails-forge/docs/create-two-databases.png
deleted file mode 100644
index bc9740b6a5..0000000000
Binary files a/grails-forge/docs/create-two-databases.png and /dev/null differ
diff --git a/grails-forge/docs/dbinstance-options.png b/grails-forge/docs/dbinstance-options.png
deleted file mode 100644
index c784fc8bde..0000000000
Binary files a/grails-forge/docs/dbinstance-options.png and /dev/null differ
diff --git a/grails-forge/docs/enable-cloud-sql-admin-api.png b/grails-forge/docs/enable-cloud-sql-admin-api.png
deleted file mode 100644
index 6931063834..0000000000
Binary files a/grails-forge/docs/enable-cloud-sql-admin-api.png and /dev/null differ
diff --git a/grails-forge/docs/enable-compute-engine-api.png b/grails-forge/docs/enable-compute-engine-api.png
deleted file mode 100644
index cb7363a4ea..0000000000
Binary files a/grails-forge/docs/enable-compute-engine-api.png and /dev/null differ
diff --git a/grails-forge/etc/bin/generate-build-artifact-hashes.groovy b/grails-forge/etc/bin/generate-build-artifact-hashes.groovy
deleted file mode 100755
index 828835686a..0000000000
--- a/grails-forge/etc/bin/generate-build-artifact-hashes.groovy
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env groovy
-/*
- *  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.
- */
-import java.nio.file.*
-import java.security.MessageDigest
-
-// ---------------------------------------------------------------------------
-String sha256(Path file) {
-    MessageDigest md = MessageDigest.getInstance('SHA-256')
-    file.withInputStream { is ->
-        byte[] buf = new byte[8192]
-        for (int r = is.read(buf); r > 0; r = is.read(buf))
-            md.update(buf, 0, r)
-    }
-    md.digest().collect { String.format('%02x', it) }.join()
-}
-
-Path scriptDir = Paths.get(getClass()
-        .protectionDomain
-        .codeSource
-        .location
-        .toURI())
-        .toAbsolutePath()
-        .parent
-
-Path root = scriptDir.resolve('..').resolve('..').normalize()
-
-// ---------------------------------------------------------------------------
-// Decide where to search: project root by default, or user-supplied path
-// (absolute or relative to project root) when an argument is given.
-Path scanRoot
-if (this.args && this.args.length > 0) {
-    Path argPath = Paths.get(this.args[0])
-    scanRoot = argPath.isAbsolute() ? argPath : root.resolve(argPath).normalize()
-    if (!Files.exists(scanRoot)) {
-        System.err.println "❌  Path '${scanRoot}' does not exist."
-        System.exit(1)
-    }
-} else {
-    scanRoot = root
-}
-List<Path> artifacts = []
-Files.walk(scanRoot)
-            .filter {
-                Files.isRegularFile(it) &&
-                        !it.toString().contains("buildSrc") &&
-                        !it.toString().contains("etc") &&
-                        it.toString().endsWith('.jar') &&
-                        it.toString().contains("${File.separator}build${File.separator}libs${File.separator}")
-            }
-            .forEach { artifacts << it }
-
-artifacts.findAll {
-    !it.toString().contains("${File.separator}buildSrc${File.separator}") // build src jars aren't published
-    !it.toString().contains("${File.separator}test-core${File.separator}") // tests aren't published
-}.sort { a, b -> a.toString() <=> b.toString()
-}.collect { Path jar ->
-    String hash = sha256(jar)
-    String relative = root.relativize(jar).toString()
-    "${relative} ${hash}"
-}.sort().each {
-    println it
-}
\ No newline at end of file
diff --git a/grails-forge/etc/bin/test-reproducible-builds.sh b/grails-forge/etc/bin/test-reproducible-builds.sh
deleted file mode 100755
index f3ee82ab63..0000000000
--- a/grails-forge/etc/bin/test-reproducible-builds.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-#
-#  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.
-#
-
-# This file assumes the gnu version of coreutils is installed, which is not installed by default on a mac
-set -e
-
-export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
-
-CWD=$(pwd)
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-cd "${SCRIPT_DIR}/../.."
-
-rm -rf "${SCRIPT_DIR}/results" || true
-mkdir -p "${SCRIPT_DIR}/results"
-
-killall -e java || true
-git clean -xdf --exclude='etc/bin'
-./gradlew build --rerun-tasks -PskipTests --no-build-cache
-"${SCRIPT_DIR}/generate-build-artifact-hashes.groovy" > "${SCRIPT_DIR}/results/first.txt"
-mkdir -p "${SCRIPT_DIR}/results/first"
-find . -path ./etc -prune -o -type f -path '*/build/libs/*.jar' -print0 | xargs -0 cp --parents -t "${SCRIPT_DIR}/results/first/"
-
-killall -e java || true
-git clean -xdf --exclude='etc/bin'
-./gradlew build --rerun-tasks -PskipTests --no-build-cache
-"${SCRIPT_DIR}/generate-build-artifact-hashes.groovy" > "${SCRIPT_DIR}/results/second.txt"
-mkdir -p "${SCRIPT_DIR}/results/second"
-find . -path ./etc -prune -o -type f -path '*/build/libs/*.jar' -print0 | xargs -0 cp --parents -t "${SCRIPT_DIR}/results/second/"
-
-cd "${SCRIPT_DIR}/results"
-
-# diff -u first.txt second.txt
-DIFF_RESULTS=$(comm -3 first.txt second.txt | cut -d' ' -f1 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | uniq | sort)
-echo "Differing artifacts:"
-echo "$DIFF_RESULTS" > diff.txt
-cat diff.txt
-
-printf '%s\n' "$DIFF_RESULTS" | sed 's|^etc/bin/results/||' > toPurge.txt
-find first -type f -name '*.jar' -print | sed 's|^first/||' | grep -F -x -v -f toPurge.txt |
-  while IFS= read -r f; do
-    rm -f "./first/$f"
-  done
-find second -type f -name '*.jar' -print | sed 's|^second/||' | grep -F -x -v -f toPurge.txt |
-  while IFS= read -r f; do
-    rm -f "./second/$f"
-  done
-rm toPurge.txt
-find . -type d -empty -delete
-cd "$CWD"
diff --git a/grails-forge/gradle.properties b/grails-forge/gradle.properties
index d362ec48e9..ba036558dc 100644
--- a/grails-forge/gradle.properties
+++ b/grails-forge/gradle.properties
@@ -17,43 +17,19 @@
 #  under the License.
 #
 
-# Project version is defined in the root gradle.properties file
-
-# title and project description are required for the micronaut documentation generation tasks
+# Project version is defined in the root gradle.properties file. Forge is a separate Gradle build that
+# consumes the framework it is built with by coordinates (includeBuild substitution), so every version
+# the framework manages comes from grails-bom; only Forge-specific pins live here. The pins build-logic
+# needs as well (Rocker, shadow) live in the root gradle.properties.
 title=Grails Application Forge
 projectDesc=Generates Grails applications
-
-# for forge build process which is a micronaut 4.x.x app with picocli
-antVersion=1.10.15
-antlr4Version=4.8-1!!
-asciidoctorGradleJvmVersion=4.0.5
 commonsCompressVersion=1.28.0
 gradleSdkvendorPluginVersion=3.0.0
-# minimum 4.0.32 - groovydoc output is non-deterministic before GROOVY-11954, breaking reproducible javadoc jars
-groovyVersion=4.0.33
-jacksonDatabindVersion=2.18.3
 javaDiffUtils=4.15
-micronautApplicationPluginVersion=4.6.2
-micronautBuildVersion=2.2.1
-micronautDocsVersion=2.0.0
-micronautGradlePlugins=5.4.10
-micronautVersion=4.10.16
-nexusPublishVersion=1.3.0
-nohttpGradleVersion=0.0.11
-objenesisVersion=3.4
-postgresSocketFactoryVersion=1.17.1
-picocliVersion=4.7.6
 reflectionsVersion=0.10.2
-rockerVersion=2.2.1
-shadowVersion=8.3.11
-spotlessVersion=6.25.0
 testcontainersVersion=1.20.4
-testRetryVersion=1.6.2
 typesafeConfigVersion=1.4.3
 
-# custom checkstyle configuration for forge
-grails.codestyle.dir.checkstyle=config/checkstyle
-
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx5G
diff --git a/grails-forge/gradle/code-style-config.gradle b/grails-forge/gradle/code-style-config.gradle
deleted file mode 100644
index c8d7bbaf83..0000000000
--- a/grails-forge/gradle/code-style-config.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  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.
- */
-
-import com.diffplug.gradle.spotless.SpotlessExtension
-import io.spring.nohttp.gradle.NoHttpExtension
-
-apply plugin: 'checkstyle'
-apply plugin: 'codenarc'
-apply plugin: 'com.diffplug.spotless'
-apply plugin: 'io.spring.nohttp' // enforce https everywhere
-apply plugin: 'org.apache.grails.gradle.grails-code-style'
-
-extensions.configure(SpotlessExtension) {
-    // Explicit `it` is required in extension configuration block
-    it.java {
-        target('src/main/java/**/*.java')
-        // Formatters:
-        licenseHeaderFile(rootProject.layout.projectDirectory.file('config/spotless.license.java'))
-    }
-    it.groovy {
-        target('src/main/groovy/**')
-        // Formatters:
-        licenseHeaderFile(rootProject.layout.projectDirectory.file('config/spotless.license.java'))
-    }
-    it.format('javaMisc') {
-        target(
-                'src/main/**/module-info.java',
-                'src/main/**/package-info.java',
-        )
-        // Formatters:
-        licenseHeaderFile(rootProject.layout.projectDirectory.file('config/spotless.license.java'), '\\/\\*\\*')
-    }
-}
-
-extensions.configure(NoHttpExtension) {
-    // Explicit `it` is required in extension configuration block
-    it.source.exclude(
-            'build/**',
-            'src/main/resources/assets/**',
-            'src/main/resources/main/pom.xml',
-            'src/test/**',
-    )
-}
-
-tasks.named('checkstyleMain') {
-    dependsOn('spotlessCheck')
-}
diff --git a/grails-forge/gradle/doc-config.gradle b/grails-forge/gradle/doc-config.gradle
index 8cf3809843..e45394c66d 100644
--- a/grails-forge/gradle/doc-config.gradle
+++ b/grails-forge/gradle/doc-config.gradle
@@ -25,10 +25,10 @@ groovydocEnhancer {
 
 dependencies {
     // The `documentation` configuration is registered by the buildsrc.groovydoc
-    // plugin and is independent of compileClasspath/testRuntimeClasspath, so the
-    // micronaut-platform BOM we apply elsewhere does not reach it. Apply it here so
-    // the unversioned groovy-* artifacts below resolve through groovy-bom.
-    documentation platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
+    // plugin and is independent of compileClasspath/testRuntimeClasspath. Apply
+    // grails-bom here so the unversioned groovy-* artifacts below resolve through
+    // groovy-bom.
+    documentation platform("org.apache.grails:grails-bom:$projectVersion")
     documentation 'org.apache.groovy:groovy-templates'
     documentation 'org.apache.groovy:groovy-dateutil'
     documentation 'org.apache.groovy:groovy-ant'
diff --git a/grails-forge/gradle/groovy-version-pin.gradle b/grails-forge/gradle/groovy-version-pin.gradle
deleted file mode 100644
index 6f8b44bf10..0000000000
--- a/grails-forge/gradle/groovy-version-pin.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  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.
- */
-
-// Pin all Groovy modules to the version in gradle.properties instead of the
-// (older) version managed by the Micronaut platform BOM.
-configurations.configureEach {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if (details.requested.group == 'org.apache.groovy') {
-            details.useVersion(groovyVersion)
-            details.because('groovydoc output is non-deterministic before GROOVY-11954, breaking reproducible javadoc jars')
-        }
-    }
-}
diff --git a/grails-forge/gradle/micronaut-openapi-config.gradle b/grails-forge/gradle/micronaut-openapi-config.gradle
deleted file mode 100644
index 8fc0c93b0b..0000000000
--- a/grails-forge/gradle/micronaut-openapi-config.gradle
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  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.
- */
-import groovy.transform.CompileStatic
-
-def openApiOutputFile = layout.buildDirectory.file('generated/openapi/openapi.properties')
-def openApiPropertiesTask = tasks.register('openApiProperties', WriteProperties)
-openApiPropertiesTask.configure { WriteProperties it ->
-    it.destinationFile.set(openApiOutputFile)
-    it.properties(
-            'swagger-ui.enabled': true,
-            'redoc.enabled': true,
-            'rapidoc.enabled': true,
-            'rapidoc.bg-color': '#14191f',
-            'rapidoc.text-color': '#aec2e0',
-            'rapidoc.sort-endpoints-by': 'method',
-            'micronaut.openapi.expand.api.version': projectVersion
-    )
-}
-
-tasks.named('compileJava', JavaCompile).configure { JavaCompile it ->
-    def override = objects.newInstance(OpenApiSystemPropertyOverride)
-    override.openApiPropertiesFile = openApiPropertiesTask.map { openApiOutputFile.get() }
-    it.options.fork = true
-    it.options.forkOptions.jvmArgumentProviders.add(override)
-}
-
-@CompileStatic
-abstract class OpenApiSystemPropertyOverride implements CommandLineArgumentProvider {
-    @InputFile
-    @PathSensitive(PathSensitivity.RELATIVE)
-    abstract RegularFileProperty getOpenApiPropertiesFile()
-
-    @Override
-    Iterable<String> asArguments() {
-        ["-Dmicronaut.openapi.config.file=${openApiPropertiesFile.asFile.get().absolutePath}".toString()]
-    }
-}
diff --git a/grails-forge/gradle/test-config.gradle b/grails-forge/gradle/test-config.gradle
index 5f2df2b80b..8cae23df04 100644
--- a/grails-forge/gradle/test-config.gradle
+++ b/grails-forge/gradle/test-config.gradle
@@ -20,11 +20,28 @@
 // Add JUnit Platform launcher dependency required by Gradle 9 for running tests
 // Also add ByteBuddy for Spock mocking on Java 17+ (CGLIB doesn't support Java 17 class files)
 dependencies {
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.12.2'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testImplementation "net.bytebuddy:byte-buddy"
 }
 
-tasks.withType(Test).configureEach {
+// Skipped Test tasks still execute their dependsOn. Only wire the local-Maven publish chain
+// of the included builds when Forge tests will actually run.
+boolean forgeTestsEnabled = !['skipTests', 'skipForgeTests'].any { project.hasProperty(it) }
+
+tasks.withType(Test).configureEach { Test testTask ->
+    if (forgeTestsEnabled) {
+        // Only the modules whose specs build generated applications (TestKit) need the published
+        // framework; the unit specs of the other modules run without the publish chain.
+        boolean forgeTestsNeedLocalMaven = project.findProperty('forgeTestsNeedLocalMaven') == true
+        if (forgeTestsNeedLocalMaven) {
+            testTask.dependsOn(
+                    gradle.includedBuild('grails-core').task(':publishAllPublicationsToTestCaseMavenRepoRepository'),
+                    gradle.includedBuild('grails-gradle').task(':publishAllPublicationsToTestCaseMavenRepoRepository')
+            )
+            testTask.environment('GRAILS_REPO_URL', uri(rootProject.layout.projectDirectory.dir('../build/local-maven')))
+        }
+    }
+
     // Honor DO_NOT_CACHE_TESTS=1 so developers can repeatedly invoke the same test command
     // without --rerun-tasks (and without recompiling everything else).
     outputs.cacheIf { !doNotCacheTests }
@@ -45,12 +62,11 @@ tasks.withType(Test).configureEach {
         showStackTraces = true
     }
 
-    environment('GRAILS_REPO_URL', uri(rootProject.layout.projectDirectory.dir('../build/local-maven')))
+    maxHeapSize = '2G'
     jvmArgs('-Duser.country=US', '-Duser.language=en',
             '--add-opens', 'java.base/java.lang=ALL-UNNAMED')
     forkEvery = 100
     maxParallelForks = rootProject.ext.configuredTestParallel
-    maxHeapSize = '2G'
 
     useJUnitPlatform()
 }
diff --git a/grails-forge/grails-cli-shadow/build.gradle b/grails-forge/grails-cli-shadow/build.gradle
index cb3964b413..86b19a63e1 100644
--- a/grails-forge/grails-cli-shadow/build.gradle
+++ b/grails-forge/grails-cli-shadow/build.gradle
@@ -15,6 +15,7 @@
  *  limitations under the License.
  */
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer
 import org.apache.grails.forge.buildlogic.shadowjar.GrailsShadowLicenseTransform
 import org.apache.grails.forge.buildlogic.shadowjar.GrailsShadowNoticeTransform
 
@@ -24,6 +25,7 @@ plugins {
     id 'org.apache.grails.buildsrc.properties'
     id 'org.apache.grails.buildsrc.dependency-validator'
     id 'org.apache.grails.buildsrc.compile'
+    id 'org.apache.grails.gradle.grails-code-style'
 }
 
 version = projectVersion
@@ -62,6 +64,14 @@ shadowJarTask.configure { ShadowJar it ->
     // services & custom grails.factories have to be merged since commands can be created from both sources
     it.mergeServiceFiles()
     it.mergeServiceFiles('META-INF/grails.factories')
+    // the Forge CLI starts a Grails application: Spring Boot finds its auto-configurations and
+    // bootstrap initializers through these files, one per jar, so they are merged rather than
+    // letting the first jar win
+    it.mergeServiceFiles('META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports')
+    it.transform(PropertiesFileTransformer) {
+        paths = ['META-INF/spring.factories']
+        mergeStrategy = 'append'
+    }
 
     // groovy extensions are shipped with grails-core
     it.mergeGroovyExtensionModules()
diff --git a/grails-forge/grails-cli/build.gradle b/grails-forge/grails-cli/build.gradle
index a02e26d57b..474a3046da 100644
--- a/grails-forge/grails-cli/build.gradle
+++ b/grails-forge/grails-cli/build.gradle
@@ -15,6 +15,7 @@
  *  limitations under the License.
  */
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer
 import org.apache.grails.forge.buildlogic.shadowjar.GrailsGroovyExtensionTransformer
 import org.apache.grails.forge.buildlogic.shadowjar.GrailsShadowLicenseTransform
 import org.apache.grails.forge.buildlogic.shadowjar.GrailsShadowNoticeTransform
@@ -30,6 +31,7 @@ plugins {
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
+    id 'org.apache.grails.gradle.grails-code-style'
 }
 
 ext {
@@ -81,9 +83,6 @@ dependencies {
     shadowCombined files(rootProject.project(':grails-cli-shadow').tasks.named('shadowJar'))
 }
 
-apply {
-    from rootProject.layout.projectDirectory.file('gradle/code-style-config.gradle')
-}
 
 // It's surprisingly hard to generate start scripts and *not* have them nested into a bin / lib directory
 // rather than defining the application and then having to add tasks to rework it, just define a distribution and
@@ -105,6 +104,14 @@ shadowJarTask.configure { ShadowJar it ->
     // services & custom grails.factories have to be merged since commands can be created from both sources
     it.mergeServiceFiles()
     it.mergeServiceFiles('META-INF/grails.factories')
+    // the Forge CLI starts a Grails application: Spring Boot finds its auto-configurations and
+    // bootstrap initializers through these files, one per jar, so they are merged rather than
+    // letting the first jar win
+    it.mergeServiceFiles('META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports')
+    it.transform(PropertiesFileTransformer) {
+        paths = ['META-INF/spring.factories']
+        mergeStrategy = 'append'
+    }
 
     // groovy extensions are shipped with grails-core, use our own transformer instead of mergeGroovyExtensionModules()
     // for property file reproducibility
@@ -123,7 +130,7 @@ shadowJarTask.configure { ShadowJar it ->
 
     it.exclude(
             'META-INF/DEPENDENCIES', // until we publish our own SBOM, this won't be correct so exclude
-            'META-INF/grails-plugin.xml', // we do not start or compile a grails application so these files are not needed (grails-core, url mappings, etc plugins)
+            'META-INF/grails-plugin.xml', // one descriptor per plugin at the same path: the Forge CLI declares the plugins it runs instead of discovering them (see org.grails.forge.cli.Application)
             'META-INF/grails-plugin.xml.asc', // avoid signing artifacts
             'META-INF/sbom.json', // re-introduced below from this project's own cyclonedxDirectBom output to avoid the wrong transitive SBOM winning the shadow merge
             'about.html' // restatement of the Eclipse Distribution License - Version 1.0 for jakarta
diff --git a/grails-forge/grails-cli/src/main/groovy/org/apache/grails/cli/DelegatingShellApplication.groovy b/grails-forge/grails-cli/src/main/groovy/org/apache/grails/cli/DelegatingShellApplication.groovy
index 44a40962ad..f1a99b8002 100644
--- a/grails-forge/grails-cli/src/main/groovy/org/apache/grails/cli/DelegatingShellApplication.groovy
+++ b/grails-forge/grails-cli/src/main/groovy/org/apache/grails/cli/DelegatingShellApplication.groovy
@@ -30,7 +30,7 @@ class DelegatingShellApplication {
 
     static void main(String[] args) {
         // Ideally, we'd use pico cli to delegate between them and get autocomplete, but we can't easily do that because
-        // grails-forge-cli does not implement picocli compliant commands (they can't be nested because they're beans that micronaut expects to create)
+        // grails-forge-cli commands are not nested picocli subcommands of this entry point.
 
         Tuple2<Boolean, String[]> info = determineForge(args)
 
diff --git a/grails-forge/grails-forge-analytics-postgres/build.gradle b/grails-forge/grails-forge-analytics-postgres/build.gradle
deleted file mode 100644
index a3959e4b5d..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/build.gradle
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  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.
- */
-
-plugins {
-    id 'org.apache.grails.buildsrc.properties'
-    id 'org.apache.grails.buildsrc.dependency-validator'
-    id 'io.micronaut.application' version "$micronautApplicationPluginVersion"
-}
-
-version = projectVersion
-group = 'org.apache.grails.forge'
-
-dependencies {
-
-    annotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
-    annotationProcessor 'io.micronaut:micronaut-graal'
-    annotationProcessor 'io.micronaut.data:micronaut-data-processor'
-
-    implementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
-    implementation project(':grails-forge-core')
-    implementation "com.google.cloud.sql:postgres-socket-factory:$postgresSocketFactoryVersion"
-    implementation 'io.micronaut.data:micronaut-data-jdbc'
-    implementation 'io.micronaut.flyway:micronaut-flyway'
-    implementation 'io.micronaut.sql:micronaut-jdbc-hikari'
-    implementation 'org.postgresql:postgresql'
-
-    // Flyway 10.x split the PostgreSQL DatabaseType implementation out of
-    // flyway-core into a dedicated module. Without it, Flyway's
-    // ServiceLoader<DatabaseType> lookup fails at runtime with
-    // "FlywayException: Unsupported Database: PostgreSQL <ver>" and the
-    // analytics service crashes during datasource initialization on
-    // Cloud Run, causing the deploy revision to fail its startup probe.
-    runtimeOnly 'org.flywaydb:flyway-database-postgresql'
-    runtimeOnly 'ch.qos.logback:logback-classic'
-    runtimeOnly 'io.micronaut:micronaut-jackson-databind'
-
-    testCompileOnly 'io.micronaut:micronaut-inject-groovy'
-
-    testImplementation 'ch.qos.logback:logback-classic'
-    testImplementation 'io.micronaut:micronaut-http-client'
-    testImplementation 'org.testcontainers:postgresql'
-}
-application {
-    mainClass = 'org.grails.forge.analytics.postgres.Main'
-}
-graalvmNative.toolchainDetection = false
-graalvmNative {
-    // Pin to GraalVM Reachability Metadata Repository 0.3.35 (released 2026-03-06).
-    // The version bundled by Micronaut Gradle Application Plugin 4.6.2 selects the
-    // ch.qos.logback:logback-classic 1.4.9 metadata for our 1.5.17 runtime, whose
-    // --initialize-at-build-time=ch.qos.logback directive collides with the
-    // additional classes introduced in logback 1.5.x and produces "* the class
-    // was requested to be initialized at run time ... got initialized during
-    // image building" failures during dockerBuildNative.
-    //
-    // GRM 0.3.35 ships a 1.5.7 metadata directory for ch.qos.logback:logback-classic
-    // that covers 1.5.7-1.5.29 and contains only reachability-metadata.json (no
-    // native-image.properties / no --initialize-at-build-time directive), so the
-    // conflict goes away and reflection metadata is still provided. GRM 1.x
-    // releases use a new repository layout that is incompatible with the
-    // GraalVMReachabilityMetadataService bundled with this plugin, so we stay
-    // on the last 0.x release that contains the updated logback metadata.
-    metadataRepository {
-        version = '0.3.35'
-    }
-}
-micronaut {
-    runtime('netty')
-    testRuntime('junit5')
-    processing {
-        incremental(true)
-        annotations('org.grails.forge.*')
-    }
-}
-tasks.named('dockerfileNative') {
-    // https://www.graalvm.org/latest/docs/getting-started/container-images/
-    // The GraalVM Native Image Community image bundles the `native-image` tool and matches the
-    // Java 21 baseline used to compile the Forge modules. The previous Java 17 image caused
-    // dockerBuildNative to fail with `UnsupportedClassVersionError` (class file version 65.0).
-    // Pin to a specific patch + OS so dockerBuildNative is reproducible (21.0.2 is the final
-    // GraalVM Community release for JDK 21; later GraalVM Community releases target JDK 22+).
-    //
-    // NOTE: On Micronaut Gradle Plugin 3.7.10, `baseImage(...)` only controls the final runtime
-    // stage of the generated Dockerfile. The builder stage (`FROM ... AS graalvm`), which is
-    // where `native-image` actually runs against our Java 21 bytecode, is controlled by the
-    // separate `graalImage` property. Its default is derived from `jdkVersion`, which the
-    // plugin silently clamps to Java 17 (see NativeImageDockerfile.SUPPORTED_JAVA_VERSIONS =
-    // [17, 11]). Without the explicit `graalImage` override below the builder would still use
-    // `ghcr.io/graalvm/native-image:ol7-java17-22.3.2` and fail with class file version 65.0.
-    def nativeImageContainer = 'ghcr.io/graalvm/native-image-community:21.0.2-ol9'
-    graalImage = nativeImageContainer
-    baseImage(nativeImageContainer)
-}
-
-tasks.named('dockerBuildNative') {
-    images = [findProperty('dockerImageName') ?: 'grailsforge']
-}
-
-tasks.named('dockerBuild') {
-    images = [findProperty('dockerImageName') ?: 'grailsforge']
-}
-
-apply from: rootProject.layout.projectDirectory.file('gradle/groovy-version-pin.gradle')
-apply from: rootProject.layout.projectDirectory.file('gradle/code-style-config.gradle')
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/AnalyticsController.java b/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/AnalyticsController.java
deleted file mode 100644
index 2ac0279773..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/AnalyticsController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.analytics.postgres;
-
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.http.HttpStatus;
-import io.micronaut.http.annotation.Body;
-import io.micronaut.http.annotation.Controller;
-import io.micronaut.http.annotation.Get;
-import io.micronaut.http.annotation.Post;
-import io.micronaut.scheduling.TaskExecutors;
-import io.micronaut.scheduling.annotation.ExecuteOn;
-import org.grails.forge.analytics.Generated;
-
-import jakarta.transaction.Transactional;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Controller("/analytics")
-@ExecuteOn(TaskExecutors.IO)
-public class AnalyticsController {
-
-    private final ApplicationRepository applicationRepository;
-    private final FeatureRepository featureRepository;
-
-    public AnalyticsController(
-            ApplicationRepository applicationRepository,
-            FeatureRepository featureRepository) {
-        this.applicationRepository = applicationRepository;
-        this.featureRepository = featureRepository;
-    }
-
-    @Get("/top/features")
-    List<TotalDTO> topFeatures() {
-        return featureRepository.topFeatures();
-    }
-
-    @Get("/top/jdks")
-    List<TotalDTO> topJdks() {
-        return featureRepository.topJdkVersion();
-    }
-
-    @Get("/top/buildTools")
-    List<TotalDTO> topBuilds() {
-        return featureRepository.topBuildTools();
-    }
-
-    @Get("/top/gorm")
-    List<TotalDTO> topGorm() {
-        return featureRepository.topGorm();
-    }
-
-    @Get("/top/reloading")
-    List<TotalDTO> topReloading() {
-        return featureRepository.topReloading();
-    }
-
-    /**
-     * Report analytics.
-     * @param generated The generated data
-     * @return A future
-     */
-    @Post("/report")
-    @Transactional
-    @ExecuteOn(TaskExecutors.IO)
-    HttpStatus applicationGenerated(@NonNull @Body Generated generated) {
-        Application application = new Application(
-                generated.getType(),
-                generated.getGorm(),
-                generated.getReloading(),
-                generated.getJdkVersion(),
-                generated.getGrailsVersion()
-        );
-        Application saved = applicationRepository.save(application);
-        List<Feature> features = generated.getSelectedFeatures().stream()
-                .map(f -> new Feature(saved, f.getName()))
-                .collect(Collectors.toList());
-
-        featureRepository.saveAll(features);
-        return HttpStatus.ACCEPTED;
-    }
-}
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/Application.java b/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/Application.java
deleted file mode 100644
index 2e3fb86be7..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/Application.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.analytics.postgres;
-
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.data.annotation.*;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.options.DevelopmentReloading;
-import org.grails.forge.options.GormImpl;
-import org.grails.forge.options.JdkVersion;
-
-import jakarta.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.Objects;
-import java.util.Set;
-
-/**
- * Models a generated application.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@MappedEntity
-public class Application {
-    @Id
-    @GeneratedValue
-    private Long id;
-    @Relation(value = Relation.Kind.ONE_TO_MANY, mappedBy = "application")
-    private Set<Feature> features = Collections.emptySet();
-    private final ApplicationType type;
-    private final GormImpl gorm;
-    private final DevelopmentReloading reloading;
-    private final JdkVersion jdkVersion;
-    private final String grailsVersion;
-    @DateCreated
-    private LocalDateTime dateCreated;
-
-    @Creator
-    public Application(
-            @NonNull ApplicationType type,
-            @NonNull GormImpl gorm,
-            @NonNull DevelopmentReloading reloading,
-            @NonNull JdkVersion jdkVersion,
-            @NonNull @NotBlank String grailsVersion) {
-        this.type = Objects.requireNonNull(type, "Type cannot be null");
-        this.gorm = Objects.requireNonNull(gorm, "Gorm cannot be null");
-        this.reloading = Objects.requireNonNull(reloading, "Development Reloading cannot be null");
-        this.jdkVersion = Objects.requireNonNull(jdkVersion, "JDK version cannot be null");
-        this.grailsVersion = Objects.requireNonNull(grailsVersion, "Grails version cannot be null");
-    }
-
-    /**
-     * @return The type
-     */
-    public @NonNull ApplicationType getType() {
-        return type;
-    }
-
-    /**
-     * @return The GORM Implementation
-     */
-    public @NonNull GormImpl getGorm() {
-        return gorm;
-    }
-
-    /**
-     * @return The development reloading
-     */
-    public @NonNull DevelopmentReloading getDevelopmentReloading() {
-        return reloading;
-    }
-
-    /**
-     * @return The JDK version
-     */
-    public @NonNull JdkVersion getJdkVersion() {
-        return jdkVersion;
-    }
-
-    /**
-     * @return The id
-     */
-    public @Nullable Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * @return The features
-     */
-    public @NonNull Set<Feature> getFeatures() {
-        return features;
-    }
-
-    public void setFeatures(Set<Feature> features) {
-        if (features != null) {
-            this.features = features;
-        }
-    }
-
-    /**
-     * @return The date created
-     */
-    public LocalDateTime getDateCreated() {
-        return dateCreated;
-    }
-
-    public void setDateCreated(LocalDateTime dateCreated) {
-        this.dateCreated = dateCreated;
-    }
-
-    /**
-     * @return The Micronaut version
-     */
-    public @NonNull @NotBlank String getGrailsVersion() {
-        return grailsVersion;
-    }
-}
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/ApplicationRepository.java b/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/ApplicationRepository.java
deleted file mode 100644
index 38193cdfbe..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/ApplicationRepository.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.analytics.postgres;
-
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.data.annotation.Id;
-import io.micronaut.data.annotation.Join;
-import io.micronaut.data.jdbc.annotation.JdbcRepository;
-import io.micronaut.data.model.Pageable;
-import io.micronaut.data.model.query.builder.sql.Dialect;
-import io.micronaut.data.repository.PageableRepository;
-
-import java.util.List;
-
-/**
- * Repository for storing generated applications.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@JdbcRepository(dialect = Dialect.POSTGRES)
-public abstract class ApplicationRepository implements PageableRepository<Application, Long> {
-    /**
-     * List the applications with the features.
-     * @param pageable The pageable
-     * @return The application and the features
-     */
-    @Join("features")
-    public abstract List<Application> list(Pageable pageable);
-
-    public abstract void deleteById(@NonNull @Id Long id);
-
-    @Override
-    public void delete(@NonNull Application application) {
-        deleteById(application.getId());
-    }
-}
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/Feature.java b/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/Feature.java
deleted file mode 100644
index f92ad7df48..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/Feature.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.analytics.postgres;
-
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.data.annotation.GeneratedValue;
-import io.micronaut.data.annotation.Id;
-import io.micronaut.data.annotation.MappedEntity;
-import io.micronaut.data.annotation.Relation;
-
-import java.util.Objects;
-
-/**
- * Models a selected application feature.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@MappedEntity
-public class Feature {
-    @Id
-    @GeneratedValue
-    private Long id;
-    @Relation(value = Relation.Kind.MANY_TO_ONE)
-    private final Application application;
-    private final String name;
-
-    public Feature(
-            @NonNull Application application, @NonNull String name) {
-        this.application = Objects.requireNonNull(application, "Application cannot be null");
-        this.name = Objects.requireNonNull(name, "Feature cannot be null");
-    }
-
-    /**
-     * @return The application
-     */
-    public @NonNull Application getApplication() {
-        return application;
-    }
-
-    /**
-     * @return The feature name
-     */
-    public @NonNull String getName() {
-        return name;
-    }
-
-    /**
-     * The ID.
-     * @return The id
-     */
-    public @Nullable Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id The ID
-     */
-    public void setId(@Nullable Long id) {
-        this.id = id;
-    }
-}
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/FeatureRepository.java b/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/FeatureRepository.java
deleted file mode 100644
index c9b0f3a595..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/FeatureRepository.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.analytics.postgres;
-
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.data.annotation.Id;
-import io.micronaut.data.jdbc.annotation.JdbcRepository;
-import io.micronaut.data.jdbc.runtime.JdbcOperations;
-import io.micronaut.data.model.query.builder.sql.Dialect;
-import io.micronaut.data.repository.CrudRepository;
-import io.micronaut.transaction.annotation.ReadOnly;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-@JdbcRepository(dialect = Dialect.POSTGRES)
-public abstract class FeatureRepository implements CrudRepository<Feature, Long> {
-
-    private final JdbcOperations jdbcOperations;
-
-    public FeatureRepository(JdbcOperations jdbcOperations) {
-        this.jdbcOperations = jdbcOperations;
-    }
-
-    public abstract void deleteById(@NonNull @Id Long id);
-
-    @Override
-    public void delete(@NonNull Feature feature) {
-        deleteById(feature.getId());
-    }
-
-    @ReadOnly
-    List<TotalDTO> topFeatures() {
-        return this.jdbcOperations
-                .prepareStatement(query("name", "feature"),
-                        statement -> {
-            try (ResultSet resultSet = statement.executeQuery()) {
-                return resultSetToTotals(resultSet);
-            }
-        });
-    }
-
-    @ReadOnly
-    List<TotalDTO> topGorm() {
-        return this.jdbcOperations
-                .prepareStatement(query("gorm", "application"),
-                        statement -> {
-                            try (ResultSet resultSet = statement.executeQuery()) {
-                                return resultSetToTotals(resultSet);
-                            }
-                        });
-    }
-
-    @ReadOnly
-    List<TotalDTO> topBuildTools() {
-        return this.jdbcOperations
-                .prepareStatement(query("build_tool", "application"),
-                        statement -> {
-                            try (ResultSet resultSet = statement.executeQuery()) {
-                                return resultSetToTotals(resultSet);
-                            }
-                        });
-    }
-
-    @ReadOnly
-    List<TotalDTO> topReloading() {
-        return this.jdbcOperations
-                .prepareStatement(query("reloading", "application"),
-                        statement -> {
-                            try (ResultSet resultSet = statement.executeQuery()) {
-                                return resultSetToTotals(resultSet);
-                            }
-                        });
-    }
-
-    @ReadOnly
-    List<TotalDTO> topJdkVersion() {
-        return this.jdbcOperations
-                .prepareStatement(query("jdk_version", "application"),
-                        statement -> {
-                            try (ResultSet resultSet = statement.executeQuery()) {
-                                return resultSetToTotals(resultSet);
-                            }
-                        });
-    }
-
-    private List<TotalDTO> resultSetToTotals(ResultSet resultSet) throws SQLException {
-        List<TotalDTO> results = new ArrayList<>(40);
-        while (resultSet.next()) {
-            results.add(
-                    new TotalDTO(
-                        resultSet.getString("name"),
-                        resultSet.getLong("total")
-                    )
-            );
-        }
-        return results;
-    }
-
-    private String query(String name, String table) {
-        return "SELECT " + name + " AS name, count(*) AS total FROM " + table + " GROUP BY name ORDER BY total";
-    }
-}
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/Main.java b/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/Main.java
deleted file mode 100644
index 4f800133c8..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/Main.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.analytics.postgres;
-
-import io.micronaut.context.ApplicationContextBuilder;
-import io.micronaut.context.ApplicationContextConfigurer;
-import io.micronaut.context.annotation.ContextConfigurer;
-import io.micronaut.context.env.Environment;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.runtime.Micronaut;
-import io.netty.util.internal.MacAddressUtil;
-import io.netty.util.internal.PlatformDependent;
-
-public class Main {
-
-    static {
-        byte[] bestMacAddr = new byte[8];
-        PlatformDependent.threadLocalRandom().nextBytes(bestMacAddr);
-        System.setProperty("io.netty.machineId", MacAddressUtil.formatAddress(bestMacAddr));
-    }
-
-    public static void main(String... args) {
-        Micronaut.run(args);
-    }
-
-    @ContextConfigurer
-    public static class DefaultEnvironmentConfigurer implements ApplicationContextConfigurer {
-        @Override
-        public void configure(@NonNull ApplicationContextBuilder builder) {
-            builder.defaultEnvironments(Environment.DEVELOPMENT);
-        }
-    }
-}
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/gcp/GoogleCloudSqlSetup.java b/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/gcp/GoogleCloudSqlSetup.java
deleted file mode 100644
index 9a952343b7..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/java/org/grails/forge/analytics/postgres/gcp/GoogleCloudSqlSetup.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.analytics.postgres.gcp;
-
-import io.micronaut.configuration.jdbc.hikari.DatasourceConfiguration;
-import io.micronaut.context.annotation.Property;
-import io.micronaut.context.annotation.Requires;
-import io.micronaut.context.env.Environment;
-import io.micronaut.context.event.BeanCreatedEvent;
-import io.micronaut.context.event.BeanCreatedEventListener;
-
-import jakarta.inject.Singleton;
-
-/**
- * Configuration for the Cloud SQL environment.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Singleton
-@Requires(env = Environment.GOOGLE_COMPUTE)
-@Requires(property = GoogleCloudSqlSetup.CLOUD_SQL_CONNECTION_NAME)
-public class GoogleCloudSqlSetup implements BeanCreatedEventListener<DatasourceConfiguration> {
-    public static final String CLOUD_SQL_CONNECTION_NAME = "cloud.sql.connection.name";
-    private static final String DB_NAME = System.getenv("DB_NAME");
-    private final String cloudSqlInstance;
-
-    public GoogleCloudSqlSetup(@Property(name = CLOUD_SQL_CONNECTION_NAME) String cloudSqlInstance) {
-        this.cloudSqlInstance = cloudSqlInstance;
-    }
-
-    @Override
-    public DatasourceConfiguration onCreated(BeanCreatedEvent<DatasourceConfiguration> event) {
-        DatasourceConfiguration config = event.getBean();
-        if (DB_NAME != null) {
-            config.setJdbcUrl(String.format("jdbc:postgresql:///%s", DB_NAME));
-        }
-        config.addDataSourceProperty("socketFactory", "com.google.cloud.sql.postgres.SocketFactory");
-        config.addDataSourceProperty("cloudSqlInstance", cloudSqlInstance);
-        return config;
-    }
-}
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/resources/META-INF/native-image/io.micronaut.starter/micronaut-starter-analytics-postgres/native-image.properties b/grails-forge/grails-forge-analytics-postgres/src/main/resources/META-INF/native-image/io.micronaut.starter/micronaut-starter-analytics-postgres/native-image.properties
deleted file mode 100644
index 6f8377079f..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/resources/META-INF/native-image/io.micronaut.starter/micronaut-starter-analytics-postgres/native-image.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# https://www.graalvm.org/latest/docs/reference-manual/native-image/optimizations-and-performance/ClassInitialization/
-#
-# Forcing org.postgresql.Driver to initialize at build time also caused
-# java.sql.DriverManager.<clinit> to run at build time, conflicting with
-# the runtime registration of DriverManager performed by Micronaut SQL
-# and producing "java.sql.DriverManager was unintentionally initialized
-# at build time" failures during dockerBuildNative.
-#
-# PostgreSQL 42.7.5 (and the rest of the 42.7.x line) is officially
-# covered by the GraalVM Reachability Metadata Repository
-# (oracle/graalvm-reachability-metadata, metadata-version 42.7.3, tested
-# through 42.7.11), and Micronaut's micronaut-jdbc artefact already
-# ships --add-modules=java.sql.rowset, so we no longer need to set any
-# class-initialization flags for the postgres driver here - the default
-# (run-time initialization) is correct.
-#
-# The Micronaut Gradle Application Plugin 4.6.2 transitively pulls the
-# GraalVM Reachability Metadata Repository entry for ch.qos.logback at
-# metadata-version 1.4.9, whose --initialize-at-build-time directive
-# does not match the additional classes introduced in logback 1.5.x.
-# Because this analytics service uses logback-classic 1.5.17 and slf4j
-# 2.0.17 at runtime, override the bundled build-time initialization for
-# those packages so they initialize at run time instead.
-Args = --initialize-at-run-time=ch.qos.logback,org.slf4j
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/resources/application-dev.yml b/grails-forge/grails-forge-analytics-postgres/src/main/resources/application-dev.yml
deleted file mode 100644
index 9ce68a0541..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# docker run -it --rm -p 5432:5432 -e POSTGRES_USER=dbuser -e POSTGRES_PASSWORD=theSecretPassword -e POSTGRES_DB=postgres postgres:15.3
-micronaut:
-  server:
-    port: 8081
-datasources:
-  default:
-    url: 'jdbc:postgresql://localhost/postgres'
-    username: 'dbuser'
-    password: 'theSecretPassword'
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/resources/application.yml b/grails-forge/grails-forge-analytics-postgres/src/main/resources/application.yml
deleted file mode 100644
index 5065d27cfa..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/resources/application.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-datasources:
-  default:
-    # Define the following for local development
-    #url: 'jdbc:postgresql://localhost/cli-analytics'
-    #username: 'postgres'
-    #password: 'secret'
-    driver-class-name: org.postgresql.Driver
-    dialect: POSTGRES
----
-flyway:
-  enabled: enabled
-  datasources:
-    default:
-      locations: classpath:databasemigrations
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/resources/databasemigrations/V1__schema.sql b/grails-forge/grails-forge-analytics-postgres/src/main/resources/databasemigrations/V1__schema.sql
deleted file mode 100644
index 8e528e1b87..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/resources/databasemigrations/V1__schema.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-DROP TABLE IF EXISTS feature;
-DROP TABLE IF EXISTS application;
-
-create table feature
-(
-    id bigint generated always as identity,
-    application_id bigint not null,
-    name varchar(255) not null
-);
-
-create table application
-(
-    id bigint generated always as identity,
-    type varchar(255) not null,
-    gorm varchar(255) not null,
-    build_tool varchar(255) not null,
-    test_framework varchar(255) not null,
-    jdk_version varchar(255) not null,
-    grails_version varchar(255) not null,
-    date_created timestamp not null
-);
diff --git a/grails-forge/grails-forge-analytics-postgres/src/main/resources/logback.xml b/grails-forge/grails-forge-analytics-postgres/src/main/resources/logback.xml
deleted file mode 100644
index e6b09317e6..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/main/resources/logback.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-            <pattern>%cyan(%d{HH:mm:ss.SSS}) %gray([%thread]) %highlight(%-5level) %magenta(%logger{36}) - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-</configuration>
diff --git a/grails-forge/grails-forge-analytics-postgres/src/test/groovy/org/grails/forge/analytics/postgres/StoreGeneratedProjectStatsSpec.groovy b/grails-forge/grails-forge-analytics-postgres/src/test/groovy/org/grails/forge/analytics/postgres/StoreGeneratedProjectStatsSpec.groovy
deleted file mode 100644
index 517a6edd34..0000000000
--- a/grails-forge/grails-forge-analytics-postgres/src/test/groovy/org/grails/forge/analytics/postgres/StoreGeneratedProjectStatsSpec.groovy
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.analytics.postgres
-
-import io.micronaut.context.env.Environment
-import io.micronaut.core.annotation.NonNull
-import io.micronaut.data.model.Pageable
-import io.micronaut.data.model.query.builder.sql.Dialect
-import io.micronaut.http.HttpStatus
-import io.micronaut.http.annotation.Body
-import io.micronaut.http.annotation.Post
-import io.micronaut.http.client.annotation.Client
-import org.grails.forge.analytics.Generated
-import org.grails.forge.analytics.SelectedFeature
-import org.grails.forge.application.ApplicationType
-import org.grails.forge.options.DevelopmentReloading
-import org.grails.forge.options.JdkVersion
-import org.grails.forge.options.GormImpl
-import org.grails.forge.options.ServletImpl
-import org.grails.forge.util.VersionInfo
-import io.micronaut.test.extensions.spock.annotation.MicronautTest
-import io.micronaut.test.support.TestPropertyProvider
-import org.testcontainers.containers.PostgreSQLContainer
-import spock.lang.AutoCleanup
-import spock.lang.Shared
-import spock.lang.Specification
-
-import jakarta.inject.Inject
-import java.util.concurrent.CompletableFuture
-
-@MicronautTest(
-        transactional = false,
-        environments = Environment.GOOGLE_COMPUTE)
-class StoreGeneratedProjectStatsSpec extends Specification implements TestPropertyProvider {
-
-    @Shared @AutoCleanup PostgreSQLContainer postgres = new PostgreSQLContainer<>("postgres:10")
-            .withDatabaseName("test-database")
-            .withUsername("test")
-            .withPassword("test")
-
-    @Override
-    Map<String, String> getProperties() {
-        postgres.start()
-
-        ["datasources.default.url":postgres.getJdbcUrl(),
-         "datasources.default.username":postgres.getUsername(),
-         "datasources.default.password":postgres.getPassword(),
-         "datasources.default.dialect": Dialect.POSTGRES.name()]
-    }
-
-    @Inject AnalyticsClient client
-    @Inject ApplicationRepository repository
-    @Inject FeatureRepository featureRepository
-
-    void "test save generation data"() {
-        given:
-        def generated = new Generated(
-                ApplicationType.WEB,
-                GormImpl.HIBERNATE5,
-                ServletImpl.TOMCAT,
-                DevelopmentReloading.DEVTOOLS,
-                JdkVersion.DEFAULT_OPTION
-        )
-        generated.setSelectedFeatures([new SelectedFeature("google-cloud-function")])
-
-        when:
-        HttpStatus status = client.applicationGenerated(generated).get()
-
-        then:
-        status == HttpStatus.ACCEPTED
-
-        when:
-        def application = repository.list(Pageable.UNPAGED)[0]
-
-        then:
-        application.type == generated.type
-        application.gorm == generated.gorm
-        application.jdkVersion == generated.jdkVersion
-        application.reloading == generated.reloading
-        application.features.find { it.name == 'google-cloud-function' }
-        application.grailsVersion == VersionInfo.grailsVersion
-        application.dateCreated
-
-        when:
-        def topFeatures = featureRepository.topFeatures()
-
-        then:
-        !topFeatures.isEmpty()
-        topFeatures[0].name == 'google-cloud-function'
-        topFeatures[0].total == 1
-
-        when:
-        def gorm = featureRepository.topGorm()
-
-        then:
-        gorm
-        gorm[0].name == 'HIBERNATE'
-        featureRepository.topBuildTools()
-        featureRepository.topJdkVersion()
-        featureRepository.topReloading()
-    }
-
-    @Client("/analytics")
-    static interface AnalyticsClient {
-        @Post("/report")
-        CompletableFuture<HttpStatus> applicationGenerated(@NonNull @Body Generated generated);
-    }
-}
diff --git a/grails-forge/grails-forge-api/build.gradle b/grails-forge/grails-forge-api/build.gradle
deleted file mode 100644
index ca318cb0a9..0000000000
--- a/grails-forge/grails-forge-api/build.gradle
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  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.
- */
-
-plugins {
-    id 'groovy'
-    id 'java-library'
-    id 'org.apache.grails.buildsrc.properties'
-    id 'org.apache.grails.buildsrc.dependency-validator'
-    id 'org.apache.grails.buildsrc.compile'
-}
-
-version = projectVersion
-group = 'org.apache.grails.forge'
-
-dependencies {
-    annotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
-    implementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
-    annotationProcessor 'io.micronaut:micronaut-inject-java'
-    annotationProcessor 'io.micronaut.validation:micronaut-validation-processor'
-    testAnnotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
-    testAnnotationProcessor 'io.micronaut:micronaut-inject-java'
-
-    annotationProcessor 'com.google.code.findbugs:jsr305'
-    annotationProcessor "io.micronaut.docs:micronaut-docs-asciidoc-config-props:$micronautDocsVersion"
-    annotationProcessor 'io.micronaut.openapi:micronaut-openapi'
-
-    api platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
-
-    api project(':grails-forge-core'), {
-        exclude group:'org.slf4j', module:'slf4j-nop'
-    }
-    api 'io.micronaut:micronaut-http'
-    api 'io.micronaut:micronaut-http-client'
-    api 'io.micronaut:micronaut-inject'
-    api 'io.micronaut:micronaut-runtime'
-    api 'io.micronaut.validation:micronaut-validation'
-    api 'jakarta.inject:jakarta.inject-api'
-
-    implementation 'io.swagger.core.v3:swagger-annotations'
-    implementation 'io.projectreactor:reactor-core'
-
-    testImplementation "ch.qos.logback:logback-classic"
-    testImplementation 'io.micronaut:micronaut-http-client'
-    testImplementation 'io.micronaut:micronaut-http-server-netty'
-    testImplementation 'io.micronaut.test:micronaut-test-spock'
-    testRuntimeOnly 'io.micronaut:micronaut-jackson-databind'
-
-    testCompileOnly 'io.micronaut:micronaut-inject-groovy'
-
-    testImplementation 'org.apache.groovy:groovy'
-    testImplementation "org.spockframework:spock-core", {
-        exclude group: 'org.apache.groovy', module: 'groovy-all'
-    }
-
-    testRuntimeOnly "ch.qos.logback:logback-classic"
-    testRuntimeOnly "org.objenesis:objenesis:$objenesisVersion"
-    testImplementation 'org.apache.groovy:groovy-test'
-}
-
-apply {
-    from rootProject.layout.projectDirectory.file('gradle/groovy-version-pin.gradle')
-    from rootProject.layout.projectDirectory.file('gradle/code-style-config.gradle')
-    from rootProject.layout.projectDirectory.file('gradle/micronaut-openapi-config.gradle')
-    from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
-    from rootProject.layout.projectDirectory.file('gradle/doc-config.gradle')
-}
-
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ApplicationController.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ApplicationController.java
deleted file mode 100644
index c3182db1e4..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ApplicationController.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.context.MessageSource;
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.core.io.Writable;
-import io.micronaut.http.HttpRequest;
-import io.micronaut.http.HttpResponse;
-import io.micronaut.http.MediaType;
-import io.micronaut.http.annotation.Controller;
-import io.micronaut.http.annotation.Get;
-import io.micronaut.http.annotation.Produces;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.application.OperatingSystem;
-import org.grails.forge.options.*;
-import org.grails.forge.template.RockerWritable;
-import org.grails.forge.template.api.grailsForgeApi;
-import org.grails.forge.util.VersionInfo;
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.info.Info;
-import io.swagger.v3.oas.annotations.info.License;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-
-import java.io.OutputStream;
-import java.io.Writer;
-import java.net.URI;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Main interface on the Grails Application Forge API.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@OpenAPIDefinition(
-        info = @Info(
-                title = "Grails Forge",
-                version = "${api.version}",
-                description = "API for Creating Grails Applications",
-                license = @License(name = "Apache 2.0")
-        )
-)
-@Controller
-public class ApplicationController implements ApplicationTypeOperations {
-
-    private final FeatureOperations featureOperations;
-    private final GrailsForgeConfiguration configuration;
-    private final MessageSource messageSource;
-
-    /**
-     * Default constructor.
-     * @param featureOperations The feature operations.
-     * @param configuration The Grails Application Forge configuration
-     * @param messageSource The message source
-     */
-    public ApplicationController(FeatureOperations featureOperations, GrailsForgeConfiguration configuration, MessageSource messageSource) {
-        this.featureOperations = featureOperations;
-        this.configuration = configuration;
-        this.messageSource = messageSource;
-    }
-
-    /**
-     * Information about this instance.
-     * @return Information about this instance.
-     */
-    @Get("/versions")
-    VersionDTO getInfo(@Parameter(hidden = true) RequestInfo info) {
-        return new VersionDTO()
-                 .addLink(Relationship.SELF, info.self());
-    }
-
-    /**
-     * Provides a description of the API.
-     * @param request The request
-     * @return A description of the API.
-     */
-    @Get
-    @Produces(MediaType.TEXT_PLAIN)
-    @ApiResponse(
-            responseCode = "200",
-            description = "A textual description of the API",
-            content = @Content(mediaType = MediaType.TEXT_PLAIN)
-    )
-    HttpResponse<Writable> home(HttpRequest<?> request, @Parameter(hidden = true) RequestInfo info) {
-        Collection<MediaType> accept = request.accept();
-        URI redirectURI = configuration.getRedirectUri().orElse(null);
-        if (accept.contains(MediaType.TEXT_HTML_TYPE) && redirectURI != null) {
-            return HttpResponse.permanentRedirect(redirectURI);
-        } else {
-            return HttpResponse.ok(new Writable() {
-
-                @Override
-                public void writeTo(Writer out) {
-                    // no-op
-                }
-
-                @Override
-                public void writeTo(OutputStream outputStream, @Nullable Charset charset) {
-                    new RockerWritable(new grailsForgeApi()
-                            .serverURL(info.getServerURL())
-                            .grailsVersion(VersionInfo.getGrailsVersion()))
-                            .write(outputStream);
-                }
-            });
-        }
-    }
-
-    /**
-     * List the application types.
-     * @param info the request info
-     * @return The types
-     */
-    @Override
-    @Get("/application-types")
-    public ApplicationTypeList list(RequestInfo info) {
-        List<ApplicationTypeDTO> types = Arrays.stream(ApplicationType.values())
-                .map(type -> typeToDTO(type, info, false))
-                .collect(Collectors.toList());
-        ApplicationTypeList applicationTypeList = new ApplicationTypeList(types);
-        applicationTypeList.addLink(
-                Relationship.SELF,
-                info.self()
-        );
-        return applicationTypeList;
-    }
-
-    /**
-     * Get a specific application type.
-     * @param type The type
-     * @param info The request info
-     * @return The type
-     */
-    @Override
-    @Get("/application-types/{type}")
-    public ApplicationTypeDTO getType(ApplicationType type, RequestInfo info) {
-        return typeToDTO(type, info, true);
-    }
-
-    /**
-     * List the type features.
-     * @param type The features
-     * @param requestInfo The request info
-     * @param filter features to filter by
-     * @return The features
-     */
-    @Override
-    @Get("/application-types/{type}/features{?filter*}")
-    public FeatureList features(ApplicationType type,
-                                RequestInfo requestInfo,
-                                @Nullable FeatureFilter filter) {
-        List<FeatureDTO> featureDTOList = featureOperations
-                .getFeatures(requestInfo.getLocale(), type, getOptions(filter, requestInfo));
-
-        final FeatureList featureList = new FeatureList(featureDTOList);
-        featureList.addLink(
-                Relationship.SELF,
-                requestInfo.self()
-        );
-        return featureList;
-    }
-
-    @Override
-    @Get("/application-types/{type}/features/default{?filter*}")
-    public FeatureList defaultFeatures(ApplicationType type,
-                                       RequestInfo requestInfo,
-                                       @Nullable FeatureFilter filter) {
-        List<FeatureDTO> featureDTOList = featureOperations.getDefaultFeatures(requestInfo.getLocale(), type, getOptions(filter, requestInfo));
-
-        final FeatureList featureList = new FeatureList(featureDTOList);
-        featureList.addLink(
-                Relationship.SELF,
-                requestInfo.self()
-        );
-        return featureList;
-    }
-
-    private ApplicationTypeDTO typeToDTO(ApplicationType type, RequestInfo requestInfo, boolean includeFeatures) {
-        List<FeatureDTO> features = includeFeatures ? featureOperations.getFeatures(requestInfo.getLocale(), type) : Collections.emptyList();
-        features.forEach(featureDTO -> featureDTO.addLink(
-                Relationship.DIFF,
-                requestInfo.link("/diff/" + type.getName() + "/feature/" + featureDTO.getName())
-        ));
-        ApplicationTypeDTO dto = new ApplicationTypeDTO(
-                type, features, messageSource, MessageSource.MessageContext.of(requestInfo.getLocale())
-        );
-        dto.addLink(
-                Relationship.CREATE,
-                requestInfo.link(Relationship.CREATE, type)
-        );
-        dto.addLink(
-                Relationship.PREVIEW,
-                requestInfo.link(Relationship.PREVIEW, type)
-        );
-        dto.addLink(
-                Relationship.SELF,
-                requestInfo.link(type)
-        );
-        return dto;
-    }
-
-    protected OperatingSystem getOperatingSystem(String userAgent) {
-        return UserAgentParser.getOperatingSystem(userAgent);
-    }
-
-    protected Options getOptions(@Nullable FeatureFilter filter, RequestInfo requestInfo) {
-        if (filter == null) {
-            return new Options(null, GormImpl.DEFAULT_OPTION, ServletImpl.DEFAULT_OPTION, JdkVersion.DEFAULT_OPTION, getOperatingSystem(requestInfo.getUserAgent()));
-        }
-
-        return new Options(filter.getReloading() != null ? filter.getReloading().toDevelopmentReloading() : null,
-                filter.getGorm() == null ? GormImpl.DEFAULT_OPTION : filter.getGorm(),
-                filter.getServlet() == null ? ServletImpl.DEFAULT_OPTION : filter.getServlet(),
-                filter.getJavaVersion() == null ? JdkVersion.DEFAULT_OPTION : filter.getJavaVersion(),
-                getOperatingSystem(requestInfo.getUserAgent()));
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ApplicationTypeDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ApplicationTypeDTO.java
deleted file mode 100644
index 91a4042e4a..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ApplicationTypeDTO.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.context.MessageSource;
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.Introspected;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.naming.Described;
-import io.micronaut.core.naming.Named;
-import org.grails.forge.application.ApplicationType;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.List;
-
-/**
- * DTO objects for {@link ApplicationType}.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Schema(name = "ApplicationTypeInfo")
-@Introspected
-public class ApplicationTypeDTO extends Linkable implements Named, Described, Selectable<ApplicationType> {
-
-    static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".application-types.";
-    private final String name;
-    private final List<FeatureDTO> features;
-    private final String title;
-    private final String description;
-    private final ApplicationType value;
-
-    /**
-     * @param type The type
-     * @param features The available features
-     */
-    public ApplicationTypeDTO(ApplicationType type, List<FeatureDTO> features) {
-        this.value = type;
-        this.name = type.getName();
-        this.features = features;
-        this.title = type.getTitle();
-        this.description = type.getDescription();
-    }
-
-    /**
-     * @param name the name
-     * @param features The available features
-     */
-    @Creator
-    @Internal
-    ApplicationTypeDTO(ApplicationType value,
-                       String name,
-                       String title,
-                       String description,
-                       List<FeatureDTO> features) {
-        this.value = value;
-        this.name = name;
-        this.features = features;
-        this.title = title;
-        this.description = description;
-    }
-
-    /**
-     * i18n constructor.
-     * @param type The type
-     * @param features The features
-     * @param messageSource The message source
-     * @param messageContext The message context
-     */
-    @Internal
-    ApplicationTypeDTO(ApplicationType type, List<FeatureDTO> features, MessageSource messageSource, MessageSource.MessageContext messageContext) {
-        this.value = type;
-        String name = type.getName();
-        this.name = name;
-        this.features = features;
-        this.title = messageSource.getMessage(MESSAGE_PREFIX + name + ".title", messageContext, type.getTitle());
-        this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, type.getDescription());
-    }
-
-    @Schema(description = "The title of the application type")
-    public String getTitle() {
-        return title;
-    }
-
-    @Schema(description = "The possible application features")
-    public List<FeatureDTO> getFeatures() {
-        return features;
-    }
-
-    @Schema(description = "A description of the application type")
-    public String getDescription() {
-        return description;
-    }
-
-    @Schema(description = "The name of the application type")
-    @NonNull
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    @Schema(description = "The value of the application type for select options")
-    public ApplicationType getValue() {
-        return value;
-    }
-
-    @Override
-    @Schema(description = "The label of the application type for select options")
-    public String getLabel() {
-        return title;
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ApplicationTypeOperations.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ApplicationTypeOperations.java
deleted file mode 100644
index e05f853c13..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ApplicationTypeOperations.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.http.annotation.Get;
-import io.swagger.v3.oas.annotations.Parameter;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.options.FeatureFilter;
-
-/**
- * Operations on application types.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-public interface ApplicationTypeOperations {
-
-    /**
-     * List the application types.
-     * @param serverURL The server URL
-     * @return The types
-     */
-    @Get("/application-types")
-    ApplicationTypeList list(@Parameter(hidden = true) RequestInfo serverURL);
-
-    /**
-     * Get a specific application type.
-     * @param type The type
-     * @param serverURL The server URL
-     * @return The type
-     */
-    @Get("/application-types/{type}")
-    ApplicationTypeDTO getType(ApplicationType type, @Parameter(hidden = true) RequestInfo serverURL);
-
-    /**
-     * List the type features.
-     * @param type The features
-     * @param serverURL The server URL
-     * @param filter features to filter by
-     * @return The features
-     */
-    @Get("/application-types/{type}/features{?filter*}")
-    FeatureList features(ApplicationType type,
-                         @Parameter(hidden = true) RequestInfo serverURL,
-                         @Nullable FeatureFilter filter);
-
-    /**
-     * List the default features.
-     * @param type The features
-     * @param serverURL The server URL
-     * @param filter features to filter by
-     * @return The features
-     */
-    @Get("/application-types/{type}/features/default{?filter*}")
-    FeatureList defaultFeatures(ApplicationType type,
-                                @Parameter(hidden = true) RequestInfo serverURL,
-                                @Nullable FeatureFilter filter);
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloading.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloading.java
deleted file mode 100644
index 120d98631c..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloading.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.core.annotation.NonNull;
-
-import java.util.Locale;
-
-public enum DevelopmentReloading {
-    DEVTOOLS,
-    JREBEL,
-    NONE;
-
-    static final DevelopmentReloading DEFAULT_OPTION = DEVTOOLS;
-
-    @Override
-    public String toString() {
-        return this.name().toLowerCase();
-    }
-
-    @NonNull
-    public String getName() {
-        return name().toLowerCase(Locale.ENGLISH);
-    }
-
-    public org.grails.forge.options.DevelopmentReloading toDevelopmentReloading() {
-        return switch (this) {
-            case DEVTOOLS -> org.grails.forge.options.DevelopmentReloading.DEVTOOLS;
-            case JREBEL -> org.grails.forge.options.DevelopmentReloading.JREBEL;
-            default -> org.grails.forge.options.DevelopmentReloading.NONE;
-        };
-    }
-
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java
deleted file mode 100644
index 412bab03f1..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.context.MessageSource;
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.Introspected;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.naming.Described;
-import io.micronaut.core.naming.Named;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.grails.forge.options.DevelopmentReloading;
-import org.grails.forge.util.NameUtils;
-
-/**
- * DTO objects for {@link DevelopmentReloading}.
- */
-@Schema(name = "DevelopmentReloadingInfo")
-@Introspected
-public class DevelopmentReloadingDTO extends Linkable implements Named, Described, Selectable<DevelopmentReloading> {
-    static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".developmentReloading.";
-    private final String name;
-    private final String description;
-    private final DevelopmentReloading value;
-
-    /**
-     * @param developmentReloading The developmentReloading
-     */
-    public DevelopmentReloadingDTO(DevelopmentReloading developmentReloading) {
-        this.value = developmentReloading;
-        this.name = developmentReloading.toString();
-        this.description = developmentReloading.name();
-    }
-
-    /**
-     * @param name the name
-     * @param description The description
-     */
-    @Creator
-    @Internal
-    DevelopmentReloadingDTO(DevelopmentReloading value, String name, String description) {
-        this.value = value;
-        this.name = name;
-        this.description = description;
-    }
-
-    /**
-     * i18n constructor.
-     * @param developmentReloading The type
-     * @param messageSource The message source
-     * @param messageContext The message context
-     */
-    @Internal
-    DevelopmentReloadingDTO(DevelopmentReloading developmentReloading, MessageSource messageSource, MessageSource.MessageContext messageContext) {
-        this.value = developmentReloading;
-        this.name = developmentReloading.toString();
-        this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, NameUtils.getNaturalNameOfEnum(name));
-    }
-
-    @NonNull
-    @Override
-    @Schema(description = "A description of the developmentReloading")
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    @Schema(description = "The name of the developmentReloading")
-    @NonNull
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    @Schema(description = "The value of the developmentReloading for select options")
-    @NonNull
-    public DevelopmentReloading getValue() {
-        return value;
-    }
-
-    @Override
-    @Schema(description = "The label of the developmentReloading for select options")
-    public String getLabel() {
-        return value.getLabel();
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/FeatureDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/FeatureDTO.java
deleted file mode 100644
index 0f3a86b958..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/FeatureDTO.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.context.MessageSource;
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.Introspected;
-import io.micronaut.core.naming.Described;
-import io.micronaut.core.naming.Named;
-import java.util.Collections;
-import java.util.List;
-
-import org.grails.forge.feature.Feature;
-import org.grails.forge.feature.OneOfFeature;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Represents an application feature.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Introspected
-@Schema(name = "Feature")
-public class FeatureDTO extends Linkable implements Named, Described {
-
-    static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".features.";
-
-    private final String name;
-    private final String title;
-    private final String description;
-    private final String category;
-    private final boolean preview;
-    private final boolean community;
-    private final List<String> dependentFeatures;
-    private final String oneOfGroup;
-
-    /**
-     * Default constructor.
-     * @param feature The feature
-     * @param messageSource The message source
-     * @param messageContext The messageContext
-     */
-    public FeatureDTO(Feature feature, MessageSource messageSource, MessageSource.MessageContext messageContext) {
-        this.name = feature.getName();
-        this.title = messageSource.getMessage(MESSAGE_PREFIX + this.name + ".title", messageContext, feature.getTitle());
-        this.description = messageSource.getMessage(MESSAGE_PREFIX + this.name + ".description", messageContext, feature.getDescription());
-        this.category = feature.getCategory();
-        this.preview = feature.isPreview();
-        this.community = feature.isCommunity();
-        this.dependentFeatures = feature.getDependentFeatures();
-        this.oneOfGroup = feature instanceof OneOfFeature ? ((OneOfFeature) feature).getFeatureClass().getSimpleName() : null;
-    }
-
-    /**
-     * Default constructor.
-     * @param name The name
-     * @param title The title
-     * @param description The description
-     * @param category The category
-     */
-    @Creator
-    public FeatureDTO(String name, String title, String description, String category) {
-        this.name = name;
-        this.title = title;
-        this.description = description;
-        this.category = category;
-        this.preview = false;
-        this.community = false;
-        this.dependentFeatures = Collections.emptyList();
-        this.oneOfGroup = null;
-    }
-
-    /**
-     * @return The name of the feature
-     */
-    @Schema(description = "The name of the feature")
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @return The title of the feature
-     */
-    @Schema(description = "The title of the feature")
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * @return The description of the feature
-     */
-    @Schema(description = "A description of the feature")
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * @return The category to which this feature belongs to
-     */
-    @Schema(description = "The category to which this feature belongs to")
-    public String getCategory() {
-        return category;
-    }
-
-    /**
-     * @return the names of features added automatically when this feature is selected
-     */
-    @Schema(description = "The names of features added automatically when this feature is selected")
-    public List<String> getDependentFeatures() {
-        return dependentFeatures;
-    }
-
-    /**
-     * @return the mutual-exclusion group this feature belongs to, if any
-     */
-    @Schema(description = "Features sharing a oneOfGroup are mutually exclusive; at most one can be selected")
-    public String getOneOfGroup() {
-        return oneOfGroup;
-    }
-
-    /**
-     * @return Is the feature a preview status feature
-     */
-    @Schema(description = "Indicates whether the feature is a preview feature and subject to change")
-    public boolean isPreview() {
-        return preview;
-    }
-
-    /**
-     * @return Is the feature a community contributed feature.
-     */
-    @Schema(description = "Indicates whether the feature is a community contributed feature")
-    public boolean isCommunity() {
-        return community;
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/FeatureService.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/FeatureService.java
deleted file mode 100644
index 69beabf3a5..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/FeatureService.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.context.BeanLocator;
-import io.micronaut.context.MessageSource;
-import io.micronaut.inject.qualifiers.Qualifiers;
-import jakarta.inject.Singleton;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.feature.AvailableFeatures;
-import org.grails.forge.feature.DefaultFeature;
-import org.grails.forge.feature.Feature;
-import org.grails.forge.options.Options;
-
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.stream.Collectors;
-
-/**
- * Implements the {@link FeatureOperations} interface.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Singleton
-public class FeatureService implements FeatureOperations {
-
-    private final List<Feature> features;
-    private final BeanLocator beanLocator;
-    private final MessageSource messageSource;
-
-    /**
-     * Default constructor.
-     *
-     * @param features      The features
-     * @param beanLocator   The bean locator
-     * @param messageSource The {@link MessageSource} to support internationalization
-     */
-    public FeatureService(List<Feature> features, BeanLocator beanLocator, MessageSource messageSource) {
-        this.features = features;
-        this.beanLocator = beanLocator;
-        this.messageSource = messageSource;
-    }
-
-    @Override
-    public List<FeatureDTO> getAllFeatures(Locale locale) {
-        MessageSource.MessageContext context = MessageSource.MessageContext.of(locale);
-        return features.stream()
-                .filter(Feature::isVisible)
-                .map(feature -> new FeatureDTO(feature, messageSource, context))
-                .sorted(Comparator.comparing(FeatureDTO::getName))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public List<FeatureDTO> getFeatures(Locale locale, ApplicationType type, Options options) {
-        MessageSource.MessageContext context = MessageSource.MessageContext.of(locale);
-        return beanLocator.getBean(AvailableFeatures.class, Qualifiers.byName(type.getName()))
-                .getFeatures()
-                .filter(f -> !shouldApplyDefaultFeature(type, f, options))
-                .map(feature -> new FeatureDTO(feature, messageSource, context))
-                .sorted(Comparator.comparing(FeatureDTO::getName))
-                .collect(Collectors.toList());
-    }
-
-    private static boolean shouldApplyDefaultFeature(ApplicationType type, Feature f, Options options) {
-        return f instanceof DefaultFeature &&
-                ((DefaultFeature) f).shouldApply(type, options, new HashSet<>());
-    }
-
-    @Override
-    public List<FeatureDTO> getDefaultFeatures(Locale locale, ApplicationType type, Options options) {
-        MessageSource.MessageContext context = MessageSource.MessageContext.of(locale);
-        return beanLocator.getBean(AvailableFeatures.class, Qualifiers.byName(type.getName()))
-                .getFeatures()
-                .filter(f -> f instanceof DefaultFeature)
-                .map(DefaultFeature.class::cast)
-                .filter(f -> f.shouldApply(
-                        type,
-                        options,
-                        new HashSet<>()))
-                .map(feature -> new FeatureDTO(feature, messageSource, context))
-                .sorted(Comparator.comparing(FeatureDTO::getName))
-                .collect(Collectors.toList());
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java
deleted file mode 100644
index 7cfd1c299c..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.context.MessageSource;
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.Introspected;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.naming.Described;
-import io.micronaut.core.naming.Named;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.grails.forge.options.GormImpl;
-
-/**
- * DTO objects for {@link GormImpl}.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Schema(name = "GormImplInfo")
-@Introspected
-public class GormImplDTO extends Linkable implements Named, Described, Selectable<GormImpl> {
-    static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".gormImpl.";
-    private final String name;
-    private final String description;
-    private final GormImpl value;
-
-    /**
-     * @param gormImpl The GormImpl
-     */
-    public GormImplDTO(GormImpl gormImpl) {
-        this.value = gormImpl;
-        this.name = gormImpl.getName();
-        this.description = gormImpl.getName();
-    }
-
-    /**
-     * @param gormImpl The type
-     * @param name The name
-     * @param description The description
-     */
-    @Creator
-    @Internal
-    GormImplDTO(GormImpl gormImpl,
-                String name,
-                String description) {
-        this.value = gormImpl;
-        this.name = name;
-        this.description = description;
-    }
-
-    /**
-     * i18n constructor.
-     * @param gormImpl The type
-     * @param messageSource The message source
-     * @param messageContext The message context
-     */
-    @Internal
-    GormImplDTO(GormImpl gormImpl,
-                MessageSource messageSource,
-                MessageSource.MessageContext messageContext) {
-        this.value = gormImpl;
-        String name = gormImpl.getName();
-        this.name = name;
-        this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, name);
-
-    }
-
-    @NonNull
-    @Override
-    @Schema(description = "A description of the Grails Data implementation")
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    @Schema(description = "The name of the Gorm Implementation")
-    @NonNull
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    @Schema(description = "The value of the Grails Data implementation for select options")
-    public GormImpl getValue() {
-        return value;
-    }
-
-    @Override
-    @Schema(description = "The label of the Grails Data implementation for select options")
-    public String getLabel() {
-        return value.getLabel();
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/JdkVersionDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/JdkVersionDTO.java
deleted file mode 100644
index 002edde635..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/JdkVersionDTO.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.context.MessageSource;
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.Introspected;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.naming.Described;
-import io.micronaut.core.naming.Named;
-import org.grails.forge.options.JdkVersion;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * DTO objects for {@link JdkVersion}.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Schema(name = "JdkVersionInfo")
-@Introspected
-public class JdkVersionDTO extends Linkable implements Named, Described, Selectable<JdkVersion> {
-    static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".jdkVersion.";
-    private final JdkVersion value;
-    private final String name;
-    private final String description;
-    private final Integer majorVersion;
-
-    /**
-     * @param jdkVersion The jdkVersion
-     */
-    public JdkVersionDTO(JdkVersion jdkVersion) {
-        this.value = jdkVersion;
-        this.name = jdkVersion.toString();
-        this.description = String.valueOf(jdkVersion.majorVersion());
-        this.majorVersion = jdkVersion.majorVersion();
-    }
-
-    /**
-     * @param name the name
-     * @param description The description
-     */
-    @Creator
-    @Internal
-    JdkVersionDTO(String name, String description, Integer majorVersion, JdkVersion value) {
-        this.value = value;
-        this.name = name;
-        this.description = description;
-        this.majorVersion = majorVersion;
-    }
-
-    /**
-     * i18n constructor.
-     * @param jdkVersion The type
-     * @param messageSource The message source
-     * @param messageContext The message context
-     */
-    @Internal
-    JdkVersionDTO(JdkVersion jdkVersion, MessageSource messageSource, MessageSource.MessageContext messageContext) {
-        String name = jdkVersion.name();
-
-        this.value = jdkVersion;
-        this.name = name;
-        this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, name);
-        this.majorVersion = jdkVersion.majorVersion();
-    }
-
-    @Override
-    @Schema(description = "A description of the jdkVersion")
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    @Schema(description = "The name of the jdkVersion")
-    @NonNull
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    @Schema(description = "The value of the jdkVersion for select options")
-    @NonNull
-    public JdkVersion getValue() {
-        return value;
-    }
-
-    @Override
-    @Schema(description = "The label of the jdkVersion for select options")
-    public String getLabel() {
-        return description.replaceFirst("JDK_", "");
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/LanguageDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/LanguageDTO.java
deleted file mode 100644
index ae9a906437..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/LanguageDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.context.MessageSource;
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.Introspected;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.naming.Described;
-import io.micronaut.core.naming.Named;
-import org.grails.forge.defaults.IncludesDefaults;
-import org.grails.forge.defaults.LanguageDefaults;
-import org.grails.forge.options.Language;
-import org.grails.forge.util.NameUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * DTO objects for {@link Language}.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Schema(name = "LanguageInfo")
-@Introspected
-public class LanguageDTO extends Linkable implements Named, Described, Selectable<Language>, IncludesDefaults<LanguageDefaults> {
-    static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".language.";
-    private final String name;
-    private final String extension;
-    private final String description;
-    private final Language value;
-
-    /**
-     * @param language The language
-     */
-    public LanguageDTO(Language language) {
-        this.value = language;
-        this.name = language.getName();
-        this.extension = language.getExtension();
-        this.description = language.getName();
-    }
-
-    /**
-     * @param name the name
-     * @param extension The extension
-     * @param description The description
-     */
-    @Creator
-    @Internal
-    LanguageDTO(Language value, String name, String extension, String description) {
-        this.value = value;
-        this.name = name;
-        this.extension = extension;
-        this.description = description;
-    }
-
-    /**
-     * i18n constructor.
-     * @param language The type
-     * @param messageSource The message source
-     * @param messageContext The message context
-     */
-    @Internal
-    LanguageDTO(Language language, MessageSource messageSource, MessageSource.MessageContext messageContext) {
-        this.value = language;
-        String name = language.getName();
-        this.name = name;
-        this.extension = language.getExtension();
-        this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, name);
-
-    }
-
-    @Schema(description = "The extension of the language")
-    public String getExtension() {
-        return extension;
-    }
-
-    @Override
-    @Schema(description = "A description of the language")
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    @Schema(description = "The name of the language")
-    @NonNull
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    @Schema(description = "The value of the language for select options")
-    public Language getValue() {
-        return value;
-    }
-
-    @Override
-    @Schema(description = "The label of the language for select options")
-    public String getLabel() {
-        return NameUtils.getNaturalNameOfEnum(name);
-    }
-
-    @Override
-    @Schema(description = "The default values that correlate to the language")
-    public LanguageDefaults getDefaults() {
-        return this.value.getDefaults();
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/LinkDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/LinkDTO.java
deleted file mode 100644
index b68146b7d6..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/LinkDTO.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.Introspected;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Represents a link.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Introspected
-@Schema(name = "Link")
-public class LinkDTO {
-
-    private final String href;
-    private final boolean templated;
-
-    public LinkDTO(String href) {
-        this(href, false);
-    }
-
-    @Creator
-    public LinkDTO(String href, boolean templated) {
-        this.href = href;
-        this.templated = templated;
-    }
-
-    /**
-     * @return The link address
-     */
-    @Schema(description = "The link address")
-    public String getHref() {
-        return href;
-    }
-
-    /**
-     * @return Whether the link is templated
-     */
-    @Schema(description = "Whether the link is templated")
-    public boolean isTemplated() {
-        return templated;
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/RequestInfo.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/RequestInfo.java
deleted file mode 100644
index a16c533850..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/RequestInfo.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.http.HttpParameters;
-import org.grails.forge.application.ApplicationType;
-import io.swagger.v3.oas.annotations.Hidden;
-
-import java.util.Locale;
-import java.util.Objects;
-
-/**
- * The server URL.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Hidden
-public class RequestInfo {
-
-    public static final RequestInfo LOCAL = new RequestInfo("http://localhost:8080", "/", null, Locale.ENGLISH, "");
-
-    private final String serverURL;
-    private final String currentURL;
-    private final String path;
-    private final HttpParameters parameters;
-    private final Locale locale;
-    private final String userAgent;
-
-    /**
-     * Default constructor.
-     *
-     * @param serverURL  The URL
-     * @param path       The request path
-     * @param parameters The request parameters
-     * @param locale     The locale
-     * @param userAgent  The browser user-agent
-     */
-    public RequestInfo(String serverURL, String path, HttpParameters parameters, Locale locale, String userAgent) {
-        this.serverURL = Objects.requireNonNull(serverURL, "URL cannot be null");
-        this.locale = locale;
-        this.path = path;
-        this.parameters = parameters;
-        this.userAgent = userAgent;
-        this.currentURL = serverURL + Objects.requireNonNull(path, "Path cannot be null");
-    }
-
-    /**
-     * @return The server URL
-     */
-    public String getServerURL() {
-        return serverURL;
-    }
-
-    /**
-     * @return The current URL
-     */
-    public String getCurrentURL() {
-        return currentURL;
-    }
-
-    /**
-     * @return The self link
-     */
-    public LinkDTO self() {
-        return new LinkDTO(getCurrentURL(), false);
-    }
-
-    /**
-     * @param rel  The relationship
-     * @param type The type
-     * @return A new link
-     */
-    public LinkDTO link(Relationship rel, ApplicationType type) {
-        return new LinkDTO(getServerURL() + "/" + rel + "/" + type.getName() + "/{name}");
-    }
-
-    /**
-     * @param type The type
-     * @return A new link
-     */
-    public LinkDTO link(ApplicationType type) {
-        return new LinkDTO(getServerURL() + "/application-types/" + type.getName(), false);
-    }
-
-    public Locale getLocale() {
-        return this.locale;
-    }
-
-    public LinkDTO link(String uri) {
-        return new LinkDTO(getServerURL() + uri, false);
-    }
-
-    public String getUserAgent() {
-        return userAgent;
-    }
-
-    /**
-     * @return request path
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * @return request parameters
-     */
-    public HttpParameters getParameters() {
-        return parameters;
-    }
-
-    @Override
-    public String toString() {
-        return "RequestInfo{" +
-                "serverURL='" + serverURL + '\'' +
-                ", currentURL='" + currentURL + '\'' +
-                ", path='" + path + '\'' +
-                ", parameters=" + parameters +
-                ", locale=" + locale +
-                ", userAgent='" + userAgent + '\'' +
-                '}';
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/SelectOptionDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/SelectOptionDTO.java
deleted file mode 100644
index ae4136f760..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/SelectOptionDTO.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.Introspected;
-import io.swagger.v3.oas.annotations.media.ArraySchema;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.List;
-
-/**
- * Supported Option
- * @param <T> The underlying option type
- */
-@Introspected
-public abstract class SelectOptionDTO<T extends Selectable<?>> {
-
-    /**
-     * The list of options
-     */
-    List<T> options;
-
-    /**
-     * The Default option
-     */
-    T defaultOption;
-
-    @Creator
-    public SelectOptionDTO(List<T> options, T defaultOption) {
-        this.options = options;
-        this.defaultOption = defaultOption;
-    }
-
-    @ArraySchema(schema =
-        @Schema(description = "the supported options")
-    )
-    public List<T> getOptions() {
-        return options;
-    }
-
-    @Schema(description = "the default value")
-    public T getDefaultOption() {
-        return defaultOption;
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java
deleted file mode 100644
index 3af07892ef..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api;
-
-import io.micronaut.context.MessageSource;
-import io.micronaut.core.annotation.Creator;
-import io.micronaut.core.annotation.Internal;
-import io.micronaut.core.annotation.Introspected;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.naming.Described;
-import io.micronaut.core.naming.Named;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.grails.forge.options.ServletImpl;
-
-/**
- * DTO objects for {@link ServletImpl}.
- *
- * @since 6.0.0
- */
-@Schema(name = "ServletImplInfo")
-@Introspected
-public class ServletImplDTO extends Linkable implements Named, Described, Selectable<ServletImpl> {
-
-    static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".servletImpl.";
-
-    private final String name;
-    private final String description;
-    private final ServletImpl value;
-
-    /**
-     * @param servletImpl The {{@link ServletImpl}}
-     */
-    public ServletImplDTO(ServletImpl servletImpl) {
-        this.value = servletImpl;
-        this.name = servletImpl.getName();
-        this.description = servletImpl.getName();
-    }
-
-    @Creator
-    @Internal
-    ServletImplDTO(ServletImpl servletImpl,
-                   String name,
-                   String description) {
-        this.value = servletImpl;
-        this.name = name;
-        this.description = description;
-    }
-
-    @Internal
-    ServletImplDTO(ServletImpl servletImpl,
-                   MessageSource messageSource,
-                   MessageSource.MessageContext messageContext) {
-        this.value = servletImpl;
-        String name = servletImpl.getName();
-        this.name = name;
-        this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, name);
-    }
-
-    @NonNull
-    @Override
-    @Schema(description = "A description of the Servlet implementation")
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    @Schema(description = "The name of the Gorm Implementation")
-    @NonNull
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    @Schema(description = "The value of the Servlet Implementation for select options")
-    public ServletImpl getValue() {
-        return value;
-    }
-
-    @Override
-    @Schema(description = "The label of the Servlet Implementation for select options")
-    public String getLabel() {
-        return value.getLabel();
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/analytics/GenerationListener.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/analytics/GenerationListener.java
deleted file mode 100644
index 5a31e7f966..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/analytics/GenerationListener.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.analytics;
-
-import io.micronaut.context.annotation.Requires;
-import io.micronaut.runtime.event.annotation.EventListener;
-import org.grails.forge.analytics.Generated;
-import org.grails.forge.analytics.SelectedFeature;
-import org.grails.forge.api.event.ApplicationGeneratingEvent;
-import org.grails.forge.application.generator.GeneratorContext;
-import jakarta.inject.Singleton;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Singleton
-@Requires(beans = AnalyticsOperations.class)
-public class GenerationListener {
-    private static final Logger LOG = LoggerFactory.getLogger(GenerationListener.class);
-    private final AnalyticsOperations analyticsOperations;
-
-    public GenerationListener(AnalyticsOperations analyticsOperations) {
-        this.analyticsOperations = analyticsOperations;
-    }
-
-    @EventListener
-    void onApplicationGenerated(ApplicationGeneratingEvent event) {
-        GeneratorContext context = event.getSource();
-        List<SelectedFeature> features = context.getFeatures().stream()
-                .map(SelectedFeature::new).collect(Collectors.toList());
-        Generated generated = new Generated(
-                context.getApplicationType(),
-                context.getGorm(),
-                context.getServlet(),
-                context.getDevelopmentReloading(),
-                context.getJdkVersion()
-        );
-        generated.setSelectedFeatures(features);
-        if (analyticsOperations != null) {
-            analyticsOperations.applicationGenerated(generated)
-                .whenComplete((httpStatus, throwable) -> {
-                    if (throwable != null) {
-                        if (LOG.isErrorEnabled()) {
-                            LOG.error("Error occurred reporting analytics: " + throwable.getMessage(), throwable);
-                        }
-                    }
-                });
-        }
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/bind/RequestInfoArgumentBinder.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/bind/RequestInfoArgumentBinder.java
deleted file mode 100644
index 8c1125119f..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/bind/RequestInfoArgumentBinder.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.bind;
-
-import io.micronaut.core.convert.ArgumentConversionContext;
-import io.micronaut.core.io.socket.SocketUtils;
-import io.micronaut.core.type.Argument;
-import io.micronaut.http.HttpHeaders;
-import io.micronaut.http.HttpRequest;
-import io.micronaut.http.bind.binders.TypedRequestArgumentBinder;
-import org.grails.forge.api.RequestInfo;
-import org.grails.forge.api.GrailsForgeConfiguration;
-import jakarta.inject.Singleton;
-
-import java.util.Locale;
-import java.util.Optional;
-
-/**
- * Binds the Server URL.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Singleton
-public class RequestInfoArgumentBinder implements TypedRequestArgumentBinder<RequestInfo> {
-
-    private static final Argument<RequestInfo> TYPE = Argument.of(RequestInfo.class);
-    private final GrailsForgeConfiguration configuration;
-
-    /**
-     * Default constructor.
-     * @param configuration The configuration
-     */
-    public RequestInfoArgumentBinder(GrailsForgeConfiguration configuration) {
-        this.configuration = configuration;
-    }
-
-    @Override
-    public Argument<RequestInfo> argumentType() {
-        return TYPE;
-    }
-
-    @Override
-    public BindingResult<RequestInfo> bind(ArgumentConversionContext<RequestInfo> context, HttpRequest<?> source) {
-        String url = resolveUrl(source);
-        return () -> Optional.of(new RequestInfo(url, source.getPath(), source.getParameters(),
-                source.getLocale().orElse(Locale.ENGLISH), source.getHeaders().get(HttpHeaders.USER_AGENT)));
-    }
-
-    private String resolveUrl(HttpRequest<?> request) {
-
-        String cp = configuration.getPath().orElse("");
-        String url = configuration.getUrl().map(Object::toString).orElse(null);
-        if (url != null) {
-            if (url.startsWith("https://")) {
-                return url + cp;
-            } else {
-                return "https://" + url + cp;
-            }
-        } else {
-           String hostname = request.getUri().getHost();
-           String host;
-            if (hostname != null) {
-                host = hostname;
-            } else {
-                host = SocketUtils.LOCALHOST;
-            }
-            int port = request.getServerAddress().getPort();
-            if (port > -1 && port != 80) {
-                host = host + ":" + port;
-            }
-            url = (request.isSecure() ? "https" : "http") + "://" + host + cp;
-        }
-
-        return url;
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/AbstractCreateController.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/AbstractCreateController.java
deleted file mode 100644
index bf9286a94a..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/AbstractCreateController.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.create;
-
-import io.micronaut.context.event.ApplicationEventPublisher;
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.http.HttpHeaders;
-import io.micronaut.http.HttpStatus;
-import io.micronaut.http.annotation.Header;
-import io.micronaut.http.exceptions.HttpStatusException;
-import org.grails.forge.api.DevelopmentReloading;
-import org.grails.forge.api.UserAgentParser;
-import org.grails.forge.api.event.ApplicationGeneratingEvent;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.application.OperatingSystem;
-import org.grails.forge.application.Project;
-import org.grails.forge.application.generator.GeneratorContext;
-import org.grails.forge.application.generator.ProjectGenerator;
-import org.grails.forge.io.ConsoleOutput;
-import org.grails.forge.options.*;
-import org.grails.forge.util.NameUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.validation.constraints.Pattern;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Abstract implementation of a create controller.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-public abstract class AbstractCreateController {
-    private static final Logger LOG = LoggerFactory.getLogger(AbstractCreateController.class);
-    protected final ProjectGenerator projectGenerator;
-    private final ApplicationEventPublisher eventPublisher;
-
-    /**
-     * Abstract implementation for create controllers.
-     * @param projectGenerator The project generator
-     * @param eventPublisher The event publisher
-     */
-    protected AbstractCreateController(
-            ProjectGenerator projectGenerator,
-            ApplicationEventPublisher eventPublisher) {
-        this.projectGenerator = projectGenerator;
-        this.eventPublisher = eventPublisher;
-    }
-
-    public GeneratorContext createProjectGeneratorContext(
-            ApplicationType type,
-            @Pattern(regexp = "[\\w\\d-_\\.]+") String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool buildTool,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Nullable @Header(HttpHeaders.USER_AGENT) String userAgent) {
-        Project project;
-        try {
-            project = NameUtils.parse(name);
-        } catch (IllegalArgumentException e) {
-            throw new HttpStatusException(HttpStatus.BAD_REQUEST, "Invalid project name: " + e.getMessage());
-        }
-
-        GeneratorContext generatorContext;
-        try {
-            GormImpl gormImpl = gorm != null ? gorm : GormImpl.DEFAULT_OPTION;
-            ServletImpl servletImpl = servlet != null ? servlet : ServletImpl.DEFAULT_OPTION;
-            generatorContext = projectGenerator.createGeneratorContext(
-                    type,
-                    project,
-                    new Options(reloading != null ? reloading.toDevelopmentReloading() : org.grails.forge.options.DevelopmentReloading.DEFAULT_OPTION,
-                            gormImpl == null ? GormImpl.DEFAULT_OPTION : gormImpl,
-                            servletImpl == null ? ServletImpl.DEFAULT_OPTION : servletImpl,
-                            javaVersion == null ? JdkVersion.DEFAULT_OPTION : javaVersion,
-                            getOperatingSystem(userAgent)),
-                    getOperatingSystem(userAgent),
-                    features != null ? features : Collections.emptyList(),
-                    ConsoleOutput.NOOP
-            );
-
-            try {
-                eventPublisher.publishEvent(new ApplicationGeneratingEvent(generatorContext));
-            } catch (Exception e) {
-                LOG.warn("Error firing application generated event: " + e.getMessage(), e);
-            }
-        } catch (IllegalArgumentException e) {
-            throw new HttpStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
-        }
-
-        return generatorContext;
-    }
-
-    protected OperatingSystem getOperatingSystem(String userAgent) {
-        return UserAgentParser.getOperatingSystem(userAgent);
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/zip/ZipCreateController.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/zip/ZipCreateController.java
deleted file mode 100644
index f2682c1a19..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/zip/ZipCreateController.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.create.zip;
-
-import io.micronaut.context.event.ApplicationEventPublisher;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.core.bind.annotation.Bindable;
-import io.micronaut.core.io.Writable;
-import io.micronaut.http.HttpHeaders;
-import io.micronaut.http.HttpResponse;
-import io.micronaut.http.MutableHttpResponse;
-import io.micronaut.http.annotation.Controller;
-import io.micronaut.http.annotation.Get;
-import io.micronaut.http.annotation.Header;
-import io.micronaut.scheduling.TaskExecutors;
-import io.micronaut.scheduling.annotation.ExecuteOn;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import org.grails.forge.api.DevelopmentReloading;
-import org.grails.forge.api.create.AbstractCreateController;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.application.Project;
-import org.grails.forge.application.generator.GeneratorContext;
-import org.grails.forge.application.generator.ProjectGenerator;
-import org.grails.forge.io.ZipOutputHandler;
-import org.grails.forge.options.BuildTool;
-import org.grails.forge.options.GormImpl;
-import org.grails.forge.options.JdkVersion;
-import org.grails.forge.options.ServletImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.micronaut.validation.Validated;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.util.List;
-
-/**
- * Implements the {@link ZipCreateOperation} interface for applications.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Controller
-@ExecuteOn(TaskExecutors.IO)
-@Validated
-public class ZipCreateController extends AbstractCreateController implements ZipCreateOperation {
-
-    public static final String MEDIA_TYPE_APPLICATION_ZIP = "application/zip";
-    private static final Logger LOG = LoggerFactory.getLogger(ZipCreateController.class);
-
-    /**
-     * Default constructor.
-     *
-     * @param projectGenerator The project generator
-     * @param eventPublisher   The event publisher
-     */
-    public ZipCreateController(ProjectGenerator projectGenerator, ApplicationEventPublisher eventPublisher) {
-        super(projectGenerator, eventPublisher);
-    }
-
-    /**
-     * Creates an application, generating a ZIP file as the response.
-     *
-     * @param type        The application type The application type
-     * @param name        The name of the application The name of the application
-     * @param features    The features The chosen features
-     * @param build       The build tool
-     * @param reloading   The development reloading option
-     * @param gorm        The GORM
-     * @param servlet     The Servlet
-     * @param javaVersion The java version
-     * @return A ZIP file containing the generated application.
-     */
-    @Override
-    @Get(uri = "/create/{type}/{name}{?features,gorm,build,reloading,javaVersion}", produces = MEDIA_TYPE_APPLICATION_ZIP)
-    @ApiResponse(
-            description = "A ZIP file containing the generated application.",
-            content = @Content(
-                    mediaType = MEDIA_TYPE_APPLICATION_ZIP
-            )
-    )
-    public HttpResponse<Writable> createApp(
-            ApplicationType type,
-            @Pattern(regexp = "[\\w\\d-_\\.]+") String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Nullable @Header(HttpHeaders.USER_AGENT) String userAgent) {
-        return generateAppIntoZipFile(type, name, features, build, reloading, gorm, servlet, javaVersion, userAgent);
-    }
-
-    /**
-     * Creates the default application type using the name of the given Zip.
-     *
-     * @param type        The type
-     * @param name        The ZIP name
-     * @param features    The features
-     * @param build       The build tool
-     * @param reloading   The development reloading option
-     * @param gorm        The GORM
-     * @param servlet     The Servlet
-     * @param javaVersion The java version
-     * @param userAgent   The browser user-agent
-     * @return A Zip file containing the application
-     */
-    @Get(uri = "/{name}.zip{?type,features,gorm,servlet,build,reloading}", produces = MEDIA_TYPE_APPLICATION_ZIP)
-    @ApiResponse(
-            description = "A ZIP file containing the generated application.",
-            content = @Content(
-                    mediaType = MEDIA_TYPE_APPLICATION_ZIP
-            )
-    )
-    public HttpResponse<Writable> createZip(
-            @Bindable(defaultValue = "WEB") ApplicationType type,
-            @Pattern(regexp = "[\\w\\d-_]+") @NotBlank String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Nullable @Header("User-Agent") String userAgent) {
-        return generateAppIntoZipFile(type, name, features, build, reloading, gorm, servlet, javaVersion, userAgent);
-    }
-
-    public HttpResponse<Writable> generateAppIntoZipFile(
-            @NotNull ApplicationType type,
-            @NotNull String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool buildTool,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Nullable String userAgent) {
-
-        GeneratorContext generatorContext = createProjectGeneratorContext(type, name, features, buildTool, reloading, gorm, servlet, javaVersion, userAgent);
-        MutableHttpResponse<Writable> response = HttpResponse.created(new Writable() {
-            @Override
-            public void writeTo(OutputStream outputStream, @Nullable Charset charset) throws IOException {
-                try {
-                    final Project project = generatorContext.getProject();
-                    projectGenerator.generate(type,
-                            project,
-                            new ZipOutputHandler(project.getName(), outputStream),
-                            generatorContext);
-
-                    outputStream.flush();
-                } catch (Exception e) {
-                    LOG.error("Error generating application: " + e.getMessage(), e);
-                    throw new IOException(e.getMessage(), e);
-                }
-            }
-
-            @Override
-            public void writeTo(Writer out) {
-                // no-op, output stream used
-            }
-        });
-        return response.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + getFilename(generatorContext.getProject()));
-    }
-
-    /**
-     * @param project The project
-     * @return The file name to return.
-     */
-    protected @NonNull String getFilename(@NonNull Project project) {
-        return project.getName() + ".zip";
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/zip/ZipCreateOperation.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/zip/ZipCreateOperation.java
deleted file mode 100644
index 3d74bd1470..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/create/zip/ZipCreateOperation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.create.zip;
-
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.core.io.Writable;
-import io.micronaut.http.HttpHeaders;
-import io.micronaut.http.HttpResponse;
-import io.micronaut.http.annotation.Header;
-import org.grails.forge.api.DevelopmentReloading;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.options.BuildTool;
-import org.grails.forge.options.GormImpl;
-import org.grails.forge.options.ServletImpl;
-import org.grails.forge.options.JdkVersion;
-
-import jakarta.validation.constraints.Pattern;
-import java.util.List;
-
-/**
- * Defines the signature for creating an application.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-public interface ZipCreateOperation {
-
-    /**
-     * Creates an application.
-     *
-     * @param type        The application type
-     * @param name        The name of the application
-     * @param features    The features
-     * @param build       The build tool
-     * @param reloading   The development reloading
-     * @param gorm        The GORM
-     * @param servlet     The Servlet
-     * @param javaVersion The java version
-     * @param userAgent   The browser user-agent
-     * @return An HTTP response that emits a writable
-     */
-    HttpResponse<Writable> createApp(
-            ApplicationType type,
-            @Pattern(regexp = "[\\w\\d-_\\.]+") String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Nullable @Header(HttpHeaders.USER_AGENT) String userAgent
-    );
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/diff/DiffController.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/diff/DiffController.java
deleted file mode 100644
index 4f71dc63d5..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/diff/DiffController.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.diff;
-
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.http.HttpStatus;
-import io.micronaut.http.MediaType;
-import io.micronaut.http.annotation.Controller;
-import io.micronaut.http.annotation.Get;
-import io.micronaut.http.exceptions.HttpStatusException;
-import org.grails.forge.api.RequestInfo;
-import org.grails.forge.api.UserAgentParser;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.application.Project;
-import org.grails.forge.application.generator.GeneratorContext;
-import org.grails.forge.application.generator.ProjectGenerator;
-import org.grails.forge.diff.FeatureDiffer;
-import org.grails.forge.io.ConsoleOutput;
-import org.grails.forge.options.*;
-import org.grails.forge.util.NameUtils;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import org.reactivestreams.Publisher;
-import reactor.core.publisher.Flux;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * A controller for performing Diffs.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Controller("/diff")
-public class DiffController implements DiffOperations {
-
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
-    private final ProjectGenerator projectGenerator;
-    private final FeatureDiffer featureDiffer;
-    private final Project project;
-
-    /**
-     * Default constructor.
-     *
-     * @param projectGenerator The project generator
-     * @param featureDiffer    The feature differ
-     */
-    public DiffController(ProjectGenerator projectGenerator, FeatureDiffer featureDiffer) {
-        this.projectGenerator = projectGenerator;
-        this.featureDiffer = featureDiffer;
-        this.project = NameUtils.parse("example");
-    }
-
-    /**
-     * Returns a diff for the given application type and feature.
-     *
-     * @param type        The application type
-     * @param feature     The feature
-     * @param build       The build tool
-     * @param reloading   The development reloading
-     * @param gorm        The GORM implementation
-     * @param servlet     The Servlet implementation
-     * @param javaVersion The java version
-     * @param requestInfo The request info
-     * @return A string representing the difference
-     */
-    @Get(uri = "/{type}/feature/{feature}{?gorm,servlet,build,test,javaVersion,name}",
-            produces = MediaType.TEXT_PLAIN)
-    @Override
-    @ApiResponse(responseCode = "404", description = "If no difference is found")
-    @ApiResponse(responseCode = "400", description = "If the supplied parameters are invalid")
-    @ApiResponse(responseCode = "200", description = "A textual diff", content = @Content(mediaType = "text/plain"))
-    public Publisher<String> diffFeature(
-            @NotNull ApplicationType type,
-            @Nullable String name,
-            @NonNull @NotBlank String feature,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Parameter(hidden = true) RequestInfo requestInfo) {
-
-        ProjectGenerator projectGenerator;
-        GeneratorContext generatorContext;
-        try {
-            Project project = name != null ? NameUtils.parse(name) : this.project;
-            Options options = new Options(
-                    reloading != null ? reloading : DevelopmentReloading.DEFAULT_OPTION,
-                    gorm != null ? gorm : GormImpl.DEFAULT_OPTION,
-                    servlet != null ? servlet : ServletImpl.DEFAULT_OPTION,
-                    javaVersion != null ? javaVersion : JdkVersion.DEFAULT_OPTION
-            );
-            projectGenerator = this.projectGenerator;
-            generatorContext = projectGenerator.createGeneratorContext(
-                    type,
-                    project,
-                    options,
-                    UserAgentParser.getOperatingSystem(requestInfo.getUserAgent()),
-                    Collections.singletonList(feature),
-                    ConsoleOutput.NOOP
-            );
-        } catch (IllegalArgumentException e) {
-            throw new HttpStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
-        }
-
-        return diffFlowable(projectGenerator, generatorContext);
-    }
-
-    /**
-     * Diffs the whole application for all selected features.
-     *
-     * @param type        The application type
-     * @param name        The name of the application
-     * @param features    The features
-     * @param build       The build tool
-     * @param reloading   The development reloading
-     * @param servlet     The Servlet implementation
-     * @param requestInfo The request info
-     * @return An HTTP response that emits a writable
-     */
-    @Get(uri = "/{type}/{name}{?features,gorm,servlet,build,test,javaVersion}", produces = MediaType.TEXT_PLAIN)
-    @Override
-    @ApiResponse(responseCode = "404", description = "If no difference is found")
-    @ApiResponse(responseCode = "400", description = "If the supplied parameters are invalid")
-    @ApiResponse(responseCode = "200", description = "A textual diff", content = @Content(mediaType = "text/plain"))
-    public Publisher<String> diffApp(
-            ApplicationType type,
-            @Pattern(regexp = "[\\w\\d-_\\.]+") String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Parameter(hidden = true) RequestInfo requestInfo) throws IOException {
-        ProjectGenerator projectGenerator;
-        GeneratorContext generatorContext;
-        try {
-            Project project = name != null ? NameUtils.parse(name) : this.project;
-            Options options = new Options(
-                    reloading != null ? reloading : DevelopmentReloading.DEFAULT_OPTION,
-                    gorm != null ? gorm : GormImpl.DEFAULT_OPTION,
-                    servlet != null ? servlet : ServletImpl.DEFAULT_OPTION,
-                    javaVersion != null ? javaVersion : JdkVersion.DEFAULT_OPTION
-            );
-            projectGenerator = this.projectGenerator;
-            generatorContext = projectGenerator.createGeneratorContext(
-                    type,
-                    project,
-                    options,
-                    UserAgentParser.getOperatingSystem(requestInfo.getUserAgent()),
-                    features != null ? features : Collections.emptyList(),
-                    ConsoleOutput.NOOP
-            );
-        } catch (IllegalArgumentException e) {
-            throw new HttpStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
-        }
-
-        return diffFlowable(projectGenerator, generatorContext);
-    }
-
-    private Publisher<String> diffFlowable(ProjectGenerator projectGenerator, GeneratorContext generatorContext) {
-        return Flux.create(emitter -> {
-            try {
-                // empty string so there is at least some content
-                // if there is no difference
-                emitter.next("");
-                featureDiffer.produceDiff(
-                        projectGenerator,
-                        generatorContext,
-                        new ConsoleOutput() {
-                            @Override
-                            public void out(String message) {
-                                emitter.next(message + LINE_SEPARATOR);
-                            }
-
-                            @Override
-                            public void err(String message) {
-                                // will never be called
-                            }
-
-                            @Override
-                            public void warning(String message) {
-                                // will never be called
-                            }
-
-                            @Override
-                            public boolean showStacktrace() {
-                                return false;
-                            }
-
-                            @Override
-                            public boolean verbose() {
-                                return false;
-                            }
-                        }
-                );
-                emitter.complete();
-            } catch (Exception e) {
-                emitter.error(new HttpStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Could not produce diff: " + e.getMessage()));
-            }
-        });
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/diff/DiffOperations.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/diff/DiffOperations.java
deleted file mode 100644
index 17cafc7fd2..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/diff/DiffOperations.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.diff;
-
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
-import org.grails.forge.api.RequestInfo;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.options.*;
-import io.swagger.v3.oas.annotations.Parameter;
-import org.reactivestreams.Publisher;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * Operations for performing diffs.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-public interface DiffOperations {
-    /**
-     * Previews an application.
-     *
-     * @param type        The application type
-     * @param name        The project name
-     * @param feature     The feature
-     * @param build       The build tool
-     * @param reloading   The development reloading
-     * @param gorm        The GORM implementation
-     * @param servlet     The Servlet implementation
-     * @param javaVersion The java version
-     * @param requestInfo The request info
-     * @return An HTTP response that emits a writable
-     * @throws IOException if an I/O error occurs
-     */
-    Publisher<String> diffFeature(
-            @NotNull ApplicationType type,
-            @Nullable String name,
-            @NotBlank @NonNull String feature,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Parameter(hidden = true) RequestInfo requestInfo) throws IOException;
-
-    /**
-     * Diffs the whole application for all selected features.
-     *
-     * @param type        The application type
-     * @param name        The name of the application
-     * @param features    The features
-     * @param build       The build tool
-     * @param reloading        The reloading framework
-     * @param gorm        The GORM implementation
-     * @param servlet     The Servlet implementation
-     * @param javaVersion The java version
-     * @param requestInfo The request info
-     * @return An HTTP response that emits a writable
-     * @throws IOException if an I/O error occurs
-     */
-    Publisher<String> diffApp(
-            @NotNull ApplicationType type,
-            @Nullable String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Parameter(hidden = true) RequestInfo requestInfo) throws IOException;
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/ApplicationTypeSelectOptions.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/ApplicationTypeSelectOptions.java
deleted file mode 100644
index 1fcc1b9967..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/ApplicationTypeSelectOptions.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.options;
-
-import org.grails.forge.api.ApplicationTypeDTO;
-import org.grails.forge.api.SelectOptionDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.List;
-
-@Schema(name = "ApplicationTypeSelectOptions")
-public class ApplicationTypeSelectOptions extends SelectOptionDTO<ApplicationTypeDTO> {
-    public ApplicationTypeSelectOptions(List<ApplicationTypeDTO> options, ApplicationTypeDTO defaultOption) {
-        super(options, defaultOption);
-    }
-
-    @Override
-    public List<ApplicationTypeDTO> getOptions() {
-        return super.getOptions();
-    }
-
-    @Override
-    public ApplicationTypeDTO getDefaultOption() {
-        return super.getDefaultOption();
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/DevelopmentReloadingSelectOptions.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/DevelopmentReloadingSelectOptions.java
deleted file mode 100644
index cdaf421ad6..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/DevelopmentReloadingSelectOptions.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.options;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.grails.forge.api.SelectOptionDTO;
-import org.grails.forge.api.DevelopmentReloadingDTO;
-
-import java.util.List;
-
-@Schema(name = "DevelopmentReloadingSelectOptions")
-public class DevelopmentReloadingSelectOptions extends SelectOptionDTO<DevelopmentReloadingDTO> {
-    public DevelopmentReloadingSelectOptions(List<DevelopmentReloadingDTO> options, DevelopmentReloadingDTO defaultOption) {
-        super(options, defaultOption);
-    }
-
-    @Override
-    public List<DevelopmentReloadingDTO> getOptions() {
-        return super.getOptions();
-    }
-
-    @Override
-    public DevelopmentReloadingDTO getDefaultOption() {
-        return super.getDefaultOption();
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/JdkVersionSelectOptions.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/JdkVersionSelectOptions.java
deleted file mode 100644
index 48cb400ed6..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/JdkVersionSelectOptions.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.options;
-
-import org.grails.forge.api.JdkVersionDTO;
-import org.grails.forge.api.SelectOptionDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.List;
-
-@Schema(name = "JdkVersionSelectOptions")
-public class JdkVersionSelectOptions extends SelectOptionDTO<JdkVersionDTO> {
-    public JdkVersionSelectOptions(List<JdkVersionDTO> options, JdkVersionDTO defaultOption) {
-        super(options, defaultOption);
-    }
-
-    @Override
-    public List<JdkVersionDTO> getOptions() {
-        return super.getOptions();
-    }
-
-    @Override
-    public JdkVersionDTO getDefaultOption() {
-        return super.getDefaultOption();
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/LanguageSelectOptions.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/LanguageSelectOptions.java
deleted file mode 100644
index 9b83f2ce78..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/LanguageSelectOptions.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.options;
-
-import org.grails.forge.api.LanguageDTO;
-import org.grails.forge.api.SelectOptionDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.List;
-
-@Schema(name = "LanguageSelectOptions")
-public class LanguageSelectOptions extends SelectOptionDTO<LanguageDTO> {
-    public LanguageSelectOptions(List<LanguageDTO> options, LanguageDTO defaultOption) {
-        super(options, defaultOption);
-    }
-
-    @Override
-    public List<LanguageDTO> getOptions() {
-        return super.getOptions();
-    }
-
-    @Override
-    public LanguageDTO getDefaultOption() {
-        return super.getDefaultOption();
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/SelectOptionsController.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/SelectOptionsController.java
deleted file mode 100644
index d4f4fe84e9..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/SelectOptionsController.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.options;
-
-import io.micronaut.context.MessageSource;
-import io.micronaut.context.i18n.ResourceBundleMessageSource;
-import io.micronaut.http.MediaType;
-import io.micronaut.http.annotation.Controller;
-import io.micronaut.http.annotation.Get;
-import org.grails.forge.api.RequestInfo;
-import org.grails.forge.api.SelectOptionsDTO;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
-/**
- * Gets Information about select options for the Grails Forge.
- *
- * @since 6.0.0
- */
-@Controller("/select-options")
-public class SelectOptionsController implements SelectOptionsOperations {
-
-    @Inject
-    MessageSource messageSource;
-
-    /**
-     * Gets select options for the Grails Forge
-     *
-     * @return Select Options and their defaults.
-     */
-    @Override
-    @Get(uri = "/", produces = MediaType.APPLICATION_JSON)
-    public SelectOptionsDTO selectOptions(RequestInfo requestInfo) {
-        MessageSource.MessageContext context = MessageSource.MessageContext.of(requestInfo.getLocale());
-        return SelectOptionsDTO.make(messageSource, context);
-    }
-
-    @Singleton
-    static class SelectOptionMessages extends ResourceBundleMessageSource {
-        SelectOptionMessages() {
-            super("select_options");
-        }
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/SelectOptionsOperations.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/SelectOptionsOperations.java
deleted file mode 100644
index 60a5e5e6f7..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/SelectOptionsOperations.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.options;
-
-import org.grails.forge.api.RequestInfo;
-import org.grails.forge.api.SelectOptionsDTO;
-import io.swagger.v3.oas.annotations.Parameter;
-
-public interface SelectOptionsOperations {
-    SelectOptionsDTO selectOptions(@Parameter(hidden = true) RequestInfo serverURL);
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/ServletImplSelectOptions.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/ServletImplSelectOptions.java
deleted file mode 100644
index 159a2d3031..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/options/ServletImplSelectOptions.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.options;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.grails.forge.api.SelectOptionDTO;
-import org.grails.forge.api.ServletImplDTO;
-
-import java.util.List;
-
-@Schema(name = "ServletImplSelectOptions")
-public class ServletImplSelectOptions extends SelectOptionDTO<ServletImplDTO> {
-    public ServletImplSelectOptions(List<ServletImplDTO> options, ServletImplDTO defaultOption) {
-        super(options, defaultOption);
-    }
-
-    @Override
-    public List<ServletImplDTO> getOptions() {
-        return super.getOptions();
-    }
-
-    @Override
-    public ServletImplDTO getDefaultOption() {
-        return super.getDefaultOption();
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java
deleted file mode 100644
index 5f92955ddd..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.preview;
-
-import io.micronaut.context.event.ApplicationEventPublisher;
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.http.HttpStatus;
-import io.micronaut.http.MediaType;
-import io.micronaut.http.annotation.Controller;
-import io.micronaut.http.annotation.Get;
-import io.micronaut.http.exceptions.HttpStatusException;
-import org.grails.forge.api.Relationship;
-import org.grails.forge.api.RequestInfo;
-import org.grails.forge.api.DevelopmentReloading;
-import org.grails.forge.api.create.AbstractCreateController;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.application.Project;
-import org.grails.forge.application.generator.ProjectGenerator;
-import org.grails.forge.io.ConsoleOutput;
-import org.grails.forge.io.MapOutputHandler;
-import org.grails.forge.options.*;
-import org.grails.forge.util.NameUtils;
-import io.swagger.v3.oas.annotations.Parameter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Previews an application contents.
- *
- * @author graemerocher
- * @since 6.0.0
- */
-@Controller("/preview")
-public class PreviewController extends AbstractCreateController implements PreviewOperations {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AbstractCreateController.class);
-
-    /**
-     * Default constructor.
-     *
-     * @param projectGenerator The project generator
-     * @param eventPublisher The event publisher
-     */
-    public PreviewController(ProjectGenerator projectGenerator, ApplicationEventPublisher eventPublisher) {
-        super(projectGenerator, eventPublisher);
-    }
-
-    /**
-     * Previews the contents of a generated application..
-     * @param type The application type The application type
-     * @param name The name of the application The name of the application
-     * @param features The features The chosen features
-     * @param build The build type (optional, defaults to Gradle)
-     * @param reloading the development reloading (jrebel, spring boot devtools, none, etc)
-     * @param gorm The GORM (optional, defaults to Hibernate)
-     * @param servlet The Servlet (optional, defaults to Embedded Tomcat)
-     * @return A preview of the application contents.
-     */
-    @Get(uri = "/{type}/{name}{?features,gorm,servlet,build,reloading,javaVersion}", produces = MediaType.APPLICATION_JSON)
-    @Override
-    public PreviewDTO previewApp(
-            ApplicationType type,
-            String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Parameter(hidden = true) RequestInfo requestInfo) throws IOException {
-        try {
-            Project project = NameUtils.parse(name);
-            MapOutputHandler outputHandler = new MapOutputHandler();
-            projectGenerator.generate(type,
-                    project,
-                    new Options(
-                            reloading != null ? reloading.toDevelopmentReloading() : null,
-                            gorm == null ? GormImpl.DEFAULT_OPTION : gorm,
-                            servlet == null ? ServletImpl.DEFAULT_OPTION : servlet,
-                            javaVersion == null ? JdkVersion.DEFAULT_OPTION : javaVersion,
-                            getOperatingSystem(requestInfo.getUserAgent())),
-                    getOperatingSystem(requestInfo.getUserAgent()),
-                    features == null ? Collections.emptyList() : features,
-                    outputHandler,
-                    ConsoleOutput.NOOP);
-            Map<String, String> contents = outputHandler.getProject();
-            PreviewDTO previewDTO = new PreviewDTO(contents);
-            previewDTO.addLink(Relationship.CREATE, requestInfo.link(Relationship.CREATE, type));
-            previewDTO.addLink(Relationship.SELF, requestInfo.self());
-            return previewDTO;
-        } catch (IllegalArgumentException e) {
-            throw new HttpStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
-        } catch (Exception e) {
-            LOG.error("Error generating application: " + e.getMessage(), e);
-            throw new IOException(e.getMessage(), e);
-        }
-    }
-
-}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewOperations.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewOperations.java
deleted file mode 100644
index e16700b32d..0000000000
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewOperations.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  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.
- */
-package org.grails.forge.api.preview;
-
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
-import io.swagger.v3.oas.annotations.Parameter;
-import org.grails.forge.api.RequestInfo;
-import org.grails.forge.api.DevelopmentReloading;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.options.BuildTool;
-import org.grails.forge.options.GormImpl;
-import org.grails.forge.options.JdkVersion;
-import org.grails.forge.options.ServletImpl;
-
-import java.io.IOException;
-import java.util.List;
-
-public interface PreviewOperations {
-    /**
-     * Previews an application.
-     *
-     * @param type        The application type
-     * @param name        The name of the application
-     * @param features    The features
-     * @param build       The build tool
-     * @param reloading   The development reloading
-     * @param gorm        The GORM
-     * @param servlet     The Servlet
-     * @param javaVersion The java version
-     * @param requestInfo The request info
-     * @return An HTTP response that emits a writable
-     * @throws IOException if an I/O error occurs
-     */
-    PreviewDTO previewApp(
-            @NonNull ApplicationType type,
-            String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable GormImpl gorm,
-            @Nullable ServletImpl servlet,
-            @Nullable JdkVersion javaVersion,
-            @Parameter(hidden = true) RequestInfo requestInfo) throws IOException;
-}
diff --git a/grails-forge/grails-forge-api/src/main/resources/META-INF/native-image/org.grails.forge.api/grails-forge-api/reflect-config.json b/grails-forge/grails-forge-api/src/main/resources/META-INF/native-image/org.grails.forge.api/grails-forge-api/reflect-config.json
deleted file mode 100644
index 68f1ee1fce..0000000000
--- a/grails-forge/grails-forge-api/src/main/resources/META-INF/native-image/org.grails.forge.api/grails-forge-api/reflect-config.json
+++ /dev/null
@@ -1,52 +0,0 @@
-[ {
-  "name" : "org.apache.commons.compress.archivers.zip.AsiExtraField",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.X5455_ExtendedTimestamp",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.X7875_NewUnix",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.JarMarker",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.UnicodePathExtraField",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.Zip64ExtendedInformationExtraField",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.UnicodeCommentExtraField",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.X000A_NTFS",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.X0014_X509Certificates",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.X0015_CertificateIdForFile",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.X0016_CertificateIdForCentralDirectory",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.X0017_StrongEncryptionHeader",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.X0017_StrongEncryptionHeader",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.X0019_EncryptionRecipientCertificateList",
-  "allDeclaredConstructors" : true
-},{
-  "name" : "org.apache.commons.compress.archivers.zip.ResourceAlignmentExtraField",
-  "allDeclaredConstructors" : true
-},{
-  "name":"org.grails.forge.api.preview.PreviewDTO",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-}
-]
\ No newline at end of file
diff --git a/grails-forge/grails-forge-api/src/main/resources/META-INF/native-image/org.grails.forge.api/grails-forge-api/resource-config.json b/grails-forge/grails-forge-api/src/main/resources/META-INF/native-image/org.grails.forge.api/grails-forge-api/resource-config.json
deleted file mode 100644
index b1611ca2f9..0000000000
--- a/grails-forge/grails-forge-api/src/main/resources/META-INF/native-image/org.grails.forge.api/grails-forge-api/resource-config.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "resources": [
-    {"pattern":"\\QMETA-INF/swagger\\E"},
-    {"pattern":".*/swagger/grails-forge-.*yml"},
-    {"pattern":"\\QMETA-INF/swagger/views/rapidoc/index.html\\E"},
-    {"pattern":"\\QMETA-INF/swagger/views/swagger-ui/index.html\\E"}
-  ],
-  "bundles": [
-    {"name":"select_options"}
-  ]
-}
\ No newline at end of file
diff --git a/grails-forge/grails-forge-api/src/main/resources/application.yml b/grails-forge/grails-forge-api/src/main/resources/application.yml
deleted file mode 100644
index f5e07eb247..0000000000
--- a/grails-forge/grails-forge-api/src/main/resources/application.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-jackson:
-  mapper:
-    ACCEPT_CASE_INSENSITIVE_ENUMS: true
-  deserialization:
-    READ_UNKNOWN_ENUM_VALUES_AS_NULL: true
\ No newline at end of file
diff --git a/grails-forge/grails-forge-api/src/main/resources/select_options.properties b/grails-forge/grails-forge-api/src/main/resources/select_options.properties
deleted file mode 100644
index ef0ccf9e8b..0000000000
--- a/grails-forge/grails-forge-api/src/main/resources/select_options.properties
+++ /dev/null
@@ -1 +0,0 @@
-grails.forge.developmentReloading.devtools.description=Dev Tools
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
deleted file mode 100644
index a39d008ecd..0000000000
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ApplicationControllerSpec.groovy
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.api
-
-import io.micronaut.context.annotation.Property
-import io.micronaut.context.i18n.ResourceBundleMessageSource
-import io.micronaut.http.HttpHeaders
-import io.micronaut.http.HttpRequest
-import io.micronaut.http.annotation.Get
-import io.micronaut.http.annotation.Header
-import io.micronaut.http.client.HttpClient
-import io.micronaut.http.client.annotation.Client
-import io.micronaut.test.extensions.spock.annotation.MicronautTest
-import jakarta.inject.Inject
-import jakarta.inject.Singleton
-import spock.lang.Specification
-
-@MicronautTest
-@Property(name = 'grails.forge.redirect-url', value = 'https://example.com/forge/')
-class ApplicationControllerSpec extends Specification {
-
-    @Inject
-    @Client("/")
-    HttpClient client
-
-    @Inject
-    ApplicationTypeClient applicationTypeClient
-
-    @Inject
-    GrailsForgeConfiguration configuration
-
-    void "test versions"() {
-        given:
-        def response = client.toBlocking().retrieve(HttpRequest.GET('/versions'), Map)
-
-        expect:
-        response.containsKey("versions")
-        response.versions["grails.version"]
-    }
-
-    void "test redirect URL configuration"() {
-        expect:
-        configuration.redirectUri.get().toString() == 'https://example.com/forge/'
-    }
-
-    void "test absent redirect URL configuration ignores null"() {
-        given:
-        GrailsForgeConfiguration configuration = new GrailsForgeConfiguration()
-        def before = configuration.redirectUrl
-
-        when:
-        configuration.redirectUrl = null
-
-        then:
-        configuration.redirectUrl == before
-        configuration.redirectUri.present
-    }
-
-    void "test application types"() {
-        when:
-        def types = applicationTypeClient.spanishTypes()
-
-        then:
-        types.types.find { it.name == 'web' }.description == 'Una aplicación web de marco Grails®'
-    }
-
-    @Client('/')
-    static interface ApplicationTypeClient extends ApplicationTypeOperations {
-        @Get("/application-types")
-        @Header(name = HttpHeaders.ACCEPT_LANGUAGE, value = "es")
-        ApplicationTypeList spanishTypes();
-    }
-
-    @Singleton
-    static class Spanish extends ResourceBundleMessageSource {
-
-        Spanish() {
-            super("features", new Locale("es"))
-        }
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ApplicationTypeClient.groovy b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ApplicationTypeClient.groovy
deleted file mode 100644
index 7e253b3a9a..0000000000
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ApplicationTypeClient.groovy
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.api
-
-import io.micronaut.core.annotation.Nullable
-import io.micronaut.http.HttpHeaders
-import io.micronaut.http.annotation.Get
-import io.micronaut.http.annotation.Header
-import io.micronaut.http.client.annotation.Client
-import org.grails.forge.application.ApplicationType
-import org.grails.forge.options.FeatureFilter
-
-@Client('/')
-interface ApplicationTypeClient extends ApplicationTypeOperations {
-
-    @Get("/application-types/{type}/features{?filter*}")
-    @Header(name = HttpHeaders.ACCEPT_LANGUAGE, value = "es")
-    FeatureList spanishFeatures(ApplicationType type,
-                                @Nullable FeatureFilter filter);
-
-    @Get("/application-types/{type}/features/default{?filter*}")
-    @Header(name = HttpHeaders.ACCEPT_LANGUAGE, value = "es")
-    FeatureList spanishDefaultFeatures(ApplicationType type,
-                                       @Nullable FeatureFilter filter);
-}
diff --git a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/CreateClient.groovy b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/CreateClient.groovy
deleted file mode 100644
index 1e57b86aee..0000000000
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/CreateClient.groovy
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.api
-
-import io.micronaut.core.annotation.Nullable
-import io.micronaut.http.HttpResponse
-import io.micronaut.http.annotation.Get
-import io.micronaut.http.client.annotation.Client
-import org.grails.forge.options.BuildTool
-import org.grails.forge.options.Language
-
-@Client('/')
-interface CreateClient {
-    @Get(uri = "/create/web/{name}{?features,build,reloading,lang}", consumes = "application/zip")
-    byte[] createApp(
-            String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable Language lang
-    );
-
-    @Get(uri = "/create/web/{name}{?features,build,reloading,lang}", consumes = "application/zip")
-    HttpResponse<byte[]> createResponse(
-            String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable Language lang
-    );
-
-    @Get(uri = "/{name}.zip{?features,build,reloading,lang}", consumes = "application/zip")
-    HttpResponse<byte[]> getZip(
-            String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable Language lang
-    );
-}
diff --git a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/DiffClient.groovy b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/DiffClient.groovy
deleted file mode 100644
index 12f6662c5c..0000000000
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/DiffClient.groovy
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.api
-
-import io.micronaut.core.annotation.NonNull
-import io.micronaut.core.annotation.Nullable
-import io.micronaut.http.MediaType
-import io.micronaut.http.annotation.Get
-import io.micronaut.http.client.annotation.Client
-import org.grails.forge.application.ApplicationType
-import org.grails.forge.options.BuildTool
-import org.grails.forge.options.JdkVersion
-import org.grails.forge.options.Language
-
-import jakarta.validation.constraints.NotBlank
-import jakarta.validation.constraints.NotNull
-
-@Client('/diff')
-interface DiffClient {
-    @Get(uri = "/{type}/feature/{feature}{?lang,build,reloading,javaVersion,name}",
-            consumes = MediaType.TEXT_PLAIN)
-    String diffFeature(
-            @NotNull ApplicationType type,
-            @Nullable String name,
-            @NotBlank @NonNull String feature,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable Language lang,
-            @Nullable JdkVersion javaVersion);
-
-    @Get(uri = "/{type}/{name}{?features,lang,build,reloading,javaVersion}", consumes = MediaType.TEXT_PLAIN)
-    String diffApp(ApplicationType type,
-                   String name,
-                   @Nullable List<String> features,
-                   @Nullable BuildTool build,
-                   @Nullable DevelopmentReloading reloading,
-                   @Nullable Language lang,
-                   @Nullable JdkVersion javaVersion);
-}
diff --git a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/DiffControllerSpec.groovy b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/DiffControllerSpec.groovy
deleted file mode 100644
index 31dae037d3..0000000000
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/DiffControllerSpec.groovy
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.api
-
-
-import io.micronaut.http.HttpStatus
-import io.micronaut.http.client.exceptions.HttpClientResponseException
-import io.micronaut.test.extensions.spock.annotation.MicronautTest
-import jakarta.inject.Inject
-import org.grails.forge.application.ApplicationType
-import spock.lang.Specification
-
-@MicronautTest
-class DiffControllerSpec extends Specification {
-
-    @Inject
-    DiffClient diffClient
-
-    void 'test diff app'() {
-        when:
-        def result = diffClient.diffApp(
-                ApplicationType.WEB,
-                "test",
-                ["gorm-mongodb"],
-                null,
-                null,
-                null,
-                null
-        )
-
-        then:
-        result.contains('+## Feature gorm-mongodb documentation')
-    }
-
-    void 'test diff feature'() {
-        when:
-        def result = diffClient.diffFeature(
-                ApplicationType.WEB,
-                null,
-                "gorm-mongodb",
-                null,
-                null,
-                null,
-                null
-        )
-
-        then:
-        result.contains('+## Feature gorm-mongodb documentation')
-    }
-
-    void 'test diff invalid feature'() {
-        when:
-        diffClient.diffFeature(
-                ApplicationType.WEB,
-                null,
-                "junkkkkk",
-                null,
-                null,
-                null,
-                null
-        )
-
-        then:
-        def e = thrown(HttpClientResponseException)
-        e.status == HttpStatus.BAD_REQUEST
-        e.getResponse().getBody(Map).get()._embedded.errors[0].message == 'The requested feature does not exist: junkkkkk'
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/FeatureControllerSpec.groovy b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/FeatureControllerSpec.groovy
deleted file mode 100644
index 3967fd42aa..0000000000
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/FeatureControllerSpec.groovy
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.api
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import io.micronaut.http.HttpRequest
-import io.micronaut.http.client.HttpClient
-import io.micronaut.http.client.annotation.Client
-import io.micronaut.test.extensions.spock.annotation.MicronautTest
-import jakarta.inject.Inject
-import org.grails.forge.application.ApplicationType
-import org.grails.forge.options.FeatureFilter
-import org.grails.forge.options.GormImpl
-import org.grails.forge.options.JdkVersion
-import org.grails.forge.options.DevelopmentReloading
-import org.grails.forge.options.ServletImpl
-import spock.lang.Specification
-
-@MicronautTest
-class FeatureControllerSpec extends Specification {
-
-    @Inject
-    ApplicationTypeClient applicationTypeClient
-
-    @Inject
-    @Client("/")
-    HttpClient httpClient
-
-    void 'test list features'() {
-        when:
-        List<FeatureDTO> features = applicationTypeClient
-                .features(ApplicationType.DEFAULT_OPTION,
-                        RequestInfo.LOCAL,
-                        new FeatureFilter(reloading: DevelopmentReloading.DEFAULT_OPTION,
-                        gorm: GormImpl.DEFAULT_OPTION,
-                        servlet: ServletImpl.DEFAULT_OPTION,
-                        javaVersion: JdkVersion.DEFAULT_OPTION)).features
-
-        then:
-        !features.isEmpty()
-    }
-
-    void 'test community features'() {
-        when:
-        List<FeatureDTO> communityFeatures = applicationTypeClient
-                .features(ApplicationType.DEFAULT_OPTION,
-                        RequestInfo.LOCAL,
-                        new FeatureFilter(reloading: DevelopmentReloading.DEFAULT_OPTION,
-                                gorm: GormImpl.DEFAULT_OPTION,
-                                servlet: ServletImpl.DEFAULT_OPTION,
-                                javaVersion: JdkVersion.DEFAULT_OPTION)).features
-                .findAll { it.community }
-
-        then:
-        communityFeatures.isEmpty()
-    }
-
-    void 'test list features - spanish'() {
-        when:
-        List<FeatureDTO> features = applicationTypeClient
-                .spanishFeatures(ApplicationType.DEFAULT_OPTION,
-                        new FeatureFilter(reloading: DevelopmentReloading.DEFAULT_OPTION,
-                                gorm: GormImpl.DEFAULT_OPTION,
-                                servlet: ServletImpl.DEFAULT_OPTION,
-                                javaVersion: JdkVersion.DEFAULT_OPTION)).features
-        def mongoGorm = features.find { it.name == 'asciidoctor' }
-
-        then:
-        mongoGorm.description == 'Agrega soporte para crear documentación de Asciidoctor'
-        !mongoGorm.isPreview()
-        !mongoGorm.isCommunity()
-    }
-
-    void 'test list default features - spanish'() {
-        when:
-        List<FeatureDTO> features = applicationTypeClient
-                .spanishDefaultFeatures(ApplicationType.DEFAULT_OPTION,
-                        new FeatureFilter(reloading: DevelopmentReloading.DEFAULT_OPTION,
-                                gorm: GormImpl.DEFAULT_OPTION,
-                                servlet: ServletImpl.DEFAULT_OPTION,
-                                javaVersion: JdkVersion.DEFAULT_OPTION)).features
-        def assetPipeline = features.find { it.name == 'asset-pipeline-grails' }
-
-        then:
-        assetPipeline.description == 'El activo-Pipeline es un complemento utilizado para administrar y procesar activos estáticos en aplicaciones JVM principalmente a través de Gradle (sin embargo, no es obligatorio). Leer más en https'
-        !assetPipeline.isPreview()
-        !assetPipeline.isCommunity()
-    }
-
-    void 'test list default features for application type'() {
-        when:
-        def features = applicationTypeClient
-                .defaultFeatures(ApplicationType.PLUGIN,
-                        RequestInfo.LOCAL,
-                        new FeatureFilter(reloading: DevelopmentReloading.DEFAULT_OPTION,
-                                gorm: GormImpl.DEFAULT_OPTION,
-                                servlet: ServletImpl.DEFAULT_OPTION,
-                                javaVersion: JdkVersion.DEFAULT_OPTION)).features
-
-        then:
-        !features.any { it.name == 'geb-with-testcontainers' }
-        features.any { it.name == 'gorm-hibernate5' }
-
-        when:
-        features = applicationTypeClient
-                .defaultFeatures(ApplicationType.DEFAULT_OPTION,
-                        RequestInfo.LOCAL,
-                        new FeatureFilter(reloading: DevelopmentReloading.DEFAULT_OPTION,
-                                gorm: GormImpl.DEFAULT_OPTION,
-                                servlet: ServletImpl.DEFAULT_OPTION,
-                                javaVersion: JdkVersion.DEFAULT_OPTION)).features
-
-        then:
-        features.any { it.name == 'geb-with-testcontainers' }
-    }
-
-    void 'test list features for application type'() {
-        when:
-        def features = applicationTypeClient
-                .features(ApplicationType.PLUGIN,
-                        RequestInfo.LOCAL,
-                        new FeatureFilter(reloading: DevelopmentReloading.DEFAULT_OPTION,
-                                gorm: GormImpl.DEFAULT_OPTION,
-                                servlet: ServletImpl.DEFAULT_OPTION,
-                                javaVersion: JdkVersion.DEFAULT_OPTION)).features
-
-        then:
-        !features.any { it.name == 'geb-with-testcontainers' }
-
-        when:
-        features = applicationTypeClient
-                .features(ApplicationType.DEFAULT_OPTION,
-                        RequestInfo.LOCAL,
-                        new FeatureFilter(reloading: DevelopmentReloading.DEFAULT_OPTION,
-                                gorm: GormImpl.DEFAULT_OPTION,
-                                servlet: ServletImpl.DEFAULT_OPTION,
-                                javaVersion: JdkVersion.DEFAULT_OPTION)).features
-
-        then:
-        features.any { it.name == 'gorm-mongodb' }
-    }
-
-    void 'test list features for application type should NOT return default included features'() {
-        when:
-        def features = applicationTypeClient
-                .features(ApplicationType.WEB,
-                        RequestInfo.LOCAL,
-                        new FeatureFilter(reloading: DevelopmentReloading.DEFAULT_OPTION,
-                                gorm: GormImpl.DEFAULT_OPTION,
-                                servlet: ServletImpl.DEFAULT_OPTION,
-                                javaVersion: JdkVersion.DEFAULT_OPTION)).features
-
-        then:
-        !features.any { it.name == 'asset-pipeline-grails' }
-    }
-
-    void "test feature filter - invalid option as query parameter"() {
-        when:
-        String response = httpClient.toBlocking()
-                .exchange(HttpRequest.GET('/application-types/' + ApplicationType.WEB.name + '/features?javaVersion=invalid'), String.class).body()
-
-        then:
-        response
-
-        and:
-        ObjectMapper mapper = new ObjectMapper()
-        def map = mapper.readValue(response, Map)
-
-        map.features.collect { it -> it.name }.find { it == 'gorm-mongodb'}
-    }
-
-    void "test feature filter - Grails Data implementation as query parameter"() {
-        when: 'a valid Grails Data implementation is accepted'
-        String response = httpClient.toBlocking()
-                .exchange(HttpRequest.GET('/application-types/' + ApplicationType.WEB.name + '/features?gorm=hibernate7'), String.class).body()
-
-        then:
-        response
-
-        when: 'the legacy hibernate value is accepted'
-        response = httpClient.toBlocking()
-                .exchange(HttpRequest.GET('/application-types/' + ApplicationType.WEB.name + '/features?gorm=hibernate'), String.class).body()
-
-        then:
-        response
-
-        when: 'an invalid value falls back to the default like other filter options'
-        response = httpClient.toBlocking()
-                .exchange(HttpRequest.GET('/application-types/' + ApplicationType.WEB.name + '/features?gorm=invalid'), String.class).body()
-
-        then:
-        response
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/PreviewClient.groovy b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/PreviewClient.groovy
deleted file mode 100644
index a254b95692..0000000000
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/PreviewClient.groovy
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.api
-
-import io.micronaut.core.annotation.Nullable
-import io.micronaut.http.MediaType
-import io.micronaut.http.annotation.Get
-import io.micronaut.http.client.annotation.Client
-import org.grails.forge.api.preview.PreviewDTO
-import org.grails.forge.application.ApplicationType
-import org.grails.forge.options.BuildTool
-import org.grails.forge.options.Language
-
-@Client('/preview')
-interface PreviewClient  {
-    @Get(uri = "/web/{name}{?features,build,reloading,lang}", consumes = MediaType.APPLICATION_JSON)
-    PreviewDTO previewApp(
-            ApplicationType type,
-            String name,
-            @Nullable List<String> features,
-            @Nullable BuildTool build,
-            @Nullable DevelopmentReloading reloading,
-            @Nullable Language lang
-    );
-}
diff --git a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/PreviewControllerSpec.groovy b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/PreviewControllerSpec.groovy
deleted file mode 100644
index ac2d343d4b..0000000000
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/PreviewControllerSpec.groovy
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.api
-
-
-import io.micronaut.http.HttpStatus
-import io.micronaut.http.client.exceptions.HttpClientResponseException
-import io.micronaut.test.extensions.spock.annotation.MicronautTest
-import jakarta.inject.Inject
-import org.grails.forge.application.ApplicationType
-import org.grails.forge.feature.other.GrailsQuartz
-import spock.lang.Specification
-
-@MicronautTest
-class PreviewControllerSpec extends Specification {
-    @Inject
-    PreviewClient client
-
-    void "test default create app command"() {
-        when:
-        def map = client.previewApp(ApplicationType.DEFAULT_OPTION, "test", Collections.emptyList(), null, null, null)
-
-        then:
-        map.contents.containsKey("build.gradle")
-
-    }
-
-    void "test preview - grails-quartz feature"() {
-        when:
-        def map = client.previewApp(ApplicationType.DEFAULT_OPTION, "test", [GrailsQuartz.FEATURE_NAME], null, null, null)
-
-        then:
-        map.contents['build.gradle'].contains('implementation "org.apache.grails:grails-quartz"')
-    }
-
-    void "test preview - bad feature"() {
-        when:
-        client.previewApp(ApplicationType.DEFAULT_OPTION, "test", ['juikkkk'], null, null, null)
-
-        then:
-        def e = thrown(HttpClientResponseException)
-        e.status == HttpStatus.BAD_REQUEST
-        e.getResponse().getBody(Map).get()._embedded.errors[0].message == 'The requested feature does not exist: juikkkk'
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ZipCreateControllerSpec.groovy b/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ZipCreateControllerSpec.groovy
deleted file mode 100644
index 99922d4a15..0000000000
--- a/grails-forge/grails-forge-api/src/test/groovy/org/grails/forge/api/ZipCreateControllerSpec.groovy
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- *  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.
- */
-
-package org.grails.forge.api
-
-
-import io.micronaut.http.HttpHeaders
-import io.micronaut.http.HttpRequest
-import io.micronaut.http.HttpStatus
-import io.micronaut.http.client.HttpClient
-import io.micronaut.http.client.annotation.Client
-import io.micronaut.http.client.exceptions.HttpClientResponseException
-import io.micronaut.test.extensions.spock.annotation.MicronautTest
-import jakarta.inject.Inject
-import org.grails.forge.options.BuildTool
-import org.grails.forge.options.Language
-import org.grails.forge.util.ZipUtil
-import spock.lang.Specification
-
-@MicronautTest
-class ZipCreateControllerSpec extends Specification {
-
-    @Inject
-    CreateClient client
-
-    @Inject
-    @Client("/")
-    HttpClient httpClient
-
-    @Inject
-    MyEventListener eventListener
-
-    void "test default create app command"() {
-        when:
-        def bytes = client.createApp("test", Collections.emptyList(), null, null, null)
-
-        then:
-        ZipUtil.isZip(bytes)
-        eventListener.fired
-    }
-
-    void "test default create app - bad project name"() {
-        when:
-        client.createApp("tes%*&*t", Collections.emptyList(), null, null, null)
-
-        then:
-        def e = thrown(HttpClientResponseException)
-        e.status == HttpStatus.BAD_REQUEST
-        e.getResponse().getBody(Map).get()._embedded.errors[0].message.contains("name: must match")
-    }
-
-    void "test default create app - missing feature"() {
-        when:
-        client.createApp("test",['junkkkk'], null, null, null)
-
-        then:
-        def e = thrown(HttpClientResponseException)
-        e.status == HttpStatus.BAD_REQUEST
-        e.getResponse().getBody(Map).get()._embedded.errors[0].message.contains("The requested feature does not exist: junkkkk")
-    }
-
-    void "test default create app file name"() {
-        when:
-        def response = client.createResponse("test", Collections.emptyList(), null, null, null)
-        def bytes = response.body()
-
-        then:
-        ZipUtil.isZip(bytes)
-        response.header(HttpHeaders.CONTENT_DISPOSITION).contains("test.zip")
-    }
-
-    void "test get zip"() {
-        when:
-        def response = client.getZip("test", Collections.emptyList(), null, null, null)
-        def bytes = response.body()
-
-        then:
-        ZipUtil.isZip(bytes)
-        response.header(HttpHeaders.CONTENT_DISPOSITION).contains("test.zip")
-    }
-
-    void "test default create app with feature"() {
-        when:
-        def bytes = client.createApp("test", ['gorm-mongodb'], null, null, null)
-
-        then:
-        ZipUtil.containsFileWithContents(bytes, "test/build.gradle", 'mongodb')
-    }
-
-    void "test create app with groovy"() {
-        when:
-        def bytes = client.createApp("test", ['gorm-mongodb'], null, null, Language.GROOVY)
-
-        then:
-        ZipUtil.containsFile(bytes, "test/grails-app/init/test/Application.groovy")
-    }
-
-    void "test create app with spock"() {
-        when:
-        def bytes = client.createApp("test", ['gorm-mongodb'], BuildTool.GRADLE, DevelopmentReloading.DEVTOOLS, Language.GROOVY)
-
-        then:
-        ZipUtil.containsFileWithContents(bytes, "test/build.gradle", "spring-boot-devtools")
-    }
-
-    void "test create app with an invalid Grails Data implementation is rejected"() {
-        when:
-        httpClient.toBlocking()
-                .exchange(HttpRequest.GET('/create/web/test?gorm=invalid'), byte[].class)
-
-        then:
-        def e = thrown(HttpClientResponseException)
-        e.status == HttpStatus.BAD_REQUEST
-
-        when: 'a valid Grails Data implementation is accepted'
-        def response = httpClient.toBlocking()
-                .exchange(HttpRequest.GET('/create/web/test?gorm=hibernate7'), byte[].class)
-
-        then:
-        ZipUtil.isZip(response.body())
-
-        when: 'the legacy hibernate value is accepted'
-        response = httpClient.toBlocking()
-                .exchange(HttpRequest.GET('/create/web/test?gorm=hibernate'), byte[].class)
-
-        then:
-        ZipUtil.isZip(response.body())
-    }
-}
diff --git a/grails-forge/grails-forge-api/src/test/resources/features_es.properties b/grails-forge/grails-forge-api/src/test/resources/features_es.properties
deleted file mode 100644
index 71416bc631..0000000000
--- a/grails-forge/grails-forge-api/src/test/resources/features_es.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-grails.forge.application-types.web.description=Una aplicaci�n web de marco Grails�
-grails.forge.features.asciidoctor.description=Agrega soporte para crear documentaci�n de Asciidoctor
-grails.forge.features.gorm-mongodb.description=Configura Gorm para MongoDB para aplicaciones groovy
-grails.forge.features.asset-pipeline-grails.description=El activo-Pipeline es un complemento utilizado para administrar y procesar activos est�ticos en aplicaciones JVM principalmente a trav�s de Gradle (sin embargo, no es obligatorio). Leer m�s en https
\ No newline at end of file
diff --git a/grails-forge/grails-forge-api/src/test/resources/logback.xml b/grails-forge/grails-forge-api/src/test/resources/logback.xml
deleted file mode 100644
index 5e493cefde..0000000000
--- a/grails-forge/grails-forge-api/src/test/resources/logback.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- encoders are assigned the type
-             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-        <encoder>
-            <pattern>%cyan(%d{HH:mm:ss.SSS}) %gray([%thread]) %highlight(%-5level) %magenta(%logger{36}) - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-    <logger name="io.micronaut.http" level="trace" />
-
-</configuration>
diff --git a/grails-forge/grails-forge-cli/build.gradle b/grails-forge/grails-forge-cli/build.gradle
index 289a353368..0e9bc2196b 100644
--- a/grails-forge/grails-forge-cli/build.gradle
+++ b/grails-forge/grails-forge-cli/build.gradle
@@ -21,20 +21,24 @@ import org.grails.forge.internal.tasks.GenerateManpageAsciidoc
 import org.grails.forge.internal.tasks.PicocliBuildCompletionTask
 
 plugins {
-    id 'groovy'
-    id 'java-library'
     id 'org.apache.grails.buildsrc.properties'
     id 'org.apache.grails.buildsrc.dependency-validator'
+    id 'org.apache.grails.gradle.grails-app'
+    id 'java-test-fixtures' // CliRunner, which the specs here and in test-core run one command bean with
     id 'org.grails.forge.rocker'
     id 'org.apache.grails.buildsrc.compile'
     id 'org.apache.grails.buildsrc.publish'
     id 'org.apache.grails.buildsrc.sbom'
+    id 'org.apache.grails.gradle.grails-code-style'
 }
 
 version = projectVersion
 group = 'org.apache.grails.forge'
 
-apply from: rootProject.layout.projectDirectory.file('../dependencies.gradle')
+grails {
+    // a generator has no developer CLI tier of its own
+    cliAutoProvision = false
+}
 
 sourceSets {
     main {
@@ -64,30 +68,36 @@ configurations {
     }
 }
 
+// the test fixtures serve the specs of this build and are not published with the CLI
+components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { ConfigurationVariantDetails details ->
+    details.skip()
+}
+components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { ConfigurationVariantDetails details ->
+    details.skip()
+}
+
 ext {
+    pomTitle = 'Apache Grails® Application Forge CLI'
+    pomDescription = 'Generates Apache Grails® applications from the command line'
     cliProject = true
+    // the Grails application the launcher starts, and the picocli root command the code generators read
     startMainClass = 'org.grails.forge.cli.Application'
+    rootCommandClass = 'org.grails.forge.cli.ForgeCommand'
     sbomProjectType = org.cyclonedx.model.Component.Type.APPLICATION.name()
+    forgeTestsNeedLocalMaven = true
 }
 
 dependencies {
-    annotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
-    implementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
-    annotationProcessor 'io.micronaut:micronaut-inject-java'
-    testAnnotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
-    testAnnotationProcessor 'io.micronaut:micronaut-inject-java'
-
+    implementation platform("org.apache.grails:grails-bom:$projectVersion")
     generateConfig "info.picocli:picocli-codegen:$picocliVersion"
 
-    annotationProcessor 'io.micronaut:micronaut-graal'
-    annotationProcessor 'io.micronaut:micronaut-inject-java'
-
+    // the generator: the Forge plugin, consumed as an application consumes any Grails plugin
     implementation project(':grails-forge-core')
-    implementation("org.apache.grails.bootstrap:grails-bootstrap:$projectVersion") {
-        exclude group: 'org.apache.grails', module: 'grails-bom'
-        exclude group: 'org.apache.groovy'
-    }
-    compileOnly 'org.apache.groovy:groovy'
+    // the framework of a Grails application without a web server
+    implementation 'org.apache.grails:grails-core'
+    implementation 'org.apache.grails.bootstrap:grails-bootstrap' // grails.codegen.model, for add-property
+    implementation 'org.apache.groovy:groovy'
+
     implementation "com.fizzed:rocker-runtime:$rockerVersion"
     implementation "info.picocli:picocli:$picocliVersion"
     implementation "info.picocli:picocli-shell-jline3:$picocliVersion"
@@ -95,28 +105,24 @@ dependencies {
     // InteractiveShell drives JLine directly, and since the ansi stream install was dropped it also
     // relies on JLine's terminal for virtual-terminal processing; pin it rather than inheriting
     // whatever version picocli-shell-jline3 happens to bring
-    implementation "org.jline:jline:${gradleBomDependencyVersions['jline.version']}"
-    implementation "org.slf4j:slf4j-nop"
-    implementation "org.yaml:snakeyaml"
+    implementation 'org.jline:jline'
+    implementation 'org.yaml:snakeyaml'
+    runtimeOnly 'org.slf4j:slf4j-nop'
 
-    compileOnly 'com.google.code.findbugs:jsr305'
+    // CliRunner, the fixture the specs run one command bean with
+    testFixturesImplementation platform("org.apache.grails:grails-bom:$projectVersion")
+    testFixturesImplementation 'org.apache.groovy:groovy'
+    testFixturesImplementation 'org.springframework:spring-context'
+    testFixturesImplementation "info.picocli:picocli:$picocliVersion"
 
-    testImplementation enforcedPlatform('org.spockframework:spock-bom:2.4-groovy-4.0')
-    testImplementation 'io.micronaut.picocli:micronaut-picocli'
     testImplementation "org.reflections:reflections:$reflectionsVersion"
-    testImplementation "org.testcontainers:spock"
-    if (project.hasProperty('micronautVersion')) {
-        testCompileOnly "io.micronaut:micronaut-inject-groovy:$micronautVersion"
-    }
-
+    testImplementation "org.testcontainers:spock:$testcontainersVersion"
     testImplementation 'org.apache.groovy:groovy'
-    testImplementation "org.spockframework:spock-core", {
+    testImplementation 'org.spockframework:spock-core', {
         exclude group: 'org.apache.groovy', module: 'groovy-all'
     }
-
-    testRuntimeOnly "ch.qos.logback:logback-classic"
-    testRuntimeOnly "org.objenesis:objenesis:$objenesisVersion"
     testImplementation 'org.apache.groovy:groovy-test'
+    testRuntimeOnly 'org.objenesis:objenesis'
 }
 
 rocker {
@@ -124,14 +130,12 @@ rocker {
 }
 
 apply {
-    from rootProject.layout.projectDirectory.file('gradle/groovy-version-pin.gradle')
-    from rootProject.layout.projectDirectory.file('gradle/code-style-config.gradle')
     from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
     from rootProject.layout.projectDirectory.file('gradle/doc-config.gradle')
 }
 
 def generateManpageAsciiDoc = tasks.register('generateManpageAsciiDoc', GenerateManpageAsciidoc) {
-    mainClass = findProperty('startMainClass') as String
+    mainClass = findProperty('rootCommandClass') as String
     classpath.from(configurations.generateConfig, sourceSets.main.runtimeClasspath)
     outputDirectory = layout.buildDirectory.dir('generated-picocli-docs')
 }
@@ -156,12 +160,18 @@ def buildCompletion = tasks.register('buildCompletion', PicocliBuildCompletionTa
 buildCompletion.configure { PicocliBuildCompletionTask it ->
     it.outputDirectory.set(layout.buildDirectory.dir('build-completion'))
     it.classpath.from(sourceSets.main.runtimeClasspath)
-    it.mainClass.set(findProperty('startMainClass'))
+    it.mainClass.set(findProperty('rootCommandClass'))
 }
 
+// The CLI is distributed through the shadow jar of grails-cli and consumed as a library by it and by
+// test-core, so the plain jar keeps its name, and the executable jar Spring Boot would build is not made.
 TaskProvider<Jar> jarTask = tasks.named('jar', Jar)
 jarTask.configure { Jar it ->
+    it.archiveClassifier.set('')
     it.manifest {
         attributes 'Main-Class': project.property('startMainClass')
     }
 }
+tasks.named('bootJar').configure {
+    it.enabled = false
+}
diff --git a/grails-forge/grails-forge-cli/grails-app/conf/application.yml b/grails-forge/grails-forge-cli/grails-app/conf/application.yml
new file mode 100644
index 0000000000..20b79814c8
--- /dev/null
+++ b/grails-forge/grails-forge-cli/grails-app/conf/application.yml
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+---
+# A command line generator: no web server, nothing printed by the framework at startup
+spring:
+    main:
+        web-application-type: none
+        banner-mode: 'off'
+        log-startup-info: false
+logging:
+    level:
+        root: WARN
diff --git a/grails-forge/grails-forge-cli/grails-app/init/org/grails/forge/cli/Application.groovy b/grails-forge/grails-forge-cli/grails-app/init/org/grails/forge/cli/Application.groovy
new file mode 100644
index 0000000000..516ef08142
--- /dev/null
+++ b/grails-forge/grails-forge-cli/grails-app/init/org/grails/forge/cli/Application.groovy
@@ -0,0 +1,83 @@
+/*
+ *  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.
+ */
+package org.grails.forge.cli
+
+import groovy.transform.CompileStatic
+import org.springframework.boot.Banner
+import org.springframework.boot.WebApplicationType
+import org.springframework.boot.bootstrap.BootstrapContext
+import org.springframework.boot.bootstrap.BootstrapRegistry
+import org.springframework.context.annotation.ComponentScan
+
+import grails.boot.GrailsAppBuilder
+import grails.boot.config.GrailsAutoConfiguration
+import grails.util.Environment
+import org.apache.grails.core.plugins.DefaultPluginDiscovery
+import org.apache.grails.core.plugins.PluginDiscovery
+import org.grails.forge.ForgeGrailsPlugin
+import org.grails.plugins.CoreGrailsPlugin
+
+/**
+ * The Forge command line generator as a Grails application: a {@link grails.boot.GrailsApp} without
+ * a web server, hosting the Forge plugin that provides the feature catalogue and the project
+ * generator, and the picocli commands of this package as its own beans.
+ *
+ * <p>The application is assembled by the {@code grails} launcher into one jar with the shell CLI
+ * and the framework modules the shell needs, so the plugins it runs are declared here rather than
+ * discovered on the class path: the core plugin and the Forge plugin, and nothing the shell's
+ * dependencies bring along.</p>
+ */
+@CompileStatic
+@ComponentScan(basePackageClasses = ForgeCommand)
+class Application extends GrailsAutoConfiguration {
+
+    static void main(String[] args) {
+        System.exit(ForgeCli.run(args))
+    }
+
+    /**
+     * The application, ready to run: the specs run the same builder, so what they test is what
+     * {@link #main} runs.
+     *
+     * @return the builder of a Grails application without a web server
+     */
+    static GrailsAppBuilder builder() {
+        if (!Environment.isSystemSet()) {
+            // A generator is not a project under development: without this the environment defaults
+            // to development and the application would watch the user's current directory for
+            // source changes to reload.
+            System.setProperty(Environment.KEY, Environment.PRODUCTION.name)
+        }
+        return new GrailsAppBuilder(Application)
+                .web(WebApplicationType.NONE)
+                .bannerMode(Banner.Mode.OFF)
+                .logStartupInfo(false)
+                .addCommandLineProperties(false)
+                .addBootstrapRegistryInitializer(Application::declarePlugins)
+    }
+
+    private static void declarePlugins(BootstrapRegistry registry) {
+        registry.register(PluginDiscovery, { BootstrapContext context ->
+            DefaultPluginDiscovery discovery = new DefaultPluginDiscovery([CoreGrailsPlugin, ForgeGrailsPlugin] as Class<?>[])
+            discovery.loadPluginsFromClasspath = false
+            discovery
+        } as BootstrapRegistry.InstanceSupplier<PluginDiscovery>)
+    }
+
+}
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/CodeGenConfig.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/CodeGenConfig.groovy
new file mode 100644
index 0000000000..856f61ec5c
--- /dev/null
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/CodeGenConfig.groovy
@@ -0,0 +1,189 @@
+/*
+ *  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.
+ */
+package org.grails.forge.cli
+
+import groovy.transform.CompileStatic
+import org.springframework.context.ApplicationContext
+import org.grails.forge.application.ApplicationType
+import org.grails.forge.feature.AvailableFeatures
+import org.grails.forge.feature.DefaultFeature
+import org.grails.forge.feature.Feature
+import org.grails.forge.feature.FeatureRegistry
+import org.grails.forge.io.ConsoleOutput
+import org.grails.forge.io.FileSystemOutputHandler
+import org.grails.forge.options.JdkVersion
+import org.grails.forge.options.Language
+import org.grails.forge.options.Options
+import org.grails.forge.options.DevelopmentReloading
+import org.yaml.snakeyaml.Yaml
+import java.nio.file.Files
+import java.util.stream.Collectors
+
+@CompileStatic
+class CodeGenConfig {
+
+    private ApplicationType applicationType
+    private String defaultPackage
+    private DevelopmentReloading reloading
+    private Language sourceLanguage
+    private List<String> features
+
+    private boolean legacy
+
+    ApplicationType getApplicationType() {
+        return applicationType
+    }
+
+    void setApplicationType(ApplicationType applicationType) {
+        this.applicationType = applicationType
+    }
+
+    String getDefaultPackage() {
+        return defaultPackage
+    }
+
+    void setDefaultPackage(String defaultPackage) {
+        this.defaultPackage = defaultPackage
+    }
+
+    DevelopmentReloading getReloading() {
+        return reloading
+    }
+
+    void setReloading(DevelopmentReloading reloading) {
+        this.reloading = reloading
+    }
+
+    Language getSourceLanguage() {
+        return sourceLanguage
+    }
+
+    void setSourceLanguage(Language sourceLanguage) {
+        this.sourceLanguage = sourceLanguage
+    }
+
+    List<String> getFeatures() {
+        return features
+    }
+
+    void setFeatures(List<String> features) {
+        this.features = features
+    }
+
+    boolean isLegacy() {
+        return legacy
+    }
+
+    static CodeGenConfig load(ApplicationContext beanContext, ConsoleOutput consoleOutput) {
+        try {
+            return load(beanContext, FileSystemOutputHandler.getDefaultBaseDirectory(), consoleOutput)
+        } catch (IOException e) {
+            return null
+        }
+    }
+
+    static CodeGenConfig load(ApplicationContext beanContext, File directory, ConsoleOutput consoleOutput) {
+
+        File grailsCli = new File(directory, 'grails-forge-cli.yml')
+
+        if (!grailsCli.exists()) {
+            grailsCli = new File(directory, 'grails-cli.yml')
+        }
+
+        if (grailsCli.exists()) {
+            try (InputStream inputStream = Files.newInputStream(grailsCli.toPath())) {
+                Yaml yaml = new Yaml()
+                Map<String, Object> map = new LinkedHashMap<>()
+                Iterable<Object> objects = yaml.loadAll(inputStream)
+                Iterator<Object> i = objects.iterator()
+                if (i.hasNext()) {
+                    while (i.hasNext()) {
+                        Object object = i.next()
+                        if (object instanceof Map) {
+                            map.putAll((Map) object)
+                        }
+                    }
+                }
+                CodeGenConfig codeGenConfig = new CodeGenConfig()
+                if (map.get('applicationType') != null) {
+                    codeGenConfig.setApplicationType(ApplicationType.valueOf(map.get('applicationType').toString().toUpperCase(Locale.ENGLISH).replace('-', '_')))
+                }
+                if (map.get('defaultPackage') != null) {
+                    codeGenConfig.setDefaultPackage(map.get('defaultPackage').toString())
+                }
+                if (map.get('reloading') != null) {
+                    String reloading = map.get('reloading').toString()
+                    codeGenConfig.setReloading(Arrays.stream(DevelopmentReloading.values())
+                            .filter(value -> value.getName().equals(reloading))
+                            .findFirst()
+                            .orElseThrow(() -> new IllegalArgumentException('Unknown development reloading option: ' + reloading)))
+                }
+                if (map.get('sourceLanguage') != null) {
+                    codeGenConfig.setSourceLanguage(Language.valueOf(map.get('sourceLanguage').toString().toUpperCase(Locale.ENGLISH)))
+                }
+                if (map.get('features') instanceof List) {
+                    List<String> features = new ArrayList<>()
+                    for (Object feature : (List<?>) map.get('features')) {
+                        features.add(feature.toString())
+                    }
+                    codeGenConfig.setFeatures(features)
+                }
+
+                if (map.containsKey('testFramework') && !map.containsKey('reloading')) {
+                    codeGenConfig.setReloading(DevelopmentReloading.NONE)
+                }
+
+                if (map.containsKey('profile')) {
+                    codeGenConfig.legacy = true
+                    String profile = map.get('profile').toString()
+                    if (profile.equals('web')) {
+                        codeGenConfig.setApplicationType(ApplicationType.WEB)
+                    } else if (profile.equals('rest-api')) {
+                        codeGenConfig.setApplicationType(ApplicationType.REST_API)
+                    } else if (profile.equals('plugin')) {
+                        codeGenConfig.setApplicationType(ApplicationType.PLUGIN)
+                    } else if (profile.equals('web-plugin')) {
+                        codeGenConfig.setApplicationType(ApplicationType.WEB_PLUGIN)
+                    } else {
+                        return null
+                    }
+
+                    AvailableFeatures availableFeatures = beanContext.getBean(FeatureRegistry)
+                            .availableFeatures(codeGenConfig.getApplicationType())
+
+                    codeGenConfig.setFeatures(availableFeatures.getAllFeatures()
+                            .filter(f -> f instanceof DefaultFeature)
+                            .map { (DefaultFeature) it }
+                            .filter(f -> f.shouldApply(
+                                    codeGenConfig.getApplicationType(),
+                                    new Options(codeGenConfig.getReloading(), JdkVersion.DEFAULT_OPTION),
+                                    new HashSet<>()))
+                            .map(Feature::getName)
+                            .collect(Collectors.toList()))
+
+                    consoleOutput.warning('This project is using Grails Forge CLI v2 but is still using the v1 grails-forge-cli.yml format')
+                    consoleOutput.warning('To replace the configuration with the new format, run `grails update-cli-config`')
+                }
+
+                return codeGenConfig
+            } catch (IOException ignored) { }
+        }
+        return null
+    }
+}
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/CommonOptionsMixin.java b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/CommonOptionsMixin.groovy
similarity index 64%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/CommonOptionsMixin.java
rename to grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/CommonOptionsMixin.groovy
index 9d2d4f1f4c..bf999c5c68 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/CommonOptionsMixin.java
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/CommonOptionsMixin.groovy
@@ -16,18 +16,19 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.grails.forge.cli;
+package org.grails.forge.cli
 
-import io.micronaut.core.annotation.ReflectiveAccess;
-import org.grails.forge.cli.util.GrailsVersionProvider;
-import picocli.CommandLine;
-import picocli.CommandLine.Option;
+import groovy.transform.CompileStatic
+import org.grails.forge.cli.util.GrailsVersionProvider
+import picocli.CommandLine
+import picocli.CommandLine.Option
 
 /**
  * Mixin that adds help, version and other common options to a command. Example usage:
  * <pre>
  * &#064;Command(name = "command")
  * class App {
+
  *     &#064;Mixin
  *     CommonOptionsMixin commonOptions // adds common options to the command
  *
@@ -38,15 +39,14 @@ import picocli.CommandLine.Option;
  * @author Remko Popma
  * @version 1.0
  */
-@CommandLine.Command(mixinStandardHelpOptions = true, versionProvider = GrailsVersionProvider.class)
-@SuppressWarnings("checkstyle:VisibilityModifier")
-public class CommonOptionsMixin {
+@CommandLine.Command(mixinStandardHelpOptions = true, versionProvider = GrailsVersionProvider)
+@SuppressWarnings('checkstyle:VisibilityModifier')
+@CompileStatic
+class CommonOptionsMixin {
 
-    @Option(names = {"-x", "--stacktrace"}, defaultValue = "false", description = "Show full stack trace when exceptions occur.")
-    @ReflectiveAccess
-    public boolean showStacktrace;
+    @Option(names = ['-x', '--stacktrace'], defaultValue = 'false', description = 'Show full stack trace when exceptions occur.')
+    public boolean showStacktrace
 
-    @Option(names = {"-v", "--verbose"}, defaultValue = "false", description = "Create verbose output.")
-    @ReflectiveAccess
-    public boolean verbose;
+    @Option(names = ['-v', '--verbose'], defaultValue = 'false', description = 'Create verbose output.')
+    public boolean verbose
 }
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/ForgeCli.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/ForgeCli.groovy
new file mode 100644
index 0000000000..9a1025c3c8
--- /dev/null
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/ForgeCli.groovy
@@ -0,0 +1,133 @@
+/*
+ *  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.
+ */
+package org.grails.forge.cli
+
+import java.util.function.BiFunction
+import groovy.transform.CompileStatic
+import org.springframework.context.ApplicationContext
+import org.springframework.context.ConfigurableApplicationContext
+import picocli.CommandLine
+import org.grails.forge.cli.command.AddPropertyCommand
+import org.grails.forge.cli.command.BaseCommand
+import org.grails.forge.cli.command.CodeGenCommand
+import org.grails.forge.cli.command.CreateControllerCommand
+import org.grails.forge.cli.command.CreateDomainClassCommand
+import org.grails.forge.cli.command.CreateInterceptorCommand
+import org.grails.forge.cli.command.CreateJobCommand
+import org.grails.forge.cli.command.CreateServiceCommand
+import org.grails.forge.cli.command.CreateTagLibCommand
+import org.grails.forge.io.ConsoleOutput
+
+/**
+ * Runs the Forge CLI against the Grails application {@link Application} starts: builds the picocli
+ * command line from the command beans of the context and executes it, once for a one-shot
+ * invocation or repeatedly for the interactive shell, on the same context.
+ */
+@CompileStatic
+final class ForgeCli {
+
+    /**
+     * Registration point for code-gen commands: they take CodeGenConfig in their constructor and
+     * are not Spring beans, so a new command must be listed here as well as written.
+     */
+    private static final List<Class<? extends CodeGenCommand>> CODE_GEN_COMMANDS = [
+            CreateControllerCommand,
+            CreateServiceCommand,
+            CreateDomainClassCommand,
+            CreateTagLibCommand,
+            CreateInterceptorCommand,
+            CreateJobCommand,
+            AddPropertyCommand
+    ] as List<Class<? extends CodeGenCommand>>
+
+    private static final BiFunction<Throwable, CommandLine, Integer> EXCEPTION_HANDLER = { Throwable e, CommandLine commandLine ->
+        BaseCommand command = commandLine.getCommand()
+        command.err(e.message)
+        if (command.showStacktrace()) {
+            e.printStackTrace(commandLine.err)
+        }
+        return 1
+    } as BiFunction<Throwable, CommandLine, Integer>
+
+    private ForgeCli() {
+    }
+
+    /**
+     * Starts the Grails application, runs the given command line on it, or the interactive shell
+     * when there is none, and closes the application again.
+     *
+     * @param args the command line
+     * @return the exit code
+     */
+    static int run(String... args) {
+        ConfigurableApplicationContext context = Application.builder().run()
+        try {
+            if (args.length == 0) {
+                interactive(context)
+                return 0
+            }
+            return execute(context, args)
+        }
+        finally {
+            context.close()
+        }
+    }
+
+    /**
+     * Executes one command line on a running context, which stays open for the next one.
+     */
+    static int execute(ApplicationContext context, String... args) {
+        boolean noOpConsole = args.length > 0 && args[0].startsWith('update-cli-config')
+        return createCommandLine(context, noOpConsole).execute(args)
+    }
+
+    /**
+     * Runs the interactive shell on a running context until the user leaves it.
+     */
+    static void interactive(ApplicationContext context) {
+        CommandLine commandLine = createCommandLine(context, true)
+        new InteractiveShell(commandLine, { String[] commandArgs -> execute(context, commandArgs) }, EXCEPTION_HANDLER).start()
+    }
+
+    static CommandLine createCommandLine(ApplicationContext context, boolean noOpConsole) {
+        ForgeCommand root = context.getBean(ForgeCommand)
+        CommandLine commandLine = new CommandLine(root, new GrailsPicocliFactory(context))
+        commandLine.executionExceptionHandler = { Exception ex, CommandLine failed, CommandLine.ParseResult parseResult ->
+            EXCEPTION_HANDLER.apply(ex, failed)
+        } as CommandLine.IExecutionExceptionHandler
+        commandLine.usageHelpWidth = 100
+        CodeGenConfig codeGenConfig = CodeGenConfig.load(context, noOpConsole ? ConsoleOutput.NOOP : root)
+        if (codeGenConfig != null) {
+            for (Class<? extends CodeGenCommand> type : CODE_GEN_COMMANDS) {
+                CodeGenCommand command
+                try {
+                    command = type.getConstructor(CodeGenConfig).newInstance(codeGenConfig)
+                }
+                catch (ReflectiveOperationException e) {
+                    throw new IllegalStateException("Unable to create command ${type.name}", e)
+                }
+                if (command.applies()) {
+                    commandLine.addSubcommand(command)
+                }
+            }
+        }
+        return commandLine
+    }
+
+}
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/ForgeCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/ForgeCommand.groovy
new file mode 100644
index 0000000000..fa2c65bdc1
--- /dev/null
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/ForgeCommand.groovy
@@ -0,0 +1,67 @@
+/*
+ *  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.
+ */
+package org.grails.forge.cli
+
+import groovy.transform.CompileStatic
+import org.grails.forge.cli.command.BaseCommand
+import org.grails.forge.cli.command.CreateAppCommand
+import org.grails.forge.cli.command.CreatePluginCommand
+import org.grails.forge.cli.command.CreateRestApiCommand
+import org.grails.forge.cli.command.CreateWebPluginCommand
+import org.grails.forge.cli.command.CreateWebappCommand
+import org.springframework.context.annotation.Scope
+import org.springframework.stereotype.Component
+import picocli.CommandLine
+import java.util.concurrent.Callable
+
+/**
+ * The root command of the Forge CLI: {@code grails-forge-cli}, whose subcommands create applications
+ * and plugins. The code generation commands that apply inside a generated project are added by
+ * {@link ForgeCli} when the current directory holds one.
+ */
+@CommandLine.Command(name = 'grails-forge-cli', description = [
+        'Grails Forge CLI command line interface for generating projects and services.',
+        'Application generation commands are:',
+        '',
+        '*  @|bold create-app|@ @|yellow NAME|@',
+        '*  @|bold create-webapp|@ @|yellow NAME|@',
+        '*  @|bold create-restapi|@ @|yellow NAME|@',
+        '*  @|bold create-plugin|@ @|yellow NAME|@',
+        '*  @|bold create-web-plugin|@ @|yellow NAME|@'
+],
+        synopsisHeading = '@|bold,underline Usage:|@ ',
+        optionListHeading = '%n@|bold,underline Options:|@%n',
+        commandListHeading = '%n@|bold,underline Commands:|@%n',
+        subcommands = [
+                CreateAppCommand,
+                CreateWebappCommand,
+                CreatePluginCommand,
+                CreateWebPluginCommand,
+                CreateRestApiCommand
+        ])
+@Component
+@Scope('prototype')
+@CompileStatic
+class ForgeCommand extends BaseCommand implements Callable<Integer> {
+
+    @Override
+    Integer call() throws Exception {
+        throw new CommandLine.ParameterException(spec.commandLine(), 'No command specified')
+    }
+}
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/GrailsPicocliFactory.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/GrailsPicocliFactory.groovy
new file mode 100644
index 0000000000..335f13f5d0
--- /dev/null
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/GrailsPicocliFactory.groovy
@@ -0,0 +1,59 @@
+/*
+ *  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.
+ */
+package org.grails.forge.cli
+
+import groovy.transform.CompileStatic
+import org.springframework.beans.factory.NoSuchBeanDefinitionException
+import org.springframework.context.ApplicationContext
+import picocli.CommandLine
+
+/**
+ * Builds picocli commands from the beans of the Forge application, falling back to picocli's own
+ * factory for everything that is not a bean (converters, completion candidates).
+ */
+@CompileStatic
+class GrailsPicocliFactory implements CommandLine.IFactory {
+
+    private final CommandLine.IFactory defaultFactory = CommandLine.defaultFactory()
+    private final ApplicationContext beanContext
+
+    /**
+     * Starts the Forge application for the factory, for the picocli code generators run at build
+     * time (the completion script and the man pages) that instantiate the commands with a factory
+     * named on their command line; the application lives as long as that JVM.
+     */
+    GrailsPicocliFactory() {
+        this(Application.builder().run())
+    }
+
+    GrailsPicocliFactory(ApplicationContext beanContext) {
+        this.beanContext = beanContext
+    }
+
+    @Override
+    <K> K create(Class<K> cls) throws Exception {
+        try {
+            return beanContext.getBean(cls)
+        }
+        catch (NoSuchBeanDefinitionException ignored) {
+            return defaultFactory.create(cls)
+        }
+    }
+
+}
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/InteractiveShell.java b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/InteractiveShell.groovy
similarity index 60%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/InteractiveShell.java
rename to grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/InteractiveShell.groovy
index ee8346b00e..7300eb20f0 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/InteractiveShell.java
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/InteractiveShell.groovy
@@ -16,89 +16,90 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.grails.forge.cli;
+package org.grails.forge.cli
 
-import org.jline.reader.EndOfFileException;
-import org.jline.reader.LineReader;
-import org.jline.reader.LineReaderBuilder;
-import org.jline.reader.MaskingCallback;
-import org.jline.reader.ParsedLine;
-import org.jline.reader.UserInterruptException;
-import org.jline.reader.impl.DefaultParser;
-import org.jline.terminal.Terminal;
-import org.jline.terminal.TerminalBuilder;
-import picocli.CommandLine;
-import picocli.shell.jline3.PicocliJLineCompleter;
+import groovy.transform.CompileStatic
+import org.jline.reader.EndOfFileException
+import org.jline.reader.LineReader
+import org.jline.reader.LineReaderBuilder
+import org.jline.reader.MaskingCallback
+import org.jline.reader.ParsedLine
+import org.jline.reader.UserInterruptException
+import org.jline.reader.impl.DefaultParser
+import org.jline.terminal.Terminal
+import org.jline.terminal.TerminalBuilder
+import picocli.CommandLine
+import picocli.shell.jline3.PicocliJLineCompleter
+import java.util.function.BiFunction
+import java.util.function.Consumer
 
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
+import static picocli.CommandLine.Help.Ansi.AUTO
 
-import static picocli.CommandLine.Help.Ansi.AUTO;
+@CompileStatic
+class InteractiveShell {
 
-public class InteractiveShell {
+    private static final String DEFAULT_PROMPT = '@|blue grails>|@ '
 
-    private static final String DEFAULT_PROMPT = "@|blue grails>|@ ";
+    private final CommandLine commandLine
+    private final Consumer<String[]> executor
+    private final BiFunction<Throwable, CommandLine, Integer> onError
+    private final String prompt
 
-    private final CommandLine commandLine;
-    private final Consumer<String[]> executor;
-    private final BiFunction<Throwable, CommandLine, Integer> onError;
-    private final String prompt;
-
-    public InteractiveShell(CommandLine commandLine,
+    InteractiveShell(CommandLine commandLine,
                             Consumer<String[]> executor,
                             BiFunction<Throwable, CommandLine, Integer> onError) {
-        this(commandLine, executor, onError, DEFAULT_PROMPT);
+        this(commandLine, executor, onError, DEFAULT_PROMPT)
     }
 
-    public InteractiveShell(CommandLine commandLine,
+    InteractiveShell(CommandLine commandLine,
                             Consumer<String[]> executor,
                             BiFunction<Throwable, CommandLine, Integer> onError,
                             String prompt) {
-        this.commandLine = commandLine;
-        this.executor = executor;
-        this.onError = onError;
-        this.prompt = prompt;
+        this.commandLine = commandLine
+        this.executor = executor
+        this.onError = onError
+        this.prompt = prompt
     }
 
-    public void start() {
+    void start() {
         try {
-            PicocliJLineCompleter picocliCommands = new PicocliJLineCompleter(commandLine.getCommandSpec());
-            Terminal terminal = TerminalBuilder.terminal();
+            PicocliJLineCompleter picocliCommands = new PicocliJLineCompleter(commandLine.getCommandSpec())
+            Terminal terminal = TerminalBuilder.terminal()
             LineReader reader = LineReaderBuilder.builder()
                     .terminal(terminal)
                     .completer(picocliCommands)
                     .parser(new DefaultParser())
                     .variable(LineReader.LIST_MAX, 50)   // max tab completion candidates
-                    .build();
+                    .build()
 
             // Applied to the command line as well as the prompt, so command help and usage text agree
             // with what the prompt does.
-            CommandLine.Help.Ansi ansi = resolveAnsi(terminal);
-            commandLine.setColorScheme(CommandLine.Help.defaultColorScheme(ansi));
+            CommandLine.Help.Ansi ansi = resolveAnsi(terminal)
+            commandLine.setColorScheme(CommandLine.Help.defaultColorScheme(ansi))
 
-            String ansiPrompt = ansi.string(prompt);
-            String rightPrompt = null;
+            String ansiPrompt = ansi.string(prompt)
+            String rightPrompt = null
 
             // start the shell and process input until the user quits with Ctl-D
-            String line;
+            String line
             while (true) {
                 try {
-                    line = reader.readLine(ansiPrompt, rightPrompt, (MaskingCallback) null, null);
-                    if (line.matches("^\\s*#.*")) {
-                        continue;
+                    line = reader.readLine(ansiPrompt, rightPrompt, (MaskingCallback) null, null)
+                    if (line.matches('^\\s*#.*')) {
+                        continue
                     }
-                    if (line.equals("exit")) {
-                        return;
+                    if (line.equals('exit')) {
+                        return
                     }
-                    ParsedLine pl = reader.getParser().parse(line, 0);
-                    String[] arguments = pl.words().toArray(new String[0]);
-                    executor.accept(arguments);
+                    ParsedLine pl = reader.getParser().parse(line, 0)
+                    String[] arguments = pl.words().toArray(new String[0])
+                    executor.accept(arguments)
                 } catch (UserInterruptException | EndOfFileException e) {
-                    return;
+                    return
                 }
             }
         } catch (Throwable t) {
-            onError.apply(t, commandLine);
+            onError.apply(t, commandLine)
         }
     }
 
@@ -113,13 +114,13 @@ public class InteractiveShell {
      * <p>{@code NO_COLOR} still wins over both, since a user asking for no colour means it.</p>
      */
     private static CommandLine.Help.Ansi resolveAnsi(Terminal terminal) {
-        if (System.getenv("NO_COLOR") != null) {
-            return CommandLine.Help.Ansi.OFF;
+        if (System.getenv('NO_COLOR') != null) {
+            return CommandLine.Help.Ansi.OFF
         }
         if (AUTO.enabled()) {
-            return CommandLine.Help.Ansi.ON;
+            return CommandLine.Help.Ansi.ON
         }
-        boolean terminalRenders = terminal != null && !Terminal.TYPE_DUMB.equals(terminal.getType());
-        return terminalRenders ? CommandLine.Help.Ansi.ON : CommandLine.Help.Ansi.OFF;
+        boolean terminalRenders = terminal != null && !Terminal.TYPE_DUMB.equals(terminal.getType())
+        return terminalRenders ? CommandLine.Help.Ansi.ON : CommandLine.Help.Ansi.OFF
     }
 }
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/AddPropertyCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/AddPropertyCommand.groovy
new file mode 100644
index 0000000000..9e3ecd03fe
--- /dev/null
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/AddPropertyCommand.groovy
@@ -0,0 +1,169 @@
+/*
+ *  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.
+ */
+package org.grails.forge.cli.command
+
+import groovy.transform.CompileStatic
+import grails.codegen.model.AbstractMemberDefinition
+import grails.codegen.model.DomainFieldModifier
+import grails.codegen.model.PropertyDefinition
+import org.grails.forge.util.ThrowingSupplier
+import jakarta.inject.Inject
+import org.grails.forge.cli.CodeGenConfig
+import org.grails.forge.io.ConsoleOutput
+import org.grails.forge.io.FileSystemOutputHandler
+import org.grails.forge.io.OutputHandler
+import picocli.CommandLine.Command
+import picocli.CommandLine.Option
+import picocli.CommandLine.Parameters
+
+/**
+ * CLI command to add a property to an existing domain class.
+ *
+ * @since 7.1
+ */
+@Command(name = AddPropertyCommand.NAME, description = 'Adds a property to an existing domain class')
+@CompileStatic
+class AddPropertyCommand extends CodeGenCommand {
+
+    public static final String NAME = 'add-property'
+
+    @Parameters(index = '0', paramLabel = 'DOMAIN-CLASS',
+            description = 'The name of the domain class (e.g., Book)')
+    String domainClassName
+
+    @Parameters(index = '1', paramLabel = 'PROPERTY:TYPE',
+            description = 'The property specification in name:Type format (e.g., title:String)')
+    String propertySpec
+
+    @Option(names = ['--nullable'], description = 'Mark the property as nullable')
+    boolean nullableFlag
+
+    @Option(names = ['--not-nullable'], description = 'Mark the property as NOT nullable (generates @NotNull)')
+    boolean notNullableFlag
+
+    @Option(names = ['--blank'], description = 'Allow blank values (String properties only)')
+    boolean blankFlag
+
+    @Option(names = ['--not-blank'], description = 'Disallow blank values (generates @NotBlank)')
+    boolean notBlankFlag
+
+    @Option(names = ['--max-size'], description = 'Maximum size constraint (String properties only)')
+    Integer maxSize
+
+    @Option(names = ['--min-size'], description = 'Minimum size constraint (String properties only)')
+    Integer minSize
+
+    @Option(names = ['--constraint-style'], description = 'Constraint style: grails (default), jakarta, or both')
+    String constraintStyle
+
+    private final DomainFieldModifier domainFieldModifier
+
+    @Inject
+    AddPropertyCommand(CodeGenConfig config) {
+        super(config)
+        this.domainFieldModifier = new DomainFieldModifier()
+    }
+
+    AddPropertyCommand(CodeGenConfig config,
+                              ThrowingSupplier<OutputHandler, IOException> outputHandlerSupplier,
+                              ConsoleOutput consoleOutput) {
+        super(config, outputHandlerSupplier, consoleOutput)
+        this.domainFieldModifier = new DomainFieldModifier()
+    }
+
+    @Override
+    boolean applies() {
+        return true
+    }
+
+    @Override
+    Integer call() throws Exception {
+        PropertyDefinition property
+        try {
+            property = PropertyDefinition.parse(propertySpec)
+        } catch (IllegalArgumentException e) {
+            err('Invalid property specification: ' + e.getMessage())
+            return 1
+        }
+
+        if (nullableFlag) {
+            property.setNullable(true)
+        } else if (notNullableFlag) {
+            property.setNullable(false)
+        }
+        if (blankFlag) {
+            property.setBlank(true)
+        } else if (notBlankFlag) {
+            property.setBlank(false)
+        }
+        if (maxSize != null) {
+            property.setMaxSize(maxSize)
+        }
+        if (minSize != null) {
+            property.setMinSize(minSize)
+        }
+        if (constraintStyle != null) {
+            try {
+                property.setConstraintStyle(AbstractMemberDefinition.ConstraintStyle.valueOf(constraintStyle.toUpperCase()))
+            } catch (IllegalArgumentException e) {
+                err('Invalid constraint style: ' + constraintStyle + '. Use: grails, jakarta, or both')
+                return 1
+            }
+        }
+
+        try {
+            property.validate()
+        } catch (IllegalArgumentException e) {
+            err('Invalid property definition: ' + e.getMessage())
+            return 1
+        }
+
+        File projectDir = FileSystemOutputHandler.getDefaultBaseDirectory()
+        File domainFile = domainFieldModifier.findDomainFile(projectDir, domainClassName)
+
+        if (domainFile == null || !domainFile.exists()) {
+            err('Domain class not found: ' + domainClassName)
+            err('Run \'grails create-domain-class ' + domainClassName + '\' first.')
+            return 1
+        }
+
+        if (domainFieldModifier.memberExists(domainFile, property.getName())) {
+            err('Property \'' + property.getName() + '\' already exists in ' + domainClassName)
+            return 1
+        }
+
+        try {
+            domainFieldModifier.addProperty(domainFile, property)
+            out('@|blue ||@ Added property \'' + property.getName() + '\' to ' + getRelativePath(projectDir, domainFile))
+        } catch (Exception e) {
+            err('Failed to add property: ' + e.getMessage())
+            return 1
+        }
+
+        return 0
+    }
+
+    private String getRelativePath(File base, File file) {
+        try {
+            return base.toPath().relativize(file.toPath()).toString()
+        } catch (Exception e) {
+            return file.getAbsolutePath()
+        }
+    }
+}
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/BaseCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/BaseCommand.groovy
new file mode 100644
index 0000000000..33d2a578e4
--- /dev/null
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/BaseCommand.groovy
@@ -0,0 +1,88 @@
+/*
+ *  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.
+ */
+package org.grails.forge.cli.command
+
+import groovy.transform.CompileStatic
+import jakarta.annotation.Nullable
+import org.grails.forge.application.OperatingSystem
+import org.grails.forge.cli.CommonOptionsMixin
+import org.grails.forge.io.ConsoleOutput
+import picocli.CommandLine
+
+@CompileStatic
+class BaseCommand implements ConsoleOutput {
+
+    @CommandLine.Spec
+    protected CommandLine.Model.CommandSpec spec
+
+    @CommandLine.Mixin
+    protected CommonOptionsMixin commonOptions = new CommonOptionsMixin()
+
+    void out(String message) {
+        spec.commandLine().getOut().println(CommandLine.Help.Ansi.AUTO.string(message))
+    }
+
+    void err(String message) {
+        spec.commandLine().getErr().println(CommandLine.Help.Ansi.AUTO.string('@|bold,red | Error|@ ' + message))
+    }
+
+    void warning(String message) {
+        spec.commandLine().getOut().println(CommandLine.Help.Ansi.AUTO.string('@|bold,red | Warning|@ ' + message))
+    }
+
+    @Override
+    void green(String message) {
+        spec.commandLine().getOut().println(CommandLine.Help.Ansi.AUTO.string('@|bold,green ' + message + '|@'))
+    }
+
+    @Override
+    void red(String message) {
+        spec.commandLine().getOut().println(CommandLine.Help.Ansi.AUTO.string('@|bold,red ' + message + '|@'))
+    }
+
+    boolean showStacktrace() {
+        return commonOptions.showStacktrace
+    }
+
+    boolean verbose() {
+        return commonOptions.verbose
+    }
+
+    @Nullable
+    OperatingSystem getOperatingSystem() {
+        String osName = System.getProperty('os.name', '').toLowerCase(Locale.ENGLISH)
+        if (osName.contains('mac') || osName.contains('darwin')) {
+            final String osArch = System.getProperty('os.arch', '').toLowerCase(Locale.ENGLISH)
+            if (osArch.equals('aarch64')) {
+                return OperatingSystem.MACOS_ARCH64
+            } else {
+                return OperatingSystem.MACOS
+            }
+        } else if (osName.contains('linux')) {
+            return OperatingSystem.LINUX
+        } else if (osName.contains('win')) {
+            return OperatingSystem.WINDOWS
+        } else if (osName.contains('sunos') || osName.contains('solaris')) {
+            return OperatingSystem.SOLARIS
+        } else {
+            return null
+        }
+    }
+
+}
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CodeGenCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CodeGenCommand.groovy
new file mode 100644
index 0000000000..354919eb63
--- /dev/null
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CodeGenCommand.groovy
@@ -0,0 +1,118 @@
+/*
+ *  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.
+ */
+package org.grails.forge.cli.command
+
+import groovy.transform.CompileStatic
+import org.grails.forge.util.ThrowingSupplier
+import org.grails.forge.application.Project
+import org.grails.forge.cli.CodeGenConfig
+import org.grails.forge.io.ConsoleOutput
+import org.grails.forge.io.FileSystemOutputHandler
+import org.grails.forge.io.OutputHandler
+import org.grails.forge.template.TemplateRenderer
+import org.grails.forge.util.NameUtils
+import picocli.CommandLine
+import java.util.concurrent.Callable
+
+@CompileStatic
+abstract class CodeGenCommand extends BaseCommand implements Callable<Integer> {
+
+    protected final CodeGenConfig config
+
+    @CommandLine.Option(names = ['-f', '--force'], description = 'Whether to overwrite existing files')
+    protected boolean overwrite
+
+    private final ThrowingSupplier<OutputHandler, IOException> outputHandlerSupplier
+    private final ConsoleOutput consoleOutput
+
+    CodeGenCommand(CodeGenConfig config) {
+        this.config = config
+        this.outputHandlerSupplier = () -> new FileSystemOutputHandler(FileSystemOutputHandler.getDefaultBaseDirectory(), this)
+        this.consoleOutput = null
+    }
+
+    CodeGenCommand(CodeGenConfig config,
+                          ThrowingSupplier<OutputHandler, IOException> outputHandlerSupplier,
+                          ConsoleOutput consoleOutput) {
+        this.config = config
+        this.outputHandlerSupplier = outputHandlerSupplier
+        this.consoleOutput = consoleOutput
+    }
+
+    abstract boolean applies()
+
+    protected Project getProject(String name) {
+        if (name.indexOf('-') > -1) {
+            name = NameUtils.getNameFromScript(name)
+        }
+        if (config != null && config.getDefaultPackage() != null && name.indexOf('.') == -1) {
+            return NameUtils.parse(config.getDefaultPackage() + '.' + name)
+        } else {
+            return NameUtils.parse(name)
+        }
+    }
+
+    protected TemplateRenderer getTemplateRenderer(Project project) throws IOException {
+        return TemplateRenderer.create(project, outputHandlerSupplier.get())
+    }
+
+    protected TemplateRenderer getTemplateRenderer() throws IOException {
+        return TemplateRenderer.create(outputHandlerSupplier.get())
+    }
+
+    protected <T extends CodeGenCommand> T getCommand(Class<T> clazz) {
+        T bean
+        try {
+            bean = clazz.getConstructor(CodeGenConfig).newInstance(config)
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalStateException('Unable to create command ' + clazz.getName(), e)
+        }
+        bean.overwrite = overwrite
+        bean.spec = spec
+        bean.commonOptions = commonOptions
+        return bean
+    }
+
+    @Override
+    void out(String message) {
+        if (consoleOutput == null) {
+            super.out(message)
+        } else {
+            consoleOutput.out(message)
+        }
+    }
+
+    @Override
+    void err(String message) {
+        if (consoleOutput == null) {
+            super.err(message)
+        } else {
+            consoleOutput.err(message)
+        }
+    }
+
+    @Override
+    void warning(String message) {
+        if (consoleOutput == null) {
+            super.warning(message)
+        } else {
+            consoleOutput.warning(message)
+        }
+    }
+}
diff --git a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/CreateAppCommand.java b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateAppCommand.groovy
similarity index 52%
rename from grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/CreateAppCommand.java
rename to grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateAppCommand.groovy
index 34c2ce476d..a23e244ebc 100644
--- a/grails-forge/grails-forge-cli/src/main/java/org/grails/forge/cli/command/CreateAppCommand.java
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateAppCommand.groovy
@@ -16,39 +16,38 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.grails.forge.cli.command;
+package org.grails.forge.cli.command
 
-import io.micronaut.context.annotation.Prototype;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.ReflectiveAccess;
-import org.grails.forge.application.ApplicationType;
-import org.grails.forge.application.ContextFactory;
-import org.grails.forge.application.WebAvailableFeatures;
-import org.grails.forge.application.generator.ProjectGenerator;
-import picocli.CommandLine;
+import groovy.transform.CompileStatic
+import org.springframework.context.annotation.Scope
+import org.springframework.stereotype.Component
+import jakarta.annotation.Nonnull
+import org.grails.forge.application.ApplicationType
+import org.grails.forge.application.ContextFactory
+import org.grails.forge.application.WebAvailableFeatures
+import org.grails.forge.application.generator.ProjectGenerator
+import picocli.CommandLine
 
-import java.util.ArrayList;
-import java.util.List;
+@CommandLine.Command(name = CreateAppCommand.NAME, description = 'Creates an application')
+@Component
+@Scope('prototype')
+@CompileStatic
+class CreateAppCommand extends CreateCommand {
 
-@CommandLine.Command(name = CreateAppCommand.NAME, description = "Creates an application")
-@Prototype
-public class CreateAppCommand extends CreateCommand {
+    public static final String NAME = 'create-app'
 
-    public static final String NAME = "create-app";
+    @CommandLine.Option(names = ['-f', '--features'], paramLabel = 'FEATURE', split = ',', description = 'The features to use. Possible values: ${COMPLETION-CANDIDATES}', completionCandidates = WebAvailableFeatures)
+    List<String> features = new ArrayList<>()
 
-    @CommandLine.Option(names = {"-f", "--features"}, paramLabel = "FEATURE", split = ",", description = "The features to use. Possible values: ${COMPLETION-CANDIDATES}", completionCandidates = WebAvailableFeatures.class)
-    @ReflectiveAccess
-    List<String> features = new ArrayList<>();
-
-    public CreateAppCommand(WebAvailableFeatures availableFeatures,
+    CreateAppCommand(WebAvailableFeatures availableFeatures,
                             ContextFactory contextFactory,
                             ProjectGenerator projectGenerator) {
-        super(availableFeatures, contextFactory, ApplicationType.WEB, projectGenerator);
+        super(availableFeatures, contextFactory, ApplicationType.WEB, projectGenerator)
     }
 
-    @NonNull
+    @Nonnull
     @Override
     protected List<String> getSelectedFeatures() {
-        return features;
+        return features
     }
 }
diff --git a/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateCommand.groovy b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateCommand.groovy
new file mode 100644
index 0000000000..4c6897ad0a
--- /dev/null
+++ b/grails-forge/grails-forge-cli/src/main/groovy/org/grails/forge/cli/command/CreateCommand.groovy
@@ -0,0 +1,126 @@
+/*
... 36923 lines suppressed ...


(grails-core) 01/07: Honour grails.native2ascii in a plugin's build script

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit ba940ec4152cc8e262599f3c573654b4a352eaed
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Oct 7 10:14:12 2026 -0400

    Honour grails.native2ascii in a plugin's build script
    
    GrailsPluginGradlePlugin registered a whenTaskAdded hook while being applied, which realized every
    task, processResources among them, before the build script had run; grails.native2ascii set in a
    plugin's build script was therefore ignored and its message bundles were escaped regardless. The
    hook is a configureEach now, and a TestKit spec builds a plugin that switches the escaping off.
---
 .../plugin/core/GrailsPluginGradlePlugin.groovy    | 11 +++---
 ...GrailsPluginGradlePluginNative2AsciiSpec.groovy | 43 ++++++++++++++++++++++
 .../plugin-native2ascii-off/build.gradle           |  8 ++++
 .../plugin-native2ascii-off/gradle.properties      |  1 +
 .../grails-app/conf/application.yml                |  0
 .../plugin-native2ascii-off/settings.gradle        |  1 +
 .../resources/templates/messages_ru.properties     | 19 ++++++++++
 7 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy
index a015d0dadd..082deb7623 100644
--- a/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy
+++ b/grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy
@@ -199,11 +199,12 @@ class GrailsPluginGradlePlugin extends GrailsGradlePlugin {
             it.classpath += sourceSets.ast.output
         }
 
-        taskContainer.whenTaskAdded {
-            if (it.name == 'compileWebappGroovyPages') {
-                it.configure {
-                    it.dependsOn(copyAstClasses)
-                }
+        // configureEach, not whenTaskAdded: the eager hook realizes every registered task at this point,
+        // processResources among them, and the resource processing then reads the grails extension
+        // before the build script has configured it (native2ascii, for one)
+        taskContainer.configureEach { Task task ->
+            if (task.name == 'compileWebappGroovyPages') {
+                task.dependsOn(copyAstClasses)
             }
         }
 
diff --git a/grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePluginNative2AsciiSpec.groovy b/grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePluginNative2AsciiSpec.groovy
new file mode 100644
index 0000000000..364c29c9df
--- /dev/null
+++ b/grails-gradle/plugins/src/test/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePluginNative2AsciiSpec.groovy
@@ -0,0 +1,43 @@
+/*
+ *  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.
+ */
+package org.grails.gradle.plugin.core
+
+import org.gradle.testkit.runner.GradleRunner
+
+/**
+ * The resource processing of a plugin project reads the grails extension when the task is configured, so
+ * the extension must not be read before the build script has run. The plugin once realized every task
+ * while it was applied, and {@code native2ascii = false} in the build script was read too late.
+ */
+class GrailsPluginGradlePluginNative2AsciiSpec extends GradleSpecification {
+
+    def "native2ascii = false keeps a plugin's resource bundles as written"() {
+        given:
+        GradleRunner runner = setupTestResourceProject('plugin-native2ascii-off')
+
+        when:
+        def result = executeTask('processResources')
+
+        then:
+        assertTaskSuccess('processResources', result)
+        new File(runner.projectDir, 'build/resources/main/templates/messages_ru.properties')
+                .getText('UTF-8')
+                .contains('welcome.title=Добро пожаловать в Grails')
+    }
+}
diff --git a/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/build.gradle b/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/build.gradle
new file mode 100644
index 0000000000..f79cea2f65
--- /dev/null
+++ b/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/build.gradle
@@ -0,0 +1,8 @@
+plugins {
+    id 'org.apache.grails.gradle.grails-plugin'
+}
+
+// A plugin shipping message bundles as templates: they must reach the jar as written, not escaped
+grails {
+    native2ascii = false
+}
diff --git a/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/gradle.properties b/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/gradle.properties
new file mode 100644
index 0000000000..35c332fb87
--- /dev/null
+++ b/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/gradle.properties
@@ -0,0 +1 @@
+grailsVersion=__PROJECT_VERSION__
diff --git a/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/grails-app/conf/application.yml b/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/grails-app/conf/application.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/settings.gradle b/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/settings.gradle
new file mode 100644
index 0000000000..01e37b7a7c
--- /dev/null
+++ b/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'test-plugin-native2ascii'
diff --git a/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/src/main/resources/templates/messages_ru.properties b/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/src/main/resources/templates/messages_ru.properties
new file mode 100644
index 0000000000..73e1f4baf4
--- /dev/null
+++ b/grails-gradle/plugins/src/test/resources/test-projects/plugin-native2ascii-off/src/main/resources/templates/messages_ru.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+welcome.title=Добро пожаловать в Grails


(grails-core) 02/07: Move the Forge build conventions into build-logic

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e1131ca72e7d4f9a0c8c2444a7772e507f67df9a
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Oct 7 10:14:14 2026 -0400

    Move the Forge build conventions into build-logic
    
    The Forge buildSrc becomes convention plugins and task types of build-logic, as the rest of the
    repository's build logic is: the Rocker template compilation plugin, which hands the generated
    sources to the Groovy source set for joint compilation where the groovy plugin is applied, the
    shadow jar transformers for the Groovy extension modules and the license and notice files, and the
    picocli completion, manpage and version-info task types. The Rocker, ANTLR and shadow versions
    they need are pinned with the repository's other build tooling versions.
    
    Co-authored-by: James Fredley <ja...@users.noreply.github.com>
---
 build-logic/plugins/build.gradle                   |   9 +
 .../buildsrc/WriteGrailsVersionInfoTask.groovy     | 106 +++++++++
 .../GrailsGroovyExtensionTransformer.groovy        | 141 +++++++++++
 .../shadowjar/GrailsShadowLicenseTransform.groovy  | 265 +++++++++++++++++++++
 .../shadowjar/GrailsShadowNoticeTransform.groovy   |  45 ++++
 .../internal/tasks/GenerateManpageAsciidoc.java    |  68 ++++++
 .../internal/tasks/PicocliBuildCompletionTask.java |  63 +++++
 .../forge/rocker/plugin/JavaGeneratorRunnable.java | 166 +++++++++++++
 .../forge/rocker/plugin/RockerConfiguration.java   |  99 ++++++++
 .../forge/rocker/plugin/RockerGradleException.java |  34 +++
 .../grails/forge/rocker/plugin/RockerPlugin.java   | 100 ++++++++
 .../rocker/plugin/RockerSourceSetProperty.java     |  80 +++++++
 .../org/grails/forge/rocker/plugin/RockerTask.java | 186 +++++++++++++++
 .../forge/rocker/plugin/TemplateDirectorySet.java  | 124 ++++++++++
 .../forge/rocker/plugin/WhitespaceProcessor.java   |  52 ++++
 .../buildsrc/WriteGrailsVersionInfoTaskSpec.groovy |  52 ++++
 gradle.properties                                  |   5 +
 17 files changed, 1595 insertions(+)

diff --git a/build-logic/plugins/build.gradle b/build-logic/plugins/build.gradle
index b440fce8ee..bc257cb2a3 100644
--- a/build-logic/plugins/build.gradle
+++ b/build-logic/plugins/build.gradle
@@ -45,6 +45,11 @@ dependencies {
     implementation gradleBomDependencies['asm']
     // validateBomProperties reads BOM POMs with Maven's own model, as ExtractDependenciesTask in docs-core does
     implementation "org.apache.maven:maven-model:${gradleBomDependencyVersions['maven-model.version']}"
+    // Forge build conventions: the Rocker template compiler behind org.grails.forge.rocker and the
+    // shadow transformers that assemble the grails CLI distribution
+    implementation "com.fizzed:rocker-compiler:${gradleProperties.rockerVersion}"
+    implementation "org.antlr:antlr4-runtime:${gradleProperties.antlr4Version}"
+    implementation "com.gradleup.shadow:shadow-gradle-plugin:${gradleProperties.shadowVersion}"
 
     testImplementation "org.spockframework:spock-core:${gradleBomDependencyVersions['gradle-spock.version']}"
     testImplementation gradleTestKit()
@@ -143,5 +148,9 @@ gradlePlugin {
             id = 'org.apache.grails.buildsrc.agent-skills'
             implementationClass = 'org.apache.grails.buildsrc.AgentSkillsPlugin'
         }
+        register('forgeRockerPlugin') {
+            id = 'org.grails.forge.rocker'
+            implementationClass = 'org.grails.forge.rocker.plugin.RockerPlugin'
+        }
     }
 }
diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTask.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTask.groovy
new file mode 100644
index 0000000000..5e8a1d16db
--- /dev/null
+++ b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTask.groovy
@@ -0,0 +1,106 @@
+/*
+ *  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.
+ */
+
+package org.apache.grails.buildsrc
+
+import groovy.transform.CompileStatic
+import groovy.xml.XmlSlurper
+import groovy.xml.slurpersupport.GPathResult
+import groovy.xml.slurpersupport.NodeChild
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.model.ObjectFactory
+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.OutputDirectories
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+import org.xml.sax.SAXException
+
+import javax.inject.Inject
+import javax.xml.parsers.ParserConfigurationException
+import java.nio.charset.StandardCharsets
+import java.nio.file.Files
+
+@CompileStatic
+@CacheableTask
+abstract class WriteGrailsVersionInfoTask extends DefaultTask {
+
+    @Input
+    final Property<String> projectVersion
+
+    @InputFile
+    @PathSensitive(PathSensitivity.RELATIVE)
+    final RegularFileProperty bomPublicationFile
+
+    @OutputDirectory
+    final DirectoryProperty versionsDirectory
+
+    @Inject
+    WriteGrailsVersionInfoTask(ObjectFactory objects, Project project) {
+        projectVersion = objects.property(String).convention(project.provider {
+            project.version as String
+        })
+        bomPublicationFile = objects.fileProperty()
+        versionsDirectory = objects.directoryProperty()
+    }
+
+    @TaskAction
+    void writeVersionInfo() {
+        File versionsDirectory = versionsDirectory.get().asFile
+        if (versionsDirectory.exists()) {
+            versionsDirectory.deleteDir()
+        }
+        versionsDirectory.mkdirs()
+
+        File versions = new File(versionsDirectory, 'grails-versions.properties')
+
+        File pomFile = bomPublicationFile.get().asFile
+
+        GPathResult pom = null
+        try {
+            pom = new XmlSlurper().parse(pomFile)
+        } catch (IOException | SAXException | ParserConfigurationException e) {
+            throw new GradleException("Unable to parse BOM publication file: ${pomFile.absolutePath}", e)
+        }
+
+        TreeMap<String, String> props = []
+        props.put("grails.version", getProjectVersion().get())
+        ((GPathResult) pom.getProperty("properties")).children().forEach(child -> {
+            NodeChild node = (NodeChild) child
+            props.put(node.name(), node.text())
+        })
+
+        try (OutputStream out = Files.newOutputStream(versions.toPath())) {
+            for (Map.Entry<String, String> entry : props.entrySet()) {
+                getLogger().info("Writing version property: {} => {}", entry.getKey(), entry.getValue())
+                String line = "${entry.getKey()}=${entry.getValue()}\n" as String
+                out.write(line.getBytes(StandardCharsets.ISO_8859_1))
+            }
+        }
+    }
+}
diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsGroovyExtensionTransformer.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsGroovyExtensionTransformer.groovy
new file mode 100644
index 0000000000..7833ff584a
--- /dev/null
+++ b/build-logic/plugins/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsGroovyExtensionTransformer.groovy
@@ -0,0 +1,141 @@
+/*
+ *  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.
+ */
+package org.apache.grails.forge.buildlogic.shadowjar
+
+import java.nio.charset.StandardCharsets
+import java.time.LocalDate
+import java.time.ZoneOffset
+import java.util.regex.Pattern
+
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
+import groovy.transform.CompileStatic
+import org.apache.tools.zip.ZipEntry
+import org.apache.tools.zip.ZipOutputStream
+import org.gradle.api.file.FileTreeElement
+
+/**
+ * Based on com.github.jengelman.gradle.plugins.shadow.transformers.GroovyExtensionModuleTransformer but with
+ * reproducible property file support
+ */
+@CompileStatic
+class GrailsGroovyExtensionTransformer implements Transformer {
+
+    private static final String GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH = 'META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule'
+
+    private static final String MODULE_NAME_KEY = 'moduleName'
+    private static final String MODULE_VERSION_KEY = 'moduleVersion'
+    private static final String EXTENSION_CLASSES_KEY = 'extensionClasses'
+    private static final String STATIC_EXTENSION_CLASSES_KEY = 'staticExtensionClasses'
+
+    private static final String MERGED_MODULE_NAME = 'MergedByGrailsShadowJar'
+    private static final String MERGED_MODULE_VERSION = '1.0.0'
+
+    private final Properties module = new Properties()
+
+    @Override
+    boolean canTransformResource(FileTreeElement element) {
+        def path = element.relativePath.pathString
+        path == GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH
+    }
+
+    @Override
+    void transform(TransformerContext context) {
+        def props = new Properties()
+        props.load(context.is)
+        props.entrySet().each { Map.Entry<Object, Object> entry ->
+            String key = entry.key as String
+            String value = entry.value as String
+            switch (key) {
+                case MODULE_NAME_KEY:
+                    handle(key, value) {
+                        module.setProperty(key, MERGED_MODULE_NAME)
+                    }
+                    break
+                case MODULE_VERSION_KEY:
+                    handle(key, value) {
+                        module.setProperty(key, MERGED_MODULE_VERSION)
+                    }
+                    break
+                case [EXTENSION_CLASSES_KEY, STATIC_EXTENSION_CLASSES_KEY]:
+                    handle(key, value) { String existingValue ->
+                        def newValue = "${existingValue},${value}"
+                        module.setProperty(key, newValue)
+                    }
+                    break
+            }
+        }
+    }
+
+    private handle(String key, String value, Closure mergeValue) {
+        def existingValue = module.getProperty(key)
+        if (existingValue) {
+            mergeValue(existingValue)
+        } else {
+            module.setProperty(key, value)
+        }
+    }
+
+    @Override
+    boolean hasTransformedResource() {
+        return module.size() > 0
+    }
+
+    @Override
+    void modifyOutputStream(ZipOutputStream os, boolean preserveFileTimestamps) {
+        ZipEntry entry = new ZipEntry(GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH)
+        entry.time = TransformerContext.getEntryTimestamp(preserveFileTimestamps, entry.time)
+        os.putNextEntry(entry)
+
+        os.write()
+        try (InputStream inputStream = toInputStream(module)) {
+            inputStream.transferTo(os)
+        }
+        os.closeEntry()
+    }
+
+    private static InputStream toInputStream(Properties props) {
+        def baos = new ByteArrayOutputStream()
+        props.store(baos, null)
+        return makePropertiesOutputReproducible(baos)
+    }
+
+    // Inlined from grails-gradle-common PropertyFileUtils so build-logic does not
+    // depend on grails-gradle (that included build already uses these plugins).
+    private static final Pattern TIME_REGEX = ~'^#(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)(?:,|\\s).*$'
+
+    private static InputStream makePropertiesOutputReproducible(ByteArrayOutputStream propertyOutputStream) {
+        List<String> lines = propertyOutputStream.toString(StandardCharsets.ISO_8859_1.name()).readLines()
+        ByteArrayOutputStream toWrite = new ByteArrayOutputStream()
+        toWrite.withWriter(StandardCharsets.ISO_8859_1.name()) { Writer writer ->
+            BufferedWriter bufferedWriter = new BufferedWriter(writer)
+            String sourceDateEpoch = System.getenv('SOURCE_DATE_EPOCH') ?:
+                    LocalDate.now(ZoneOffset.UTC).atStartOfDay(ZoneOffset.UTC).toEpochSecond().toString()
+            boolean dateReplaced = false
+            lines.each { String line ->
+                if (!dateReplaced && TIME_REGEX.matcher(line).matches()) {
+                    dateReplaced = true
+                    bufferedWriter.writeLine("# SOURCE_DATE_EPOCH = $sourceDateEpoch")
+                    return
+                }
+                bufferedWriter.writeLine(line)
+            }
+            bufferedWriter.flush()
+        }
+        new ByteArrayInputStream(toWrite.toByteArray())
+    }
+}
diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowLicenseTransform.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowLicenseTransform.groovy
new file mode 100644
index 0000000000..90898120ba
--- /dev/null
+++ b/build-logic/plugins/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowLicenseTransform.groovy
@@ -0,0 +1,265 @@
+/*
+ *  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.
+ */
+package org.apache.grails.forge.buildlogic.shadowjar
+
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
+import groovy.transform.CompileDynamic
+import groovy.transform.CompileStatic
+import org.apache.tools.zip.ZipEntry
+import org.apache.tools.zip.ZipOutputStream
+import org.gradle.api.file.FileTreeElement
+import org.gradle.api.tasks.Input
+
+import java.util.regex.Pattern
+
+/**
+ * This transformer assists in combining all known licenses into a single META-INF/LICENSE file. Please note that the
+ * shadow plugin will initially copy all dependencies that are in the local project and then it will copy all other external
+ * dependencies. Transformers only apply to the copied jar file dependencies, and not to the local project dependencies.
+ */
+@CompileStatic
+class GrailsShadowLicenseTransform implements Transformer {
+
+    private static final List<Pattern> LICENSE_PATTERNS = [
+            ~'(?i)META-INF/[^/]*LICENSE[^/]*',
+            ~'(?i)META-INF/LICENSES/.*',
+            ~'(?i)[^/]*LICENSE[^/]*',
+            ~'(?i)LICENSES/.*'
+    ]
+
+    private static final String LICENSE_PATH = 'META-INF/LICENSE'
+
+    private LinkedHashMap<String, LicenseHolder> licenses = [:]
+
+    @Input
+    String licenseAppendixEnding = 'LIMITATIONS UNDER THE LICENSE.'
+
+    @Input
+    String licenseTermsEnding = 'END OF TERMS AND CONDITIONS'
+
+    @Input
+    String licenseTermsStart = 'APACHE LICENSE VERSION 2.0'
+
+    @Input
+    String licenseText // to be loaded by file
+
+    @Input
+    Boolean separators = false
+
+    /**
+     * Whether this transformer can process the given resource. If set to true, it's expected the transformer will
+     * write the resource.
+     */
+    @Override
+    boolean canTransformResource(FileTreeElement element) {
+        def path = element.relativePath.pathString
+        LICENSE_PATTERNS.any { pattern -> pattern.matcher(path).matches() }
+    }
+
+    /**
+     * Parses any file that matches the license patterns and extracts the license text, deduplicating & combining where
+     * possible.
+     *
+     * @param context contains the input stream of the resource to transform
+     */
+    @Override
+    // Multiple assignments without list expressions on the right hand side are unsupported in static type checking mode
+    @CompileDynamic
+    void transform(TransformerContext context) {
+        if (!licenses) {
+            // Add our license as previously seen so we can dedupe - this transformer only applies to the copy of other jars
+            def (grailsLicense, grailsIndexMappings) = normalize(licenseText)
+            licenses[grailsLicense] = new LicenseHolder(license: licenseText, indexMappings: grailsIndexMappings)
+        }
+
+        context.is.withReader {
+            BufferedReader reader = new BufferedReader(it)
+
+            def license = stripJavaBlockComment(reader.text)
+            def (String normalized, List<Integer> indexMappings) = normalize(license)
+
+            // resect Apache License
+            String resected = resectLicense(license, normalized, indexMappings)
+            if (!resected.trim()) {
+                return // only contained duplicated license terms with the ASF license
+            }
+
+            def (String resectedNormalized, List<Integer> resectedIndexMappings) = normalize(resected)
+            def previouslySeen = getVariations(resectedNormalized).any { licenses.containsKey(it) }
+            if (!previouslySeen) {
+                licenses[resectedNormalized] = new LicenseHolder(license: resected, indexMappings: resectedIndexMappings)
+            }
+        }
+    }
+
+    /**
+     * Some libraries ship with a license.header file that contains a Java block comment. This method strips the
+     * Java block comment syntax and returns the text without the comment.
+     */
+    private static String stripJavaBlockComment(String text) {
+        if (!text.startsWith('/*')) {
+            return text
+        }
+
+        return text
+                .replaceAll('^/\\*+|\\*+/\\s*$', '') // opening & closing comment
+                .readLines()
+                .collect {
+                    it.replaceFirst(/^(\s*\*)?/, '').trim()
+                } // leading whitespace & *
+                .join('\n')
+    }
+
+    /**
+     * Normalizes the license text by collapsing whitespace and uppercasing all characters. It also returns a mapping
+     * of the normalized text to the original license text, where each character in the normalized text maps to its
+     * original index in the license text. This allows us to index into the normalized text from sections of the license text
+     * for deduplication purposes.
+     *
+     * @param license the original license text
+     * @return a tuple containing the normalized license text and a list of index mappings
+     */
+    private static Tuple2<String, List<Integer>> normalize(String license) {
+        def sb = new StringBuilder()
+        List<Integer> indexMappings = [] // each char in sb maps to original index
+
+        boolean previousWhitespace = false
+        for (int i = 0; i < license.length(); i++) {
+            char c = license.charAt(i)
+            if (c.isWhitespace()) {
+                if (!previousWhitespace) {
+                    sb.append(' ')
+                    indexMappings << i
+                    previousWhitespace = true
+                }
+            } else {
+                sb.append(Character.toUpperCase(c))
+                indexMappings << i
+                previousWhitespace = false
+            }
+        }
+
+        String normalized = sb.toString().trim()
+        int startTrim = sb.indexOf(normalized)
+        int endTrim = startTrim + normalized.length()
+        new Tuple2<String, List<Integer>>(normalized, indexMappings[startTrim..<endTrim])
+    }
+
+    /**
+     * For a given license, this method will extract the duplicate license text and return the remaining text
+     * @param license the original license text
+     * @param normalized a normalized version of the license text, with all whitespace collapsed and all characters uppercased
+     * @param indexMappings a mapping of the normalized text to the original license text, where each character in the normalized text maps to its original index in the license text
+     * @return either null if no additional license text was found or the additional license text
+     */
+    private String resectLicense(String license, String normalized, List<Integer> indexMappings) {
+        if (!normalized.startsWith(licenseTermsStart.toUpperCase())) {
+            return license // not ASF license, return as is
+        }
+
+        // try to search on the appendix first
+        String endOfLicenseMarker = normalize(licenseAppendixEnding).v1
+        int end1Index = normalized.indexOf(endOfLicenseMarker)
+        if (end1Index >= 0) {
+            // license included the appendix
+            def originalEnding = indexMappings[end1Index + endOfLicenseMarker.size() - 1] + 1
+            if (originalEnding > license.length()) {
+                // only the license is present
+                return null
+            }
+
+            return license.substring(originalEnding)
+        }
+
+        // try to search on the terms ending
+        String endMarker = normalize(licenseTermsEnding).v1
+        int end2Index = normalized.indexOf(endMarker)
+        if (end2Index >= 0) {
+            // bare license
+            def originalEnding = indexMappings[end2Index + endMarker.size() - 1] + 1
+            if (originalEnding > license.length()) {
+                // only the license is present
+                return null
+            }
+
+            return license.substring(originalEnding)
+        }
+
+        license
+    }
+
+    /**
+     * Some licenses mix http & https links, handles simple variations of the license to ensure the license can be
+     * deduplicated.
+     *
+     * @param license the license text
+     * @return a list of variations of the license text
+     */
+    private static List<String> getVariations(String license) {
+        [license.trim()].collectMany {
+            [it, it.replace('http://', 'https://'), it.replace('https://', 'http://')]
+        }
+    }
+
+    /**
+     * Whether this transformer will modify the output stream.
+     */
+    @Override
+    boolean hasTransformedResource() {
+        // Must always be true since we want to write the LICENSE file and all license files originate from jar files
+        // after our project restructure
+        true
+    }
+
+    /**
+     * Writes the combined license file to the output stream. The file will be written to
+     * META-INF/LICENSE and will contain all licenses found in the project
+     *
+     * @param os the jar file output stream
+     * @param preserveFileTimestamps whether to preserve file timestamps in the output jar
+     */
+    @Override
+    void modifyOutputStream(ZipOutputStream os, boolean preserveFileTimestamps) {
+        ZipEntry zipEntry = new ZipEntry(LICENSE_PATH)
+        zipEntry.time = TransformerContext.getEntryTimestamp(preserveFileTimestamps, zipEntry.time)
+        os.putNextEntry(zipEntry)
+
+        os.withPrintWriter { writer ->
+            licenses.entrySet().withIndex().each { license ->
+                if (license.v1.value == null) {
+                    return // skip the license that will be copied by shadow from our existing jars
+                }
+
+                writer.println(license.v1.value.license)
+                if (separators && license.v2 < licenses.size() - 1) {
+                    writer.println("-------------------------${license.v2}---------------------------")
+                }
+            }
+
+            writer.flush()
+        }
+
+        licenses = [:]
+    }
+
+    private static class LicenseHolder {
+
+        String license
+        List<Integer> indexMappings
+    }
+}
\ No newline at end of file
diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowNoticeTransform.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowNoticeTransform.groovy
new file mode 100644
index 0000000000..a4b7dded9c
--- /dev/null
+++ b/build-logic/plugins/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowNoticeTransform.groovy
@@ -0,0 +1,45 @@
+/*
+ *  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.
+ */
+package org.apache.grails.forge.buildlogic.shadowjar
+
+import com.github.jengelman.gradle.plugins.shadow.transformers.ApacheNoticeResourceTransformer
+import groovy.transform.CompileStatic
+import org.gradle.api.file.FileTreeElement
+
+import java.util.regex.Pattern
+
+/**
+ * jakarta is eclipse licensed, so we need to include the NOTICE.md file
+ */
+@CompileStatic
+class GrailsShadowNoticeTransform extends ApacheNoticeResourceTransformer {
+
+    private static final List<Pattern> NOTICE_PATTERNS = [
+            ~'(?i)META-INF/[^/]*NOTICE[^/]*',
+            ~'(?i)[^/]*NOTICE[^/]*'
+    ]
+
+    @Override
+    boolean canTransformResource(FileTreeElement element) {
+        if (super.canTransformResource(element)) {
+            return true
+        }
+
+        def path = element.relativePath.pathString
+        NOTICE_PATTERNS.any { pattern -> pattern.matcher(path).matches() }
+    }
+}
diff --git a/build-logic/plugins/src/main/groovy/org/grails/forge/internal/tasks/GenerateManpageAsciidoc.java b/build-logic/plugins/src/main/groovy/org/grails/forge/internal/tasks/GenerateManpageAsciidoc.java
new file mode 100644
index 0000000000..9516d7763e
--- /dev/null
+++ b/build-logic/plugins/src/main/groovy/org/grails/forge/internal/tasks/GenerateManpageAsciidoc.java
@@ -0,0 +1,68 @@
+/*
+ *  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.
+ */
+package org.grails.forge.internal.tasks;
+
+import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.CacheableTask;
+import org.gradle.api.tasks.Classpath;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.process.ExecOperations;
+
+import javax.inject.Inject;
+
+@CacheableTask
+public abstract class GenerateManpageAsciidoc extends DefaultTask {
+
+    @Input
+    public abstract Property<String> getMainClass();
+
+    @Classpath
+    public abstract ConfigurableFileCollection getClasspath();
+
+    @OutputDirectory
+    public abstract DirectoryProperty getOutputDirectory();
+
+    @Inject
+    protected abstract ExecOperations getExecOperations();
+
+    public GenerateManpageAsciidoc() {
+        setGroup("Documentation");
+        setDescription("Generate AsciiDoc manpage");
+    }
+
+    @TaskAction
+    void generate() {
+        getExecOperations().javaexec(spec -> {
+            spec.getMainClass().set("picocli.codegen.docgen.manpage.ManPageGenerator");
+            spec.setClasspath(getClasspath());
+            spec.args(
+                    "--outdir=" + getOutputDirectory().getAsFile().get(),
+                    "-v",
+                    "--factory=org.grails.forge.cli.GrailsPicocliFactory",
+                    //, "--template-dir=src/docs/mantemplates"
+                    getMainClass().get()
+            );
+        });
+    }
+}
diff --git a/build-logic/plugins/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java b/build-logic/plugins/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java
new file mode 100644
index 0000000000..5125d6fa16
--- /dev/null
+++ b/build-logic/plugins/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java
@@ -0,0 +1,63 @@
+/*
+ *  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.
+ */
+package org.grails.forge.internal.tasks;
+
+import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.CacheableTask;
+import org.gradle.api.tasks.Classpath;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.process.ExecOperations;
+
+import javax.inject.Inject;
+
+@CacheableTask
+public abstract class PicocliBuildCompletionTask extends DefaultTask {
+    @Input
+    public abstract Property<String> getMainClass();
+
+    @Classpath
+    public abstract ConfigurableFileCollection getClasspath();
+
+    @OutputDirectory
+    public abstract DirectoryProperty getOutputDirectory();
+
+    @Inject
+    protected abstract ExecOperations getExecOperations();
+
+    @TaskAction
+    public void execute() {
+        getExecOperations().javaexec(spec -> {
+            spec.setClasspath(getClasspath());
+            spec.getMainClass().set("picocli.AutoComplete");
+            spec.jvmArgs("-Dpicocli.autocomplete.systemExitOnError");
+            spec.args(
+                    getMainClass().get(),
+                    "--completionScript=" + getOutputDirectory().file("grails_forge_cli_completion").get().getAsFile().getAbsolutePath(),
+                    "--force",
+                    "--factory=org.grails.forge.cli.GrailsPicocliFactory"
+            );
+        });
+    }
+
+}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/JavaGeneratorRunnable.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/JavaGeneratorRunnable.java
new file mode 100644
index 0000000000..4b6e889c98
--- /dev/null
+++ b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/JavaGeneratorRunnable.java
@@ -0,0 +1,166 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.rocker.plugin;
+
+import com.fizzed.rocker.compiler.GeneratorException;
+import com.fizzed.rocker.compiler.JavaGenerator;
+import com.fizzed.rocker.compiler.JavaGeneratorMain;
+import com.fizzed.rocker.compiler.PlainTextStrategy;
+import com.fizzed.rocker.compiler.RockerConfiguration;
+import com.fizzed.rocker.compiler.RockerUtil;
+import com.fizzed.rocker.compiler.TemplateParser;
+import com.fizzed.rocker.model.TemplateModel;
+import com.fizzed.rocker.runtime.ParserException;
+import com.fizzed.rocker.runtime.RockerRuntime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class JavaGeneratorRunnable implements Runnable {
+
+    private static final Logger log = LoggerFactory.getLogger(JavaGeneratorMain.class);
+
+    private final com.fizzed.rocker.compiler.RockerConfiguration configuration;
+    private final TemplateParser parser;
+    private final JavaGenerator generator;
+    private final List<File> templateFiles;
+    private String suffixRegex;
+    private boolean failOnError;
+
+    public JavaGeneratorRunnable() {
+        this.configuration = new RockerConfiguration();
+        this.parser = new TemplateParser(this.configuration);
+        this.generator = new JavaGenerator(this.configuration);
+        this.generator.setPlainTextStrategy(PlainTextStrategy.STATIC_STRINGS);
+        this.templateFiles = new ArrayList<>();
+        this.suffixRegex = ".*\\.rocker\\.(raw|html)$";
+        this.failOnError = true;
+    }
+
+    public String getSuffixRegex() {
+        return suffixRegex;
+    }
+
+    public void setSuffixRegex(String suffixRegex) {
+        this.suffixRegex = suffixRegex;
+    }
+
+    public boolean isFailOnError() {
+        return failOnError;
+    }
+
+    public void setFailOnError(boolean failOnError) {
+        this.failOnError = failOnError;
+    }
+
+    public TemplateParser getParser() {
+        return parser;
+    }
+
+    public JavaGenerator getGenerator() {
+        return generator;
+    }
+
+    public void run() throws RuntimeException{
+        if (this.configuration.getTemplateDirectory() == null) {
+            throw new RuntimeException("Template directory was null");
+        }
+
+        if (!this.configuration.getTemplateDirectory().exists() || !this.configuration.getTemplateDirectory().isDirectory()) {
+            throw new RuntimeException("Template directory does not exist: " + this.configuration.getTemplateDirectory());
+        }
+
+        // loop thru template directory and match templates
+        Collection<File> allFiles = RockerUtil.listFileTree(this.configuration.getTemplateDirectory());
+        for (File f : allFiles) {
+            if (f.getName().matches(suffixRegex)) {
+                templateFiles.add(f);
+            }
+        }
+
+        log.info("Parsing " + templateFiles.size() + " rocker template files");
+
+        int errors = 0;
+        int generated = 0;
+
+        for (File f : templateFiles) {
+            TemplateModel model = null;
+
+            try {
+                // parse model
+                model = parser.parse(f);
+            } catch (IOException | ParserException e) {
+                if (e instanceof ParserException) {
+                    ParserException pe = (ParserException) e;
+                    log.error("Parsing failed for " + f + ":[" + pe.getLineNumber() + "," + pe.getColumnNumber() + "] " + pe.getMessage());
+                } else {
+                    log.error("Unable to parse template", e);
+                }
+                errors++;
+            }
+
+            try {
+                File outputFile = generator.generate(model);
+                generated++;
+
+                log.debug("Generated java source: " + outputFile);
+            } catch (GeneratorException | IOException e) {
+                throw new RuntimeException("Generating java source failed for " + f + ": " + e.getMessage(), e);
+            }
+
+        }
+
+        log.info("Generated " + generated + " rocker java source files");
+
+        if (errors > 0 && failOnError) {
+            throw new RuntimeException("Caught " + errors + " errors.");
+        }
+
+        if (!configuration.getOptions().getOptimize()) {
+            // save configuration
+            this.configuration.getClassDirectory().mkdirs();
+
+            // use resource name, but strip leading slash
+            // place it into the classes directory (not the compile directory)
+            try{
+                File configFile = new File(this.configuration.getClassDirectory(), RockerRuntime.CONF_RESOURCE_NAME.substring(1));
+                this.configuration.write(configFile);
+                log.info("Generated rocker configuration " + configFile);
+            }catch(IOException iox){
+                throw new RuntimeException(iox);
+            }
+        } else {
+            log.info("Optimize flag on. Did not generate rocker configuration file");
+        }
+    }
+
+    public void setTemplateDirectory(File templateDirectory) {
+        this.parser.getConfiguration().setTemplateDirectory(templateDirectory);
+    }
+
+    public void setOutputDirectory(File outputDirectory) {
+        this.generator.getConfiguration().setOutputDirectory(outputDirectory);
+    }
+}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerConfiguration.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerConfiguration.java
new file mode 100644
index 0000000000..09583504b8
--- /dev/null
+++ b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerConfiguration.java
@@ -0,0 +1,99 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.rocker.plugin;
+
+import com.fizzed.rocker.model.JavaVersion;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.provider.ListProperty;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Optional;
+
+/**
+ * Bean for the configuration options of Rocker Compiler
+ */
+public abstract class RockerConfiguration {
+    private String[] postProcessing;
+    private Boolean markAsGenerated;
+
+    public RockerConfiguration() {
+        getSkip().convention(false);
+        getFailOnError().convention(true);
+        getSkipTouch().convention(true);
+        getJavaVersion().convention(JavaVersion.current());
+        getOptimize().convention(true);
+        getDiscardLogicWhitespace().convention(true);
+    }
+
+    @Internal
+    public abstract Property<Boolean> getSkip();
+
+    @Internal
+    public abstract Property<Boolean> getFailOnError();
+
+    @Internal
+    public abstract Property<Boolean> getSkipTouch();
+
+    @Optional
+    @Input
+    public abstract Property<String> getTouchFile();
+
+    @Input
+    public abstract Property<String> getJavaVersion();
+
+    @Optional
+    @Input
+    public abstract Property<String> getExtendsClass();
+
+    @Optional
+    @Input
+    public abstract Property<String> getExtendsModelClass();
+
+    @Optional
+    @Input
+    public abstract Property<Boolean> getOptimize();
+
+    @Optional
+    @Input
+    public abstract Property<Boolean> getDiscardLogicWhitespace();
+
+    @Optional
+    @Input
+    public abstract Property<String> getTargetCharset();
+
+    @Optional
+    @Input
+    public abstract Property<String> getSuffixRegex();
+
+    @Internal
+    public abstract DirectoryProperty getOutputBaseDirectory();
+
+    @Internal
+    public abstract DirectoryProperty getClassBaseDirectory();
+
+    @Optional
+    @Input
+    public abstract ListProperty<String> getPostProcessing();
+
+    @Optional
+    @Input
+    public abstract Property<Boolean> getMarkAsGenerated();
+}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerGradleException.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerGradleException.java
new file mode 100644
index 0000000000..85b879ff51
--- /dev/null
+++ b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerGradleException.java
@@ -0,0 +1,34 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.rocker.plugin;
+
+/**
+ * Named RuntimeException
+ */
+@SuppressWarnings("serial")
+public class RockerGradleException extends RuntimeException {
+    public RockerGradleException(String msg) {
+        super(msg);
+    }
+
+    public RockerGradleException(String msg, Exception e) {
+        super(msg, e);
+    }
+}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerPlugin.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerPlugin.java
new file mode 100644
index 0000000000..0c861313a7
--- /dev/null
+++ b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerPlugin.java
@@ -0,0 +1,100 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.rocker.plugin;
+
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.plugins.ExtensionAware;
+import org.gradle.api.plugins.JavaLibraryPlugin;
+import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.GroovySourceDirectorySet;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.api.tasks.TaskProvider;
+
+/**
+ * A plugin that for gradle that provides the `generateRockerTemplateSource`
+ * tasks.
+ */
+public class RockerPlugin implements Plugin<Project> {
+    /**
+     * Create `rockerCompile` task in group build and describe the task
+     *
+     * @param project - gradle project
+     */
+    @Override
+    public void apply(Project project) {
+        // Make sure that we have the objects from the java task available
+        project.getPluginManager().apply(JavaLibraryPlugin.class);
+
+        // Create own project extension (configuration)
+        RockerConfiguration rockerConfig = project.getExtensions().create("rocker", RockerConfiguration.class);
+        rockerConfig.getOutputBaseDirectory().convention(
+                project.getLayout().getBuildDirectory().dir("generated-src/rocker")
+        );
+        rockerConfig.getClassBaseDirectory().convention(
+                project.getLayout().getBuildDirectory().dir("classes")
+        );
+
+        // Create own source set extension using the modern JavaPluginExtension API
+        SourceSetContainer sourceSets = project.getExtensions()
+                .getByType(JavaPluginExtension.class).getSourceSets();
+        sourceSets.all(sourceSet -> processSourceSet(project, sourceSet, rockerConfig));
+
+    }
+
+    private static void processSourceSet(Project project, SourceSet sourceSet,
+                                         RockerConfiguration rockerConfig) {
+        // for each source set we will:
+        // 1) Add a new 'rocker' extension to the source set
+        RockerSourceSetProperty rockerProperty
+                = new RockerSourceSetProperty(project);
+        ((ExtensionAware) sourceSet).getExtensions().add(
+                "rocker", rockerProperty);
+
+        // 2) Create a rocker task for this sourceSet following the gradle
+        //    naming conventions
+        String taskName = sourceSet.getTaskName(
+                "generate", "RockerTemplateSource");
+        TaskProvider<RockerTask> rockerTaskProvider = project.getTasks().register(taskName, RockerTask.class, rockerTask -> {
+            rockerTask.setGroup("build");
+            rockerTask.setDescription("Generate Sources from "
+                    + sourceSet.getName() + " Rocker Templates");
+            rockerTask.getRockerProjectConfig().set(rockerConfig);
+            rockerTask.getOutputDir().convention(
+                    rockerConfig.getOutputBaseDirectory().dir(sourceSet.getName())
+            );
+            rockerTask.getClassDir().convention(
+                    rockerConfig.getClassBaseDirectory().dir(sourceSet.getName())
+            );
+            rockerTask.getTemplateDirs().from(rockerProperty.getRocker().getSrcDirs());
+        });
+
+        // The generated Java references the template models, which are Groovy classes in the Forge
+        // modules, and the Groovy code references the generated templates, so the generated sources are
+        // joint-compiled with the Groovy sources when the Groovy plugin is applied
+        if (project.getPluginManager().hasPlugin("groovy")) {
+            sourceSet.getExtensions().getByType(GroovySourceDirectorySet.class).srcDir(rockerTaskProvider);
+        } else {
+            sourceSet.getJava().srcDir(rockerTaskProvider);
+        }
+    }
+
+}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerSourceSetProperty.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerSourceSetProperty.java
new file mode 100644
index 0000000000..5aef586e2b
--- /dev/null
+++ b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerSourceSetProperty.java
@@ -0,0 +1,80 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.rocker.plugin;
+
+import groovy.lang.Closure;
+import org.gradle.api.Action;
+import org.gradle.api.Project;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.util.internal.ClosureBackedAction;
+
+import java.io.File;
+import java.util.Set;
+
+/**
+ * The rocker property added to the {@link SourceSet}.
+ */
+public class RockerSourceSetProperty {
+
+    private final TemplateDirectorySet templateDirs;
+
+    /**
+     * @param project - main gradle project
+     */
+    public RockerSourceSetProperty(Project project) {
+        super();
+        templateDirs = new TemplateDirectorySet(project);
+    }
+
+    public TemplateDirectorySet getRocker() {
+        return templateDirs;
+    }
+
+    public RockerSourceSetProperty rocker(Closure<?> configureClosure) {
+        new ClosureBackedAction<>(configureClosure).execute(getRocker());
+        return this;
+    }
+
+    public RockerSourceSetProperty rocker(
+        Action<? super TemplateDirectorySet> configureAction) {
+        configureAction.execute(getRocker());
+        return this;
+    }
+
+    // Delegate methods to TemplateDirectorySet for DSL compatibility
+    public RockerSourceSetProperty srcDir(Object srcDir) {
+        templateDirs.srcDir(srcDir);
+        return this;
+    }
+
+    public RockerSourceSetProperty srcDirs(Object... srcDirs) {
+        templateDirs.srcDirs(srcDirs);
+        return this;
+    }
+
+    public RockerSourceSetProperty setSrcDirs(Iterable<?> srcPaths) {
+        templateDirs.setSrcDirs(srcPaths);
+        return this;
+    }
+
+    public Set<File> getSrcDirs() {
+        return templateDirs.getSrcDirs();
+    }
+}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerTask.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerTask.java
new file mode 100644
index 0000000000..218b1d1a59
--- /dev/null
+++ b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/RockerTask.java
@@ -0,0 +1,186 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.rocker.plugin;
+
+import com.fizzed.rocker.compiler.RockerOptions;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.FileSystemOperations;
+import org.gradle.api.logging.Logger;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.CacheableTask;
+import org.gradle.api.tasks.Classpath;
+import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.Nested;
+import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.PathSensitive;
+import org.gradle.api.tasks.PathSensitivity;
+import org.gradle.api.tasks.TaskAction;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+import javax.inject.Inject;
+
+@CacheableTask
+public abstract class RockerTask extends DefaultTask {
+
+
+    /**
+     * @return the config
+     */
+    @Nested
+    public abstract Property<RockerConfiguration> getRockerProjectConfig();
+
+    /**
+     * @return the templateDirs
+     */
+    @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
+    public abstract ConfigurableFileCollection getTemplateDirs();
+
+    /**
+     * @return the outputDir
+     */
+    @OutputDirectory
+    public abstract DirectoryProperty getOutputDir();
+
+    @Classpath
+    public abstract DirectoryProperty getClassDir();
+
+    @Inject
+    protected abstract FileSystemOperations getFileSystemOperations();
+
+    /**
+     * Sets up the logger and runs the rocker compiler
+     */
+    @TaskAction
+    public void compileRocker() {
+        RockerConfiguration ext = (RockerConfiguration)
+                getProject().getExtensions().findByName("rocker");
+        File outputDir = getOutputDir().get().getAsFile();
+        // Rocker only writes files, so remove sources generated from templates that no longer exist
+        getFileSystemOperations().delete(spec -> spec.delete(outputDir));
+        Set<File> templateDirs = getTemplateDirs().getFiles();
+        for (File templateDir : templateDirs) {
+            doCompileRocker(ext, getLogger(), templateDir, outputDir, getClassDir().get().getAsFile());
+        }
+    }
+
+    /**
+     * Uses the project to get GradleExtension and runs the generator
+     */
+    public static void doCompileRocker(RockerConfiguration ext,
+                                       Logger logger,
+                                       File templateDir, File outputDir, File classDir) {
+
+        runJavaGeneratorMain(ext, logger, templateDir, outputDir, classDir);
+    }
+
+    /**
+     * Run the Rocker compiler with the RockerGradleExtension as configuration
+     * options.
+     *
+     * @param ext the extension from the project object
+     */
+    private static void runJavaGeneratorMain(RockerConfiguration ext,
+                                             Logger logger,
+                                             File templateDir, File outputDir, File classDir) {
+        if (ext.getSkip().get()) {
+            logger.info("Skip flag is on, will skip goal.");
+            return;
+        }
+
+        logger.info("Targeting java version " + ext.getJavaVersion().get());
+
+        try {
+            JavaGeneratorRunnable jgm = new JavaGeneratorRunnable();
+
+            jgm.getParser().getConfiguration().setTemplateDirectory(templateDir);
+            jgm.getGenerator().getConfiguration().setOutputDirectory(outputDir);
+            jgm.getGenerator().getConfiguration().setClassDirectory(classDir);
+            jgm.setFailOnError(ext.getFailOnError().get());
+
+            // passthru other config
+            if (ext.getSuffixRegex().isPresent()) {
+                jgm.setSuffixRegex(ext.getSuffixRegex().get());
+            }
+            RockerOptions rockerOptions = jgm.getParser().getConfiguration().getOptions();
+            rockerOptions.setJavaVersion(ext.getJavaVersion().get());
+            if (ext.getExtendsClass().isPresent()) {
+                rockerOptions.setExtendsClass(ext.getExtendsClass().get());
+            }
+            if (ext.getExtendsModelClass().isPresent()) {
+                rockerOptions.setExtendsModelClass(ext.getExtendsModelClass().get());
+            }
+            if (ext.getDiscardLogicWhitespace().isPresent()) {
+                rockerOptions.setDiscardLogicWhitespace(ext.getDiscardLogicWhitespace().get());
+            }
+            if (ext.getTargetCharset().isPresent()) {
+                rockerOptions.setTargetCharset(ext.getTargetCharset().get());
+            }
+            if (ext.getOptimize().isPresent()) {
+                rockerOptions.setOptimize(ext.getOptimize().get());
+            }
+            if (ext.getPostProcessing().isPresent()) {
+                List<String> postProcessing = ext.getPostProcessing().get();
+                if (!postProcessing.isEmpty()) {
+                    rockerOptions.setPostProcessing(postProcessing.toArray(new String[0]));
+                }
+            }
+            if (ext.getMarkAsGenerated().isPresent()) {
+                rockerOptions.setMarkAsGenerated(ext.getMarkAsGenerated().get());
+            }
+
+            jgm.run();
+
+        } catch (Exception e) {
+            throw new RockerGradleException(e.getMessage(), e);
+        }
+
+        if (!ext.getSkipTouch().get()) {
+            String touchFile = ext.getTouchFile().orElse("").get();
+            if (touchFile.length() == 0) {
+                throw new RockerGradleException(
+                        "If skipTouch is equal to false, then "
+                                + "touchFile must not be empty");
+            }
+            if (ext.getTouchFile().isPresent()) {
+                File f = new File(touchFile);
+                logger.info("Touching file " + f);
+                try {
+                    if (!f.exists()) {
+                        new FileOutputStream(f).close();
+                    }
+                    if (!f.setLastModified(System.currentTimeMillis())) {
+                        throw new IOException("Could not set Last Modified");
+                    }
+                } catch (IOException e) {
+                    logger.debug("Unable to touch file: " + f.getAbsolutePath(), e);
+                }
+            }
+        }
+    }
+
+}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/TemplateDirectorySet.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/TemplateDirectorySet.java
new file mode 100644
index 0000000000..2ce6084ed1
--- /dev/null
+++ b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/TemplateDirectorySet.java
@@ -0,0 +1,124 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.rocker.plugin;
+
+import org.gradle.api.PathValidation;
+import org.gradle.api.Project;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.util.PatternFilterable;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A simplified version of {@link SourceSet}. Gradle's {@link SourceSet}
+ * inherits from {@link PatternFilterable}, but rocker works on complete
+ * directories. So instead of using {@link SourceSet} and allowing
+ * the user to specify filters without any effect, this simplified
+ * source set implementation is used.
+ * <P>
+ * It would be tempting to provide e.g. {@code templateDir} instead of
+ * {@code srcDir}, but this would break established use and templates are
+ * the source in this context.
+ */
+public class TemplateDirectorySet  {
+    private Project project;
+    private final Set<File> templateDirs = new HashSet<>();
+
+    /**
+     * Create a new instance. The project is used to immediately check
+     * (with {@code project.file()} the validity of added directories.
+     *
+     * @param project the project
+     */
+    public TemplateDirectorySet(Project project) {
+        super();
+        this.project = project;
+    }
+
+    /**
+     * Adds the given source directory to this set.
+     *
+     * @param srcDir the directory
+     * @return the template set for easy chaining
+     */
+    public TemplateDirectorySet srcDir(Object srcDir) {
+        templateDirs.add(project.file(srcDir, PathValidation.DIRECTORY));
+        return this;
+    }
+
+    /**
+     * Adds the given source directories to this set.
+     *
+     * @param srcDirs the directories
+     * @return the template set for easy chaining
+     */
+    public TemplateDirectorySet srcDirs(Object... srcDirs) {
+        for (Object srcDir : srcDirs) {
+            srcDir(srcDir);
+        }
+        return this;
+    }
+
+    /**
+     * Sets the source directories for this set.
+     *
+     * @param srcPaths the source directories
+     * @return the template set for easy chaining
+     */
+    public TemplateDirectorySet setSrcDirs(Iterable<?> srcPaths) {
+        templateDirs.clear();
+        srcPaths.forEach(this::srcDir);
+        return this;
+    }
+
+    /**
+     * Adds the given source to this set.
+     *
+     * @param source the source
+     * @return the template set for easy chaining
+     */
+    public TemplateDirectorySet source(TemplateDirectorySet source) {
+        source.getSrcDirs().forEach(this::srcDir);
+        return this;
+    }
+
+    /**
+     * Returns the source directories that make up this set.
+     *
+     * @return the directories
+     */
+    public Set<File> getSrcDirs() {
+        return templateDirs;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("TemplateDirectorySet [");
+        if (!templateDirs.isEmpty()) {
+            builder.append("templateDirs=");
+            builder.append(templateDirs);
+        }
+        builder.append("]");
+        return builder.toString();
+    }
+}
diff --git a/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/WhitespaceProcessor.java b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/WhitespaceProcessor.java
new file mode 100644
index 0000000000..a24f929dfc
--- /dev/null
+++ b/build-logic/plugins/src/main/java/org/grails/forge/rocker/plugin/WhitespaceProcessor.java
@@ -0,0 +1,52 @@
+/*
+ *  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.
+ */
+
+package org.grails.forge.rocker.plugin;
+
+import com.fizzed.rocker.model.PlainText;
+import com.fizzed.rocker.model.PostProcessorException;
+import com.fizzed.rocker.model.TemplateModel;
+import com.fizzed.rocker.model.TemplateModelPostProcessor;
+import com.fizzed.rocker.model.TemplateUnit;
+
+import java.util.List;
+
+public class WhitespaceProcessor implements TemplateModelPostProcessor {
+
+    @Override
+    public TemplateModel process(TemplateModel templateModel, int ppIndex) throws PostProcessorException {
+        List<TemplateUnit> units = templateModel.getUnits();
+        int length = units.size();
+        PlainText lastPlainText = null;
+        for (int i = 0; i < length; i ++) {
+            TemplateUnit tu = units.get(i);
+            if (tu instanceof PlainText) {
+                PlainText pt = (PlainText)tu;
+                if ((lastPlainText == null || lastPlainText.getText().endsWith("\n")) && pt.getText().startsWith("\n")) {
+                    PlainText replacementPt = new PlainText(pt.getSourceRef(), pt.getText().substring(1));
+                    // replace the unit
+                    units.add(i, replacementPt);
+                    units.remove(i + 1);
+                }
+                lastPlainText = pt;
+            }
+        }
+        return templateModel;
+    }
+}
diff --git a/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTaskSpec.groovy b/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTaskSpec.groovy
new file mode 100644
index 0000000000..daa72975c1
--- /dev/null
+++ b/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/WriteGrailsVersionInfoTaskSpec.groovy
@@ -0,0 +1,52 @@
+/*
+ *  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.
+ */
+package org.apache.grails.buildsrc
+
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+import org.gradle.testfixtures.ProjectBuilder
+import spock.lang.Specification
+import spock.lang.TempDir
+
+class WriteGrailsVersionInfoTaskSpec extends Specification {
+
+    @TempDir
+    File tmp
+
+    void 'parse failure throws GradleException instead of falling through to NPE'() {
+        given:
+        Project project = ProjectBuilder.builder().withProjectDir(tmp).build()
+        WriteGrailsVersionInfoTask task = project.tasks.register('writeGrailsVersionInfo', WriteGrailsVersionInfoTask).get()
+        File pom = new File(tmp, 'pom-default.xml')
+        pom.text = '<not-xml'
+        File outDir = new File(tmp, 'versions')
+        task.projectVersion.set('8.1.0-SNAPSHOT')
+        task.bomPublicationFile.set(pom)
+        task.versionsDirectory.set(outDir)
+
+        when:
+        task.writeVersionInfo()
+
+        then:
+        GradleException e = thrown()
+        e.message.contains('Unable to parse BOM publication file')
+        !(e instanceof NullPointerException)
+        e.cause != null
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index a0c8fed3e3..14ed4d492a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -56,6 +56,11 @@ picocliVersion=4.7.7
 spyMemcachedVersion=2.12.3
 
 # Build dependency versions not managed by BOMs
+# Forge pins read by build-logic (the Rocker compiler plugin and the shadow transformers);
+# rockerVersion is also the Rocker runtime the Forge modules compile against
+antlr4Version=4.8-1!!
+rockerVersion=2.2.1
+shadowVersion=8.3.11
 apacheRatVersion=0.8.1
 gradleChecksumPluginVersion=1.4.0
 gradleCycloneDxPluginVersion=3.0.0


(grails-core) 04/07: Let a GSP page write no line for its template logic

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 50f0f7975ddfcfdcbf2ee2c751a11778c51c500a
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Oct 7 13:00:42 2026 -0400

    Let a GSP page write no line for its template logic
    
    GSP writes the text of a page exactly as it is written, the line breaks around its scriptlets,
    directives and comments included. That is harmless in HTML but not in text where every line counts,
    such as a source file or a build script. A page declaring trimLogicLines="true" now writes nothing for
    a line that holds only page directives, scriptlets and comments: neither its indentation nor its line
    break. A line holding text, an expression or a tag is written as it is.
    
    The line break of a removed line is moved inside the line's last construct rather than dropped, so the
    lines of the page keep their numbers in the compiled page and in the errors reported against it. Every
    page directive of a page is now read when a page is prescanned for the directives that change how it
    is parsed, so the directive may be declared in any of them; the first directive still wins.
---
 .../theWebLayer/gsp/GSPBasics/pageDirectives.adoc  |  25 +++
 .../org/grails/gsp/compiler/GroovyPageParser.java  |  20 ++-
 .../org/grails/gsp/compiler/LogicLineTrimmer.java  |  94 ++++++++++++
 .../org/grails/gsp/GspTrimLogicLinesSpec.groovy    | 167 +++++++++++++++++++++
 4 files changed, 304 insertions(+), 2 deletions(-)

diff --git a/grails-doc/src/en/guide/theWebLayer/gsp/GSPBasics/pageDirectives.adoc b/grails-doc/src/en/guide/theWebLayer/gsp/GSPBasics/pageDirectives.adoc
index 70a6ff6ed9..ca455e0e32 100644
--- a/grails-doc/src/en/guide/theWebLayer/gsp/GSPBasics/pageDirectives.adoc
+++ b/grails-doc/src/en/guide/theWebLayer/gsp/GSPBasics/pageDirectives.adoc
@@ -44,3 +44,28 @@ GSP also supports the contentType directive:
 ----
 
 The contentType directive allows using GSP to render other formats.
+
+GSP writes the text of a page exactly as it is written, including the line breaks around scriptlets, directives and comments. That does not matter for HTML, but it does for text in which every line counts, such as a source file or a build script. The `trimLogicLines` directive makes a line holding only page directives, scriptlets (`<% %>` or `%{ }%`) and comments (`%{-- --}%` or `<%-- --%>`) write nothing, neither its indentation nor its line break:
+
+[,xml]
+----
+<%@ page trimLogicLines="true" expressionCodec="none" %>
+<%@ model="List<String> pluginIds" %>
+plugins {
+    <% for (String pluginId : pluginIds) { %>
+    id '${pluginId}'
+    <% } %>
+}
+----
+
+renders, with `pluginIds` holding `java` and `groovy`:
+
+[,groovy]
+----
+plugins {
+    id 'java'
+    id 'groovy'
+}
+----
+
+A line holding text, an expression (`${}` or `<%= %>`) or a tag besides the logic is written as it is. The lines of the page keep their numbers in the errors reported against it.
diff --git a/grails-gsp/core/src/main/groovy/org/grails/gsp/compiler/GroovyPageParser.java b/grails-gsp/core/src/main/groovy/org/grails/gsp/compiler/GroovyPageParser.java
index 4c8d46ebce..adb6823c53 100644
--- a/grails-gsp/core/src/main/groovy/org/grails/gsp/compiler/GroovyPageParser.java
+++ b/grails-gsp/core/src/main/groovy/org/grails/gsp/compiler/GroovyPageParser.java
@@ -220,6 +220,11 @@ public class GroovyPageParser implements Tokens {
     private static final String OUT_CODEC_DIRECTIVE = OutputEncodingSettings.OUT_CODEC_NAME + CODEC_DIRECTIVE_POSTFIX;
     private static final String TAGLIB_CODEC_DIRECTIVE = OutputEncodingSettings.TAGLIB_CODEC_NAME + CODEC_DIRECTIVE_POSTFIX;
     private static final String GRAILS_LAYOUT_PREPROCESS_DIRECTIVE = "grailsLayoutPreprocess";
+    /**
+     * The page directive by which a page asks that the lines holding only directives, scriptlets and
+     * comments write nothing, for a page rendering text in which every line break counts.
+     */
+    public static final String TRIM_LOGIC_LINES_DIRECTIVE = "trimLogicLines";
 
     private String pluginAnnotation;
     public static final String GROOVY_SOURCE_CHAR_ENCODING = "UTF-8";
@@ -320,6 +325,9 @@ public class GroovyPageParser implements Tokens {
         applyCompileStaticSystemProperty();
 
         Map<String, String> directives = parseDirectives(gspSource);
+        if (GrailsStringUtils.toBoolean(directives.get(TRIM_LOGIC_LINES_DIRECTIVE))) {
+            gspSource = LogicLineTrimmer.trim(gspSource);
+        }
         if (isGrailsLayoutPreprocessingEnabled(directives.get(GRAILS_LAYOUT_PREPROCESS_DIRECTIVE))) {
             // GSP preprocessing for direct grails layout integration: replace head -> g:captureHead, title -> g:captureTitle, meta -> g:captureMeta, body -> g:captureBody
             gspSource = grailsLayoutPreprocessor.addGspGrailsLayoutCapturing(gspSource);
@@ -423,13 +431,21 @@ public class GroovyPageParser implements Tokens {
         String input = PRESCAN_COMMENT_PATTERN.matcher(gspSource).replaceAll("");
         // find page directives
         Matcher m = PRESCAN_PAGE_DIRECTIVE_PATTERN.matcher(input);
-        if (m.find()) {
+        boolean first = true;
+        while (m.find()) {
             Matcher mat = PAGE_DIRECTIVE_PATTERN.matcher(m.group(1));
             while (mat.find()) {
                 String name = mat.group(1);
                 String value = mat.group(3);
-                result.put(name, value);
+                // the first page directive is read as it always was, a later one only adds what it
+                // names that the ones before it do not
+                if (first) {
+                    result.put(name, value);
+                } else {
+                    result.putIfAbsent(name, value);
+                }
             }
+            first = false;
         }
         return result;
     }
diff --git a/grails-gsp/core/src/main/groovy/org/grails/gsp/compiler/LogicLineTrimmer.java b/grails-gsp/core/src/main/groovy/org/grails/gsp/compiler/LogicLineTrimmer.java
new file mode 100644
index 0000000000..1f9275ed09
--- /dev/null
+++ b/grails-gsp/core/src/main/groovy/org/grails/gsp/compiler/LogicLineTrimmer.java
@@ -0,0 +1,94 @@
+/*
+ *  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.
+ */
+package org.grails.gsp.compiler;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Removes the lines of a page that hold only template logic, for a page declaring
+ * {@code trimLogicLines="true"}: a line holding nothing but page directives, scriptlets and comments,
+ * besides spaces and tabs, writes neither its indentation nor its line break. A line holding text, an
+ * expression or a tag is left as it is.
+ *
+ * <p>The line break of a removed line is moved inside the line's last construct, just after its
+ * opening delimiter, rather than dropped, so that every line of the page keeps its number in the
+ * compiled page and in the errors reported against it.</p>
+ */
+final class LogicLineTrimmer {
+
+    private static final String CONSTRUCT = "(?:" +
+            "<%--(?:(?!--%>).)*--%>" +          // <%-- comment --%>
+            "|%\\{--(?:(?!--\\}%).)*--\\}%" +   // %{-- comment --}%
+            "|<%@(?:(?!%>).)*%>" +              // <%@ directive %>
+            "|<%(?![=@]|--)(?:(?!%>).)*%>" +    // <% scriptlet %>
+            "|%\\{(?!--)(?:(?!\\}%).)*\\}%" +   // %{ scriptlet }%
+            ")";
+
+    private static final Pattern CONSTRUCT_PATTERN = Pattern.compile(CONSTRUCT, Pattern.DOTALL);
+
+    private static final Pattern LOGIC_LINE_PATTERN = Pattern.compile(
+            "^[ \\t]*(" + CONSTRUCT + "(?:[ \\t]*" + CONSTRUCT + ")*)[ \\t]*(\\r?\\n|\\z)",
+            Pattern.MULTILINE | Pattern.DOTALL);
+
+    private LogicLineTrimmer() {
+    }
+
+    static String trim(String gspSource) {
+        Matcher line = LOGIC_LINE_PATTERN.matcher(gspSource);
+        StringBuilder result = new StringBuilder(gspSource.length());
+        int copied = 0;
+        while (line.find()) {
+            result.append(gspSource, copied, line.start());
+            appendConstructs(result, line.group(1), line.group(2));
+            copied = line.end();
+        }
+        result.append(gspSource, copied, gspSource.length());
+        return result.toString();
+    }
+
+    /**
+     * Appends the constructs of a logic line without the spaces between them, the line break going
+     * just after the opening delimiter of the last one.
+     */
+    private static void appendConstructs(StringBuilder result, String constructs, String lineBreak) {
+        Matcher construct = CONSTRUCT_PATTERN.matcher(constructs);
+        String previous = null;
+        while (construct.find()) {
+            if (previous != null) {
+                result.append(previous);
+            }
+            previous = construct.group();
+        }
+        if (previous != null) {
+            int opening = openingDelimiterLength(previous);
+            result.append(previous, 0, opening).append(lineBreak).append(previous, opening, previous.length());
+        }
+    }
+
+    private static int openingDelimiterLength(String construct) {
+        if (construct.startsWith("<%--") || construct.startsWith("%{--")) {
+            return 4;
+        }
+        if (construct.startsWith("<%@")) {
+            return 3;
+        }
+        return 2;
+    }
+}
diff --git a/grails-gsp/core/src/test/groovy/org/grails/gsp/GspTrimLogicLinesSpec.groovy b/grails-gsp/core/src/test/groovy/org/grails/gsp/GspTrimLogicLinesSpec.groovy
new file mode 100644
index 0000000000..b7dabb1bba
--- /dev/null
+++ b/grails-gsp/core/src/test/groovy/org/grails/gsp/GspTrimLogicLinesSpec.groovy
@@ -0,0 +1,167 @@
+/*
+ *  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.
+ */
+
+package org.grails.gsp
+
+import spock.lang.Specification
+import spock.lang.Unroll
+
+class GspTrimLogicLinesSpec extends Specification {
+
+    GroovyPagesTemplateEngine engine
+
+    void setup() {
+        engine = new GroovyPagesTemplateEngine()
+        engine.afterPropertiesSet()
+    }
+
+    void "a line holding only a scriptlet writes nothing"() {
+        expect:
+        render('''<%@ page trimLogicLines="true" %>
+plugins {
+<% for (String id : ids) { %>
+    id '${id}'
+<% } %>
+}
+''', [ids: ['a', 'b']]) == '''plugins {
+    id 'a'
+    id 'b'
+}
+'''
+    }
+
+    void "the indentation of a line holding only logic is removed with it"() {
+        expect:
+        render('''<%@ page trimLogicLines="true" %>
+repositories {
+    <% if (central) { %>
+    mavenCentral()
+    <% } else { %>
+    mavenLocal()
+    <% } %>
+}
+''', [central: central]) == """repositories {
+    ${expected}
+}
+"""
+
+        where:
+        central | expected
+        true    | 'mavenCentral()'
+        false   | 'mavenLocal()'
+    }
+
+    void "a line holding text, an expression or an output scriptlet beside the logic is written as it is"() {
+        expect:
+        render('''<%@ page trimLogicLines="true" %>
+<% if (true) { %>text <% } %>
+<% if (true) { %>${'expression'}<% } %>
+<% if (true) { %><%= 'output' %><% } %>
+''', [:]) == '''text 
+expression
+output
+'''
+    }
+
+    void "directives, comments and several constructs on one line write nothing"() {
+        expect:
+        render('''%{--
+  A comment over several lines
+--}%
+<%@ page trimLogicLines="true" %>
+<%@ page import="java.time.DayOfWeek" %>
+<%-- a JSP comment --%>
+  <% String day = DayOfWeek.MONDAY.name() %> %{ day = day.toLowerCase() }%  <%-- trailing --%>  
+${day}
+''', [:]) == 'monday\n'
+    }
+
+    @Unroll
+    void "a page ending with a logic line #description"() {
+        expect:
+        render('<%@ page trimLogicLines="true" %>\nline\n<% if (true) { %>' + ending, [:]) == 'line\n'
+
+        where:
+        description               | ending
+        'without a line break'    | '<% } %>'
+        'with a line break'       | '<% } %>\n'
+        'with Windows line breaks' | '<% } %>\r\n'
+    }
+
+    void "Windows line breaks are removed with the logic line"() {
+        expect:
+        render('<%@ page trimLogicLines="true" %>\r\n<% if (true) { %>\r\none\r\n<% } %>\r\ntwo\r\n', [:]) == 'one\r\ntwo\r\n'
+    }
+
+    void "the directive may be declared by a later page directive"() {
+        expect:
+        render('''<%@ page import="java.time.DayOfWeek" %>
+<%@ page trimLogicLines="true" %>
+<% if (true) { %>
+${DayOfWeek.FRIDAY}
+<% } %>
+''', [:]) == 'FRIDAY\n'
+    }
+
+    void "without the directive every line is written as it always was"() {
+        expect:
+        render('''<% if (true) { %>
+one
+<% } %>
+''', [:]) == '\none\n\n'
+    }
+
+    void "the lines of a page keep their numbers in the errors reported against them"() {
+        given:
+        String source = '''<%@ page trimLogicLines="true" %>
+<% if (true) { %>
+    <% if (true) { %>
+${'fine'}
+<% } %>
+<% } %>
+<% throw new IllegalStateException('line 7') %>
+'''
+
+        GroovyPageTemplate template = (GroovyPageTemplate) engine.createTemplate(source, 'lines_page')
+
+        when:
+        template.make([:]).writeTo(new StringWriter())
+
+        then:
+        IllegalStateException e = thrown()
+        StackTraceElement frame = e.stackTrace.find { StackTraceElement element -> element.className == 'lines_page' }
+        template.metaInfo.lineNumbers[frame.lineNumber - 1] == 7
+    }
+
+    void "a statically compiled page declaring its model trims its logic lines too"() {
+        expect:
+        render('''<%@ page trimLogicLines="true" %>
+<%@ model="List<String> names" %>
+<% for (String name : names) { %>
+- ${name.toUpperCase()}
+<% } %>
+''', [names: ['x', 'y']]) == '- X\n- Y\n'
+    }
+
+    private String render(String source, Map model) {
+        StringWriter out = new StringWriter()
+        engine.createTemplate(source, "trim${source.hashCode().abs()}").make(model).writeTo(out)
+        out.toString()
+    }
+}


(grails-core) 06/07: Keep the Forge API's OpenAPI base document with the web application's configuration

Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6010bed3a4d1b163053ff324d1e9e2e3a74c0f8a
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Wed Oct 7 13:05:42 2026 -0400

    Keep the Forge API's OpenAPI base document with the web application's configuration
    
    The base document moves to grails-app/conf beside application.yml, which names it. Grails packages
    grails-app/conf at the root of the class path as it does src/main/resources, so it is still found as
    classpath:openapi-base.yml.
---
 .../{src/main/resources => grails-app/conf}/openapi-base.yml              | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/grails-forge/grails-forge-web/src/main/resources/openapi-base.yml b/grails-forge/grails-forge-web/grails-app/conf/openapi-base.yml
similarity index 100%
rename from grails-forge/grails-forge-web/src/main/resources/openapi-base.yml
rename to grails-forge/grails-forge-web/grails-app/conf/openapi-base.yml