Merge pull request #15188 from apache/forge-updates

Forge updates

Author: matrei

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw

@@ -95,15 +95,8 @@ repositories {
 
 @dependencies.template(applicationType, project, features, gradleBuild)
 
-@if(features.contains("geb-with-webdriver-binaries")) {
-// geb-with-webdriver-binaries is limited to Gradle 8.6 with max JDK 21
-compileJava.options.release = @JdkVersion.valueOf(Math.min(features.javaVersion().majorVersion(), JdkVersion.JDK_21.majorVersion())).majorVersion()
-
-} else {
 compileJava.options.release = @features.getTargetJdk()
 
-}
-
 @if (features.contains("jrebel")) {
 bootRun {
     dependsOn(generateRebel)

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/gradleWrapperProperties.rocker.raw

@@ -33,12 +33,7 @@ Features features)
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-@if(features.contains("geb-with-webdriver-binaries")) {
-# geb-with-webdriver-binaries is limited to Gradle 8.6
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-} else {
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
-}
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -52,13 +52,13 @@ public String getName() {
 
     @Override
     public String getTitle() {
-        return "Geb Functional Testing for Grails with WebDriver binaries Gradle plugin - no longer maintained";
+        return "Geb Functional Testing using WebDriver binaries Gradle plugin";
     }
 
     @NonNull
     @Override
     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.";
+        return "This plugin configures Geb to use the WebDriver binaries Gradle plugin for downloading and caching the WebDriver binary for your platform.";
     }
 
     @Override
@@ -96,8 +96,8 @@ public void processSelectedFeatures(FeatureContext featureContext) {
     @Override
     public void apply(GeneratorContext generatorContext) {
         generatorContext.addBuildPlugin(GradlePlugin.builder()
-                .id("com.github.erdi.webdriver-binaries")
-                .lookupArtifactId("webdriver-binaries-gradle-plugin")
+                .id("org.ysb33r.webdriver-binaries")
+                .lookupArtifactId("webdriver-binaries")
                 .extension(
                         new RockerWritable(
                                 webdriverBinariesPlugin.template(
@@ -106,7 +106,6 @@ public void apply(GeneratorContext generatorContext) {
                                 )
                         )
                 )
-                .version("3.2")
                 .build());
 
         Stream.of("api", "support", "remote-driver")

grails-forge/grails-forge-core/src/main/resources/pom.xml

@@ -36,17 +36,17 @@
             <groupId>io.micronaut.platform</groupId>
             <artifactId>micronaut-platform</artifactId>
             <type>pom</type>
-            <version>4.9.2</version>
+            <version>4.10.1</version>
         </dependency>
         <dependency>
             <groupId>org.grails.plugins</groupId>
             <artifactId>grails-web-console</artifactId>
-            <version>7.0.0-M3</version>
+            <version>7.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.grails</groupId>
             <artifactId>grails-quartz</artifactId>
-            <version>4.0.0-M3</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <!-- Last released Feb 24, 2021 -->
@@ -62,12 +62,12 @@
         <dependency>
             <groupId>com.gradleup.shadow</groupId>
             <artifactId>shadow-gradle-plugin</artifactId>
-            <version>9.0.2</version>
+            <version>9.2.2</version>
         </dependency>
         <dependency>
-            <groupId>com.github.erdi</groupId>
-            <artifactId>webdriver-binaries-gradle-plugin</artifactId>
-            <version>3.2</version>
+            <groupId>org.ysb33r</groupId>
+            <artifactId>webdriver-binaries</artifactId>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.zeroturnaround</groupId>

grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/test/GebWithWebDriverBinariesSpec.groovy

@@ -69,7 +69,7 @@ class GebWithWebDriverBinariesSpec extends ApplicationContextSpec implements Com
         def buildGradle = output['build.gradle']
 
         expect:
-        buildGradle.contains('id "com.github.erdi.webdriver-binaries"')
+        buildGradle.contains('id "org.ysb33r.webdriver-binaries"')
         buildGradle.contains('webdriverBinaries')
         buildGradle.contains("chromedriver '122.0.6260.0'")
         buildGradle.contains("geckodriver '0.33.0'")
@@ -82,7 +82,7 @@ class GebWithWebDriverBinariesSpec extends ApplicationContextSpec implements Com
         def buildGradle = output['build.gradle']
 
         expect:
-        buildGradle.contains('id "com.github.erdi.webdriver-binaries"')
+        buildGradle.contains('id "org.ysb33r.webdriver-binaries"')
         buildGradle.contains('webdriverBinaries')
         buildGradle.contains("chromedriver '122.0.6260.0'")
         buildGradle.contains("geckodriver '0.33.0'")

grails-forge/test-core/src/test/groovy/org/grails/forge/create/CreateAppSpec.groovy

@@ -91,7 +91,7 @@ class CreateAppSpec extends CommandSpec {
 
         expect:
         gradleProperties.exists()
-        gradleProperties.text.contains('micronautPlatformVersion=4.9.2')
+        gradleProperties.text.contains('micronautPlatformVersion=4.10.1')
         gradleBuildFile.exists()
         gradleBuildFile.text.contains('implementation "org.apache.grails:grails-micronaut"')
     }