fix(deps): Update to Grails 7, Gradle 8.10.2 and grails-core dependen…

…cy versions (#386) * Update to Grails 7, Gradle 8.10.2 and grails-core dependency versions * set version on io.micronaut:micronaut-inject-groovy since it is no longer set by grails-bom Mostly removing micronaut dependencies from generated `build.gradle` * fix: Specify version for `micronaut-http-client` and update dependency handling - Explicitly set the version for `micronaut-http-client`, previously managed by `grails-bom` in Grails 6. - Remove default inclusion of `micronaut-http-client` as a test dependency when the `micronaut-http-client` feature is not selected. * remove micronaut-inject-groovy feature and test * add micronaut-serde-jackson dependency for micronaut-http-client --------- Co-authored-by: Mattias Reichel <[email protected]>
grails · Oct 10, 2024 · ed9e747 · ed9e747
1 parent 82f5cc0
commit ed9e747
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 115 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ micronautDocsVersion=2.0.0
 micronautVersion=3.10.4
 rockerVersion=1.4.0
 groovyVersion=3.0.22
-grailsVersion=6.2.2-SNAPSHOT
+grailsVersion=7.0.0-SNAPSHOT
 spockVersion=2.0-groovy-3.0
 title=Grails Application Forge
 projectDesc=Generates Grails applications

diff --git a/grails-cli/src/test/groovy/org/grails/forge/cli/CommandSpec.groovy b/grails-cli/src/test/groovy/org/grails/forge/cli/CommandSpec.groovy
@@ -68,8 +68,7 @@ class CommandSpec extends Specification {
  private Process executeCommand(StringBuilder builder) {
  String[] args = builder.toString().split(" ")
  ProcessBuilder pb = new ProcessBuilder(args)
- Map<String, String> env = pb.environment()
- env["JAVA_HOME"] = System.getenv("JAVA_HOME")
+ pb.environment().put("JAVA_HOME", System.getenv("JAVA_HOME") ?: System.getProperty("java.home"))
  process = pb.directory(dir).start()
  process.consumeProcessOutputStream(output)
  process

diff --git a/grails-forge-analytics-postgres/build.gradle b/grails-forge-analytics-postgres/build.gradle
@@ -20,7 +20,7 @@ dependencies {
  implementation 'com.google.cloud.sql:postgres-socket-factory:1.17.1'
  implementation "io.micronaut.sql:micronaut-jdbc-hikari"
  implementation 'io.micronaut.flyway:micronaut-flyway'
- testCompileOnly "io.micronaut:micronaut-inject-groovy"
+ testCompileOnly "io.micronaut:micronaut-inject-groovy:$micronautVersion"
  testImplementation "io.micronaut:micronaut-http-client"
  testImplementation "org.testcontainers:postgresql"
  testImplementation "ch.qos.logback:logback-classic:1.5.6"

diff --git a/grails-forge-api/build.gradle b/grails-forge-api/build.gradle
@@ -21,7 +21,7 @@ dependencies {
  api group: 'javax.inject', name: 'javax.inject', version: '1'
  implementation "io.projectreactor:reactor-core"
 
- testCompileOnly "io.micronaut:micronaut-inject-groovy"
+ testCompileOnly "io.micronaut:micronaut-inject-groovy:$micronautVersion"
  testImplementation "io.micronaut:micronaut-http-server-netty"
  testImplementation "io.micronaut:micronaut-http-client"
  testImplementation "io.micronaut.test:micronaut-test-spock"

diff --git a/...ore/src/main/java/org/grails/forge/feature/build/gradle/templates/dependencies.rocker.raw b/...ore/src/main/java/org/grails/forge/feature/build/gradle/templates/dependencies.rocker.raw
@@ -21,9 +21,6 @@ dependencies {
  @dependency.template("org.hamcrest","hamcrest", "testImplementation", null, false)
 }
 
-@if (!features.contains("micronaut-http-client")) {
- @dependency.template("io.micronaut", "micronaut-http-client", "testImplementation", null, false)
-}
 @if (features.contains("neo4j-bolt")) {
  @dependency.template("org.neo4j.test", "neo4j-harness", "testRuntimeOnly", null, false)
 }

diff --git a/...ls-forge-core/src/main/java/org/grails/forge/feature/micronaut/MicronautInjectGroovy.java b/...ls-forge-core/src/main/java/org/grails/forge/feature/micronaut/MicronautInjectGroovy.java
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/other/MicronautHttpClient.java b/grails-forge-core/src/main/java/org/grails/forge/feature/other/MicronautHttpClient.java
@@ -61,7 +61,14 @@ public String getDocumentation() {
  public void apply(GeneratorContext generatorContext) {
  generatorContext.addDependency(Dependency.builder()
  .groupId("io.micronaut")
- .artifactId("micronaut-http-client")
+ .lookupArtifactId("micronaut-http-client")
+ .compile());
+
+
+ // micronaut-http-client no longer provides the jackson implementation
+ generatorContext.addDependency(Dependency.builder()
+ .groupId("io.micronaut.serde")
+ .lookupArtifactId("micronaut-serde-jackson")
  .compile());
  }
 }
diff --git a/grails-forge-core/src/main/resources/pom.xml b/grails-forge-core/src/main/resources/pom.xml
@@ -20,12 +20,12 @@
  <dependency>
  <groupId>org.grails</groupId>
  <artifactId>grails-gradle-plugin</artifactId>
- <version>6.2.1</version>
+ <version>7.0.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.grails.plugins</groupId>
  <artifactId>hibernate5</artifactId>
- <version>8.1.0</version>
+ <version>9.0.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.grails.plugins</groupId>
@@ -40,7 +40,7 @@
  <dependency>
  <groupId>org.grails.plugins</groupId>
  <artifactId>database-migration</artifactId>
- <version>4.2.1</version>
+ <version>6.0.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.grails.plugins</groupId>
@@ -50,12 +50,12 @@
  <dependency>
  <groupId>org.asciidoctor.jvm.convert</groupId>
  <artifactId>asciidoctor-gradle-jvm</artifactId>
- <version>4.0.0-alpha.1</version>
+ <version>4.0.1</version>
  </dependency>
  <dependency>
  <groupId>org.hibernate</groupId>
  <artifactId>hibernate-validator</artifactId>
- <version>6.2.5.Final</version>
+ <version>7.0.5.Final</version>
  </dependency>
  <dependency>
  <groupId>org.mongodb</groupId>
@@ -65,7 +65,7 @@
  <dependency>
  <groupId>org.grails.plugins</groupId>
  <artifactId>views-gradle</artifactId>
- <version>3.2.3</version>
+ <version>4.0.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>org.grails.plugins</groupId>
@@ -125,17 +125,27 @@
  <dependency>
  <groupId>com.bertramlabs.plugins</groupId>
  <artifactId>asset-pipeline-grails</artifactId>
- <version>4.3.0</version>
+ <version>5.0.1</version>
  </dependency>
  <dependency>
  <groupId>com.bertramlabs.plugins</groupId>
  <artifactId>asset-pipeline-gradle</artifactId>
- <version>4.3.0</version>
+ <version>5.0.1</version>
  </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter</artifactId>
- <version>5.10.3</version>
+ <version>5.11.1</version>
+ </dependency>
+ <dependency>
+ <groupId>io.micronaut</groupId>
+ <artifactId>micronaut-http-client</artifactId>
+ <version>4.6.6</version>
+ </dependency>
+ <dependency>
+ <groupId>io.micronaut.serde</groupId>
+ <artifactId>micronaut-serde-jackson</artifactId>
+ <version>2.11.0</version>
  </dependency>
  </dependencies>
 </project>
diff --git a/grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy b/grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy
@@ -43,9 +43,9 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
  settingsGradle.contains("mavenLocal()")
  settingsGradle.contains("maven { url \"https://repo.grails.org/grails/core/\" }")
  settingsGradle.contains("gradlePluginPortal()")
- settingsGradle.contains("id \"org.grails.grails-web\" version \"6.2.1\"")
- settingsGradle.contains("id \"org.grails.grails-gsp\" version \"6.2.1\"")
- settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.3.0\"")
+ settingsGradle.contains("id \"org.grails.grails-web\" version \"7.0.0-SNAPSHOT\"")
+ settingsGradle.contains("id \"org.grails.grails-gsp\" version \"7.0.0-SNAPSHOT\"")
+ settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"5.0.1\"")
  }
 
  void "test settings.gradle for REST-API"() {
@@ -59,10 +59,10 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
  settingsGradle.contains("mavenLocal()")
  settingsGradle.contains("maven { url \"https://repo.grails.org/grails/core/\" }")
  settingsGradle.contains("gradlePluginPortal()")
- settingsGradle.contains("id \"org.grails.grails-web\" version \"6.2.1\"")
- settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"3.2.3\"")
- !settingsGradle.contains("id \"org.grails.grails-gsp\" version \"6.2.1\"")
- !settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.3.0\"")
+ settingsGradle.contains("id \"org.grails.grails-web\" version \"7.0.0-SNAPSHOT\"")
+ settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"4.0.0-SNAPSHOT\"")
+ !settingsGradle.contains("id \"org.grails.grails-gsp\" version \"7.0.0-SNAPSHOT\"")
+ !settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"5.0.1\"")
  }
 
  void "test settings.gradle for REST-API for markup-views"() {
@@ -76,10 +76,10 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
  settingsGradle.contains("mavenLocal()")
  settingsGradle.contains("maven { url \"https://repo.grails.org/grails/core/\" }")
  settingsGradle.contains("gradlePluginPortal()")
- settingsGradle.contains("id \"org.grails.grails-web\" version \"6.2.1\"")
- settingsGradle.contains("id \"org.grails.plugins.views-markup\" version \"3.2.3\"")
- !settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"3.2.3\"")
- !settingsGradle.contains("id \"org.grails.grails-gsp\" version \"6.2.1\"")
- !settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.3.0\"")
+ settingsGradle.contains("id \"org.grails.grails-web\" version \"7.0.0-SNAPSHOT\"")
+ settingsGradle.contains("id \"org.grails.plugins.views-markup\" version \"4.0.0-SNAPSHOT\"")
+ !settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"4.0.0-SNAPSHOT\"")
+ !settingsGradle.contains("id \"org.grails.grails-gsp\" version \"7.0.0-SNAPSHOT\"")
+ !settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"5.0.1\"")
  }
 }
