Merge pull request #534 from grails/release-7.0.0-M3

jamesfredley · web-flow · commit 95ace09d4aa4 · 2025-03-05T16:50:07.000-05:00
Release 7.0.0 m3
diff --git a/gradle.properties b/gradle.properties
@@ -1,34 +1,38 @@
 projectVersion=7.0.0-SNAPSHOT
 
+# grails project version
+# also update src/main/resources/pom.xml
+grailsVersion=7.0.0-M3
+
 title=Grails Application Forge
 projectDesc=Generates Grails applications
 projectUrl=https://grails.org
 githubSlug=grails/grails-forge
 githubBranch=7.0.x
 developers=Puneet Behl
 
+# for forge build process which is a micronaut 3.x.x app with picocli
 acme4jClientVersion=3.4.0
 acme4jUtilsVersion=2.16
-asciidoctorGradleJvmVersion=4.0.4
 antlr4Version=4.8-1!!
+asciidoctorGradleJvmVersion=4.0.4
 cglibVersion=3.3.0
 commonsCompressVersion=1.27.1
 customUserDataVersion=2.1
 develocityVersion=3.19.2
-groovyVersion=3.0.23
 gradleSdkvendorPluginVersion=3.0.0
-grailsVersion=7.0.0-SNAPSHOT
+groovyVersion=3.0.23
 jacksonDatabindVersion=2.18.2
 jakartaInjectVersion=1.0.5
 jansiVersion=2.4.1
 javaDiffUtils=4.15
 jgitVersion=6.10.0.202406032230-r
 logbackClassicVersion=1.5.15
-micronautVersion=3.10.4
 micronautApplicationPluginVersion=3.7.10
 micronautBuildVersion=1.1.5
 micronautDocsVersion=2.0.0
 micronautGradlePlugins=5.4.10
+micronautVersion=3.10.4
 nexusPublishVersion=1.3.0
 nohttpGradleVersion=0.0.11
 objenesisVersion=3.4
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/AssetPipeline.java b/grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/AssetPipeline.java
@@ -25,11 +25,8 @@
 import org.grails.forge.feature.Category;
 import org.grails.forge.feature.DefaultFeature;
 import org.grails.forge.feature.Feature;
-import org.grails.forge.feature.assetPipeline.templates.assetPipelineExtension;
 import org.grails.forge.options.Options;
-import org.grails.forge.template.RockerWritable;
 import org.grails.forge.template.URLTemplate;
-import org.grails.forge.util.VersionInfo;
 
 import java.util.Set;
 
