Merge pull request #15019 from matrei/forge-fixes

Forge fixes

Author: matrei

dependencies.gradle

@@ -23,7 +23,7 @@
 ext {
     gradleBomDependencyVersions = [
             'ant.version'                   : '1.10.15',
-            'asciidoctor-gradle-jvm.version': '4.0.4',
+            'asciidoctor-gradle-jvm.version': '4.0.5',
             'asciidoctorj.version'          : '3.0.0',
             'asset-pipeline-gradle.version' : '5.0.15',
             'byte-buddy.version'            : '1.17.7',

gradle.properties

@@ -15,55 +15,57 @@
 
 projectVersion=7.0.0-SNAPSHOT
 
+javaVersion=17
+
+githubBranch=7.0.x
+githubSlug=apache/grails-core
+
+# Note: BOM dependencies are defined in dependencies.gradle files to allow for dependabot updates
+
+# Project dependency versions not managed by BOMs
 apacheMavenVersion=3.9.9
 apacheMavenResolverVersion=1.9.22
-apacheRatVersion=0.8.1
-coberturaVersion=2.1.1
-expectitCoreVersion=0.9.0
-gradleExtraConfigurationsPluginVersion=10.0.1
-gradleLicensePluginVersion=0.16.1
-gradleChecksumPluginVersion=1.4.0
-gradleToolingApiVersion=8.12.1
-javaVersion=17
-joptSimpleVersion=5.0.4
-slf4jVersion=2.0.16
-gparsVersion=1.2.1
 commonsValidatorVersion=1.9.0
 concurrentlinkedhashmapLruVersion=1.4.2
-jnrPosixVersion=3.1.20
-joddWotVersion=3.3.8
+defaultElImplementationVersion=5.0.0
 # See https://projects.eclipse.org/releases/jakarta-10 and latest 5.0.x from https://mvnrepository.com/artifact/jakarta.el/jakarta.el-api
 elApiVersion=5.0.1
-defaultElImplementationVersion=5.0.0
-jspApiVersion=4.0.0
+expectitCoreVersion=0.9.0
+gparsVersion=1.2.1
+gradleToolingApiVersion=8.12.1
+hibernate5Version=5.6.15.Final
 javassistVersion=3.30.2-GA
-yakworksHibernateGroovyProxyVersion=1.1
-picocliVersion=4.7.6
+jnrPosixVersion=3.1.20
+joddWotVersion=3.3.8
+joptSimpleVersion=5.0.4
+jspApiVersion=4.0.0
 liquibaseHibernate5Version=4.27.0
-hibernate5Version=5.6.15.Final
-
-githubSlug=apache/grails-core
-githubBranch=7.0.x
+picocliVersion=4.7.6
+slf4jVersion=2.0.17
+yakworksHibernateGroovyProxyVersion=1.1
 
-org.gradle.caching=true
-# until https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/564 is fixed, we can't cache our configuration
-# org.gradle.configuration-cache=true
-org.gradle.parallel=true
-org.gradle.daemon=true
-# do NOT turn on due to https://github.com/gradle/gradle/issues/9489
-#org.gradle.configureondemand=true
-# note: groovydoc requires almost a doubling of this memory; if it could run in a process isolation, we could reduce this
-# this is a future TODO see groovydoc-tool-rewrite branch for experiementations with this
-org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx5G
+# Build dependency versions not managed by BOMs
+apacheRatVersion=0.8.1
+gradleChecksumPluginVersion=1.4.0
+gradleLicensePluginVersion=0.16.1
 
-# libraries only specific to test apps, these should not be exposed
-jbossTransactionApiVersion=2.0.0.Final
-micronautVersion=4.6.5
-micronautSerdeJacksonVersion=2.11.0
+# Libraries only specific to test apps, these should not be exposed
 grailsSpringSecurityVersion=7.0.0-SNAPSHOT
+jbossTransactionApiVersion=2.0.0.Final
+micronautVersion=4.9.10
+micronautSerdeJacksonVersion=2.15.1
 
 # This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs
 # https://github.com/apache/grails-gradle-plugin/issues/222
 slf4jPreventExclusion=true
 
-# note: bom dependencies are defined in dependencies.gradle files to allow for dependabot updates
+org.gradle.caching=true
+# Until https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/564 is fixed, we can't cache our configuration
+# org.gradle.configuration-cache=true
+org.gradle.parallel=true
+org.gradle.daemon=true
+# Do NOT turn on due to https://github.com/gradle/gradle/issues/9489
+#org.gradle.configureondemand=true
+# Note: groovydoc requires almost a doubling of this memory; if it could run in a process isolation, we could reduce this
+# This is a future TODO see groovydoc-tool-rewrite branch for experiementations with this
+org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx5G

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/Category.java

@@ -52,6 +52,7 @@ public class Category {
     public static final String SERVICE_DISCOVERY    = "Service Discovery";
     public static final String SPRING               = "Spring Framework";
     public static final String SSL                  = "SSL";
+    public static final String TESTING              = "Testing";
     public static final String TRACING              = "Distributed Tracing";
     public static final String VALIDATION           = "Validation";
     public static final String VIEW                 = "View Rendering";

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/database/TestContainers.java

@@ -49,6 +49,11 @@ public String getTitle() {
         return "Testcontainers";
     }
 
+    @Override
+    public String getCategory() {
+        return Category.TESTING;
+    }
+
     @Override
     public String getDescription() {
         return "Leverage Testcontainers to run databases and other services in Docker containers during testing.";
@@ -130,11 +135,6 @@ public boolean supports(ApplicationType applicationType) {
         return true;
     }
 
-    @Override
-    public String getCategory() {
-        return Category.DATABASE;
-    }
-
     @Nullable
     @Override
     public String getThirdPartyDocumentation() {

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/other/ShadePlugin.java

@@ -68,7 +68,7 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addHelpLink("Shadow Gradle Plugin", "https://plugins.gradle.org/plugin/com.gradleup.shadow");
         GradlePlugin.Builder builder = GradlePlugin.builder()
                 .id("com.gradleup.shadow")
-                .lookupArtifactId("shadow");
+                .lookupArtifactId("shadow-gradle-plugin");
         generatorContext.addBuildPlugin(builder.build());
 
     }

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/AssertJ.java

@@ -58,7 +58,7 @@ public void apply(GeneratorContext generatorContext) {
 
     @Override
     public String getCategory() {
-        return Category.DEV_TOOLS;
+        return Category.TESTING;
     }
 
     @Override

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GebWithTestcontainers.java

@@ -24,6 +24,7 @@
 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.Category;
 import org.grails.forge.feature.DefaultFeature;
 import org.grails.forge.feature.Feature;
 import org.grails.forge.feature.FeatureContext;
@@ -65,6 +66,11 @@ public String getDescription() {
         return "This plugins configure Geb for Grails framework to write automation tests that run with Testcontainers.";
     }
 
+    @Override
+    public String getCategory() {
+        return Category.TESTING;
+    }
+
     @Override
     public int getOrder() {
         return FeaturePhase.TEST.getOrder();

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GebWithWebDriverBinaries.java

@@ -61,6 +61,11 @@ public String getDescription() {
         return "This plugins configure Geb for Grails framework to write automation tests with WebDriver binaries Gradle plugin.  No longer maintained and limited to Gradle 8.6 and JDK 21.  geb-with-testcontainers is the replacement and default starting with Grails 7.";
     }
 
+    @Override
+    public String getCategory() {
+        return Category.TESTING;
+    }
+
     @Override
     public int getOrder() {
         return FeaturePhase.TEST.getOrder();

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GormTestingSupport.java

@@ -22,6 +22,7 @@
 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.Category;
 import org.grails.forge.feature.DefaultFeature;
 import org.grails.forge.feature.Feature;
 import org.grails.forge.options.Options;
@@ -40,6 +41,11 @@ public String getName() {
         return "grails-gorm-testing-support";
     }
 
+    @Override
+    public String getCategory() {
+        return Category.TESTING;
+    }
+
     @Override
     public boolean supports(ApplicationType applicationType) {
         return true;

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GrailsWebTestingSupport.java

@@ -22,6 +22,7 @@
 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.Category;
 import org.grails.forge.feature.DefaultFeature;
 import org.grails.forge.feature.Feature;
 import org.grails.forge.options.Options;
@@ -40,6 +41,11 @@ public String getName() {
         return "grails-web-testing-support";
     }
 
+    @Override
+    public String getCategory() {
+        return Category.TESTING;
+    }
+
     @Override
     public boolean supports(ApplicationType applicationType) {
         return true;