diff --git a/...ls-forge-core/src/test/groovy/org/grails/forge/feature/asciidoctor/AsciidoctorSpec.groovy b/...ls-forge-core/src/test/groovy/org/grails/forge/feature/asciidoctor/AsciidoctorSpec.groovy
@@ -25,7 +25,7 @@ class AsciidoctorSpec extends ApplicationContextSpec implements CommandOutputFix
  final def settingGradle = output["settings.gradle"]
 
  expect:
- settingGradle.contains("id \"org.asciidoctor.jvm.convert\" version \"4.0.0-alpha.1\"")
+ settingGradle.contains("id \"org.asciidoctor.jvm.convert\" version \"4.0.1\"")
  buildGradle.contains("apply from: \"gradle/asciidoc.gradle\"")
  }
 

diff --git a/...orge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy b/...orge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy
@@ -27,7 +27,7 @@ class AssetPipelineSpec extends ApplicationContextSpec implements CommandOutputF
 
  expect:
  buildSrcBuildGradle != null
- buildSrcBuildGradle.contains("implementation(\"com.bertramlabs.plugins:asset-pipeline-gradle:4.3.0\")")
+ buildSrcBuildGradle.contains("implementation(\"com.bertramlabs.plugins:asset-pipeline-gradle:5.0.1\")")
 
  }
 