@@ -61,13 +58,13 @@ public String getDescription() {
 
     @Override
     public void apply(GeneratorContext generatorContext) {
-        generatorContext.addBuildPlugin(GradlePlugin.builder()
-                .id("com.bertramlabs.asset-pipeline")
-                .extension(new RockerWritable(assetPipelineExtension.template(generatorContext.getApplicationType())))
-                .version("$assetPipelineGradleVersion")
-                .build());
 
-        generatorContext.getBuildProperties().put("assetPipelineGradleVersion", VersionInfo.getBomVersion("asset-pipeline-gradle"));
+        generatorContext.addBuildscriptDependency(Dependency.builder()
+                .groupId("com.bertramlabs.plugins")
+                .artifactId("asset-pipeline-gradle")
+                .buildSrc());
+
+        generatorContext.addBuildPlugin(GradlePlugin.builder().id("asset-pipeline").useApplyPlugin(true).build());
 
         generatorContext.addDependency(Dependency.builder()
                 .groupId("com.bertramlabs.plugins")
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/templates/assetPipelineExtension.rocker.raw b/grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/templates/assetPipelineExtension.rocker.raw
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw
@@ -111,3 +111,24 @@ tasks.withType(Test) {
 }
 
 @gradleBuild.renderExtensions()
+
+@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-core/src/main/resources/pom.xml b/grails-forge-core/src/main/resources/pom.xml
@@ -13,27 +13,32 @@
     </repositories>
     <dependencies>
         <dependency>
-            <!-- Last released Feb 24, 2021 -->
             <groupId>org.grails.plugins</groupId>
-            <artifactId>cache-ehcache</artifactId>
-            <version>3.0.0</version>
+            <artifactId>grails-web-console</artifactId>
+            <version>7.0.0-M2</version>
         </dependency>
         <dependency>
             <groupId>org.grails.plugins</groupId>
             <artifactId>quartz</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0-M2</version>
         </dependency>
         <dependency>
-            <groupId>org.asciidoctor.jvm.convert</groupId>
-            <artifactId>asciidoctor-gradle-jvm</artifactId>
-            <version>4.0.4</version>
+            <!-- Last released Feb 24, 2021 -->
+            <groupId>org.grails.plugins</groupId>
+            <artifactId>cache-ehcache</artifactId>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <!-- Last released Oct 17, 2022 -->
             <groupId>org.grails.plugins</groupId>
             <artifactId>embedded-mongodb</artifactId>
             <version>2.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.asciidoctor.jvm.convert</groupId>
+            <artifactId>asciidoctor-gradle-jvm</artifactId>
+            <version>4.0.4</version>
+        </dependency>
         <dependency>
             <groupId>com.github.johnrengelman.shadow</groupId>
             <artifactId>shadow</artifactId>
@@ -50,19 +55,16 @@
             <version>1.2.1</version>
         </dependency>
         <dependency>
+            <!-- use version from https://github.com/grails/grails-core/blob/7.0.x/gradle.properties-->
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-http-client</artifactId>
-            <version>4.6.6</version>
+            <version>4.6.5</version>
         </dependency>
         <dependency>
+            <!-- use version from https://github.com/grails/grails-core/blob/7.0.x/gradle.properties-->
             <groupId>io.micronaut.serde</groupId>
             <artifactId>micronaut-serde-jackson</artifactId>
             <version>2.11.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.grails.plugins</groupId>
-            <artifactId>grails-web-console</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/grails-forge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy b/grails-forge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy
@@ -27,7 +27,7 @@ class AssetPipelineSpec extends ApplicationContextSpec implements CommandOutputF
                 .render()
 
         then:
-        template.contains("id \"com.bertramlabs.asset-pipeline\"")
+        template.contains("apply plugin: \"asset-pipeline\"")
         template.contains("runtimeOnly \"com.bertramlabs.plugins:asset-pipeline-grails\"")
         template.contains('''
 assets {
diff --git a/grails-forge-core/src/test/groovy/org/grails/forge/feature/grails/GrailsGradlePluginSpec.groovy b/grails-forge-core/src/test/groovy/org/grails/forge/feature/grails/GrailsGradlePluginSpec.groovy
@@ -16,7 +16,7 @@ class GrailsGradlePluginSpec extends BeanContextSpec implements CommandOutputFix
         final String gradleProps = output["gradle.properties"]
 
         then:
-        gradleProps.contains("grailsVersion=7.0.0-SNAPSHOT")
+        gradleProps.contains("grailsVersion=")
     }
 
     void "test dependencies are present for buildSrc"() {
diff --git a/grails-forge-core/src/test/groovy/org/grails/forge/feature/micronaut/MicronautHttpClientSpec.groovy b/grails-forge-core/src/test/groovy/org/grails/forge/feature/micronaut/MicronautHttpClientSpec.groovy
@@ -13,7 +13,7 @@ class MicronautHttpClientSpec extends BeanContextSpec {
                 .render()
 
         then:
-        template.contains("implementation \"io.micronaut:micronaut-http-client:4.6.6\"")
-        template.contains("implementation \"io.micronaut.serde:micronaut-serde-jackson:2.11.0\"")
+        template.contains("implementation \"io.micronaut:micronaut-http-client")
+        template.contains("implementation \"io.micronaut.serde:micronaut-serde-jackson")
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class GrailsGradlePluginSpec extends BeanContextSpec implements CommandOutputFix`
`16`	`16`	`final String gradleProps = output["gradle.properties"]`
`17`	`17`
`18`	`18`	`then:`
`19`		`- gradleProps.contains("grailsVersion=7.0.0-SNAPSHOT")`
	`19`	`+ gradleProps.contains("grailsVersion=")`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`void "test dependencies are present for buildSrc"() {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class MicronautHttpClientSpec extends BeanContextSpec {`
`13`	`13`	`.render()`
`14`	`14`
`15`	`15`	`then:`
`16`		`- template.contains("implementation \"io.micronaut:micronaut-http-client:4.6.6\"")`
`17`		`- template.contains("implementation \"io.micronaut.serde:micronaut-serde-jackson:2.11.0\"")`
	`16`	`+ template.contains("implementation \"io.micronaut:micronaut-http-client")`
	`17`	`+ template.contains("implementation \"io.micronaut.serde:micronaut-serde-jackson")`
`18`	`18`	`}`
`19`	`19`	`}`