@@ -40,7 +40,7 @@ class AssetPipelineSpec extends ApplicationContextSpec implements CommandOutputF
 
  then:
  template.contains("id \"com.bertramlabs.asset-pipeline\"")
- template.contains("runtimeOnly(\"com.bertramlabs.plugins:asset-pipeline-grails:4.3.0\")")
+ template.contains("runtimeOnly(\"com.bertramlabs.plugins:asset-pipeline-grails:5.0.1\")")
  template.contains('''
 assets {
  minifyJs = true

diff --git a/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/HibernateGormSpec.groovy b/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/HibernateGormSpec.groovy
@@ -40,7 +40,7 @@ class HibernateGormSpec extends ApplicationContextSpec implements CommandOutputF
  .renderBuildSrc()
 
  then:
- template.contains('implementation("org.grails.plugins:hibernate5:8.1.0")')
+ template.contains('implementation("org.grails.plugins:hibernate5:9.0.0-SNAPSHOT")')
  }
 
  void "test buildSrc is present for buildscript dependencies"() {
@@ -50,7 +50,7 @@ class HibernateGormSpec extends ApplicationContextSpec implements CommandOutputF
 
  expect:
  buildSrcBuildGradle != null
- buildSrcBuildGradle.contains("implementation(\"org.grails.plugins:hibernate5:8.1.0\")")
+ buildSrcBuildGradle.contains("implementation(\"org.grails.plugins:hibernate5:9.0.0-SNAPSHOT\")")
 
  }
 

diff --git a/...-forge-core/src/test/groovy/org/grails/forge/feature/grails/GrailsGradlePluginSpec.groovy b/...-forge-core/src/test/groovy/org/grails/forge/feature/grails/GrailsGradlePluginSpec.groovy
@@ -16,8 +16,8 @@ class GrailsGradlePluginSpec extends BeanContextSpec implements CommandOutputFix
  final String gradleProps = output["gradle.properties"]
 
  then:
- gradleProps.contains("grailsGradlePluginVersion=6.2.1")
- gradleProps.contains("grailsVersion=6.2.2-SNAPSHOT")
+ gradleProps.contains("grailsGradlePluginVersion=7.0.0-SNAPSHOT")
+ gradleProps.contains("grailsVersion=7.0.0-SNAPSHOT")
  }
 
  void "test dependencies are present for buildSrc"() {
@@ -26,7 +26,7 @@ class GrailsGradlePluginSpec extends BeanContextSpec implements CommandOutputFix
  .renderBuildSrc()
 
  then:
- template.contains('implementation("org.grails:grails-gradle-plugin:6.2.1")')
+ template.contains('implementation("org.grails:grails-gradle-plugin:7.0.0-SNAPSHOT")')
  }
 
  void "test buildSrc is present for buildscript dependencies"() {
@@ -36,7 +36,7 @@ class GrailsGradlePluginSpec extends BeanContextSpec implements CommandOutputFix
 
  expect:
  buildSrcBuildGradle != null
- buildSrcBuildGradle.contains("implementation(\"org.grails:grails-gradle-plugin:6.2.1\")")
+ buildSrcBuildGradle.contains("implementation(\"org.grails:grails-gradle-plugin:7.0.0-SNAPSHOT\")")
 
  }
 

diff --git a/...ge-core/src/test/groovy/org/grails/forge/feature/micronaut/MicronautHttpClientSpec.groovy b/...ge-core/src/test/groovy/org/grails/forge/feature/micronaut/MicronautHttpClientSpec.groovy
@@ -13,6 +13,7 @@ class MicronautHttpClientSpec extends BeanContextSpec {
  .render()
 
  then:
- template.contains("implementation(\"io.micronaut:micronaut-http-client\")")
+ template.contains("implementation(\"io.micronaut:micronaut-http-client:4.6.6\")")
+ template.contains("implementation(\"io.micronaut.serde:micronaut-serde-jackson:2.11.0\")")
  }
 }
diff --git a/...-core/src/test/groovy/org/grails/forge/feature/micronaut/MicronautInjectGroovySpec.groovy b/...-core/src/test/groovy/org/grails/forge/feature/micronaut/MicronautInjectGroovySpec.groovy
diff --git a/grails-forge-web-netty/build.gradle b/grails-forge-web-netty/build.gradle
@@ -14,7 +14,7 @@ dependencies {
  implementation(project(":grails-forge-api"))
  implementation("io.micronaut.gcp:micronaut-gcp-http-client")
  runtimeOnly("ch.qos.logback:logback-classic")
- testCompileOnly("io.micronaut:micronaut-inject-groovy")
+ testCompileOnly("io.micronaut:micronaut-inject-groovy:$micronautVersion")
  testImplementation("io.micronaut.test:micronaut-test-spock")
  testImplementation("io.micronaut:micronaut-http-client")
 }

diff --git a/test-core/build.gradle b/test-core/build.gradle
@@ -31,6 +31,7 @@ dependencies {
  testImplementation project(":grails-cli")
  testImplementation "ch.qos.logback:logback-classic:1.5.6"
  testImplementation "io.micronaut.picocli:micronaut-picocli"
+ implementation "io.micronaut:micronaut-inject-groovy:$micronautVersion"
  generateConfig "info.picocli:picocli-codegen:${picocliVersion}"
 }