dependency cleanup with grails-bom

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

grails-forge-core/src/main/java/org/grails/forge/build/dependencies/Dependency.java

@@ -207,6 +207,10 @@ public Builder profile() {
             return scope(Scope.PROFILE);
         }
 
+        public Builder integrationTestImplementationTestFixtures() {
+            return scope(Scope.INTEGRATION_TEST_IMPLEMENTATION_TEST_FIXTURES);
+        }
+
         public Builder annotationProcessor(boolean requiresPriority) {
             this.annotationProcessorPriority = requiresPriority;
             return annotationProcessor();

grails-forge-core/src/main/java/org/grails/forge/build/dependencies/Phase.java

@@ -23,5 +23,6 @@ public enum Phase {
     RUNTIME,
     OPENREWRITE,
     BUILD,
-    PROFILE
+    PROFILE,
+    INTEGRATION_TEST_IMPLEMENTATION_TEST_FIXTURES
 }

grails-forge-core/src/main/java/org/grails/forge/build/dependencies/Scope.java

@@ -37,6 +37,8 @@ public class Scope {
     public static final Scope TEST_RUNTIME = new Scope(Source.TEST, Collections.singletonList(Phase.RUNTIME));
     public static final Scope OPENREWRITE = new Scope(Source.MAIN, Collections.singletonList(Phase.OPENREWRITE));
     public static final Scope PROFILE = new Scope(Source.MAIN, Collections.singletonList(Phase.PROFILE));
+    public static final Scope INTEGRATION_TEST_IMPLEMENTATION_TEST_FIXTURES = new Scope(Source.MAIN, Collections.singletonList(Phase.INTEGRATION_TEST_IMPLEMENTATION_TEST_FIXTURES));
+
 
     @NonNull
     private Source source;

grails-forge-core/src/main/java/org/grails/forge/build/gradle/GradleConfiguration.java

@@ -37,10 +37,11 @@ public enum GradleConfiguration implements Ordered {
     RUNTIME_ONLY("runtimeOnly", 7),
     TEST_ANNOTATION_PROCESSOR("testAnnotationProcessor", 8),
     TEST_KAPT("kaptTest", 9),
-    TEST_IMPLEMENTATION("testImplementation", 10),
-    TEST_COMPILE_ONLY("testCompileOnly", 11),
-    TEST_RUNTIME_ONLY("testRuntimeOnly", 12),
-    OPENREWRITE("rewrite", 13);
+    INTEGRATION_TEST_IMPLEMENTATION_TEST_FIXTURES("integrationTestImplementation testFixtures", 10),
+    TEST_IMPLEMENTATION("testImplementation", 11),
+    TEST_COMPILE_ONLY("testCompileOnly", 12),
+    TEST_RUNTIME_ONLY("testRuntimeOnly", 13),
+    OPENREWRITE("rewrite", 14);
 
     private final String configurationName;
     private final int order;
@@ -99,6 +100,9 @@ public static Optional<GradleConfiguration> of(@NonNull Scope scope,
                 if (scope.getPhases().contains(Phase.PROFILE)) {
                     return Optional.of(GradleConfiguration.PROFILE);
                 }
+                if (scope.getPhases().contains(Phase.INTEGRATION_TEST_IMPLEMENTATION_TEST_FIXTURES)) {
+                    return Optional.of(GradleConfiguration.INTEGRATION_TEST_IMPLEMENTATION_TEST_FIXTURES);
+                }
                 break;
 
             case TEST:

grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/AssetPipeline.java

@@ -67,7 +67,7 @@ public void apply(GeneratorContext generatorContext) {
 
         generatorContext.addDependency(Dependency.builder()
                 .groupId("com.bertramlabs.plugins")
-                .lookupArtifactId("asset-pipeline-grails")
+                .artifactId("asset-pipeline-grails")
                 .runtime());
 
         final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();

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

@@ -19,7 +19,7 @@ GradleBuild gradleBuild
 )
 
 @seleniumVersion => { @coordinateResolver.apply("selenium-api").getVersion() }
-@assetPipelineVersion => { @coordinateResolver.apply("asset-pipeline-grails").getVersion() }
+@assetPipelineVersion => { @coordinateResolver.apply("asset-pipeline-gradle").getVersion() }
 
 @for (String importLine : gradleBuild.getPluginsImports()) {
 @(importLine)
@@ -43,19 +43,7 @@ apply from: "gradle/asciidoc.gradle"
 repositories {
     mavenCentral()
     maven { url "https://repo.grails.org/grails/core/" }
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-}
-
-configurations {
-    all {
-        @if (features.contains("geb")) {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details->
-            if (details.requested.group == 'org.seleniumhq.selenium') {
-                details.useVersion('@seleniumVersion')
-            }
-        }
-        }
-    }
+    maven { url "https://repository.apache.org/content/repositories/snapshots"}
 }
 
 @dependencies.template(applicationType, project, features, gradleBuild)
@@ -67,11 +55,7 @@ application {
 
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(@features.getTargetJdk())
-    }
-}
+compileJava.options.release = @features.getTargetJdk()
 
 @if (features.contains("jrebel")) {
 run {

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

@@ -3,6 +3,7 @@
 @import org.grails.forge.feature.Features
 @import org.grails.forge.build.gradle.GradleBuild
 @import org.grails.forge.build.gradle.GradleDependency
+@import org.grails.forge.util.VersionInfo
 
 @args (
 ApplicationType applicationType,
@@ -11,12 +12,16 @@ Features features,
 GradleBuild gradleBuild
 )
 
+@grailsVersion => { @VersionInfo.getGrailsVersion() }
+
 @if(!gradleBuild.getBuildscriptDependencies().isEmpty()) {
 repositories {
     mavenCentral()
     maven { url "https://repo.grails.org/grails/core/" }
+    maven { url "https://repository.apache.org/content/repositories/snapshots"}
 }
 dependencies {
+    implementation platform("org.grails:grails-bom:@grailsVersion")
 @for (GradleDependency dependency : gradleBuild.getBuildscriptDependencies()) {
     @dependency.toSnippet()
 }

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

@@ -14,7 +14,7 @@ Features features)
 
 @grailsGradlePluginVersion => { @coordinateResolver.apply("grails-gradle-plugin").getVersion() }
 @viewsGradlePluginVersion => { @coordinateResolver.apply("views-gradle").getVersion() }
-@assetPipelineVersion => { @coordinateResolver.apply("asset-pipeline-grails").getVersion() }
+@assetPipelineVersion => { @coordinateResolver.apply("asset-pipeline-gradle").getVersion() }
 
 @gradleBuild.renderSettingsExtensions()
 

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

@@ -103,26 +103,22 @@ public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails.plugins")
                 .artifactId("geb")
-                .test());
+                .integrationTestImplementationTestFixtures());
 
         Stream.of("api", "support", "remote-driver")
                 .map(name -> "selenium-" + name)
                 .forEach(name -> generatorContext.addDependency(Dependency.builder()
                         .groupId("org.seleniumhq.selenium")
-                        .lookupArtifactId(name)
+                        .artifactId(name)
                         .test()));
 
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.seleniumhq.selenium")
-                .lookupArtifactId("selenium-chrome-driver")
+                .artifactId("selenium-firefox-driver")
                 .testRuntime());
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.seleniumhq.selenium")
-                .lookupArtifactId("selenium-firefox-driver")
-                .testRuntime());
-        generatorContext.addDependency(Dependency.builder()
-                .groupId("org.seleniumhq.selenium")
-                .lookupArtifactId("selenium-safari-driver")
+                .artifactId("selenium-safari-driver")
                 .testRuntime());
 
         TestFramework testFramework = generatorContext.getTestFramework();

grails-forge-core/src/main/java/org/grails/forge/feature/view/Scaffolding.java

@@ -81,7 +81,7 @@ public void processSelectedFeatures(FeatureContext featureContext) {
     public void apply(GeneratorContext generatorContext) {
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.fusesource.jansi")
-                .lookupArtifactId("jansi")
+                .artifactId("jansi")
                 .runtime());
 
         generatorContext.addDependency(Dependency.builder()

grails-forge-core/src/main/java/org/grails/forge/options/Options.java

@@ -66,7 +66,6 @@ public Options(TestFramework testFramework,
         this(testFramework, GormImpl.DEFAULT_OPTION, ServletImpl.DEFAULT_OPTION, javaVersion, operatingSystem, Collections.emptyMap());
     }
 
-
     public Options(TestFramework testFramework,
                    OperatingSystem operatingSystem) {
 

grails-forge-core/src/main/resources/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -12,11 +12,6 @@
         </repository>
     </repositories>
     <dependencies>
-        <dependency>
-            <groupId>org.fusesource.jansi</groupId>
-            <artifactId>jansi</artifactId>
-            <version>1.18</version>
-        </dependency>
         <dependency>
             <groupId>org.grails</groupId>
             <artifactId>grails-gradle-plugin</artifactId>
@@ -30,7 +25,7 @@
         <dependency>
             <groupId>org.grails.plugins</groupId>
             <artifactId>cache</artifactId>
-            <version>7.0.0</version>
+            <version>8.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.grails.plugins</groupId>
@@ -87,46 +82,11 @@
             <artifactId>webdriver-binaries-gradle-plugin</artifactId>
             <version>3.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-api</artifactId>
-            <version>4.19.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-support</artifactId>
-            <version>4.19.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-remote-driver</artifactId>
-            <version>4.19.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-chrome-driver</artifactId>
-            <version>4.19.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-safari-driver</artifactId>
-            <version>4.19.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-firefox-driver</artifactId>
-            <version>4.19.1</version>
-        </dependency>
         <dependency>
             <groupId>org.zeroturnaround</groupId>
             <artifactId>gradle-jrebel-plugin</artifactId>
             <version>1.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.bertramlabs.plugins</groupId>
-            <artifactId>asset-pipeline-grails</artifactId>
-            <version>5.0.1</version>
-        </dependency>
         <dependency>
             <groupId>com.bertramlabs.plugins</groupId>
             <artifactId>asset-pipeline-gradle</artifactId>

grails-forge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy

@@ -28,7 +28,7 @@ class AssetPipelineSpec extends ApplicationContextSpec implements CommandOutputF
 
         then:
         template.contains("id \"com.bertramlabs.asset-pipeline\"")
-        template.contains("runtimeOnly(\"com.bertramlabs.plugins:asset-pipeline-grails:5.0.1\")")
+        template.contains("runtimeOnly(\"com.bertramlabs.plugins:asset-pipeline-grails\")")
         template.contains('''
 assets {
     minifyJs = true

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

@@ -17,12 +17,11 @@ class GebSpec extends ApplicationContextSpec implements CommandOutputFixture {
         final def buildGradle = output["build.gradle"]
 
         expect:
-        buildGradle.contains("testImplementation(\"org.grails.plugins:geb\")")
-        buildGradle.contains("testImplementation(\"org.seleniumhq.selenium:selenium-api:4.19.1\")")
-        buildGradle.contains("testImplementation(\"org.seleniumhq.selenium:selenium-support:4.19.1\")")
-        buildGradle.contains("testImplementation(\"org.seleniumhq.selenium:selenium-remote-driver:4.19.1\")")
-        buildGradle.contains("testRuntimeOnly(\"org.seleniumhq.selenium:selenium-chrome-driver:4.19.1\")")
-        buildGradle.contains("testRuntimeOnly(\"org.seleniumhq.selenium:selenium-firefox-driver:4.19.1\")")
+        buildGradle.contains("integrationTestImplementation testFixtures(\"org.grails.plugins:geb\")")
+        buildGradle.contains("testImplementation(\"org.seleniumhq.selenium:selenium-api\")")
+        buildGradle.contains("testImplementation(\"org.seleniumhq.selenium:selenium-support\")")
+        buildGradle.contains("testImplementation(\"org.seleniumhq.selenium:selenium-remote-driver\")")
+        buildGradle.contains("testRuntimeOnly(\"org.seleniumhq.selenium:selenium-firefox-driver\")")
     }
 
     void "test GebConfig.groovy file is present"() {
@@ -33,17 +32,6 @@ class GebSpec extends ApplicationContextSpec implements CommandOutputFixture {
         output.containsKey('src/integration-test/resources/GebConfig.groovy')
     }
 
-    void "test build.gradle contains logic to force selenium version"() {
-        given:
-        final def output = generate(ApplicationType.WEB, new Options(TestFramework.SPOCK))
-        final def buildGradle = output["build.gradle"]
-
-        expect:
-        buildGradle.contains("if (details.requested.group == 'org.seleniumhq.selenium') {\n" +
-                "                details.useVersion('4.19.1')\n" +
-                "            }")
-    }
-
     @Unroll
     void "test feature geb is not supported for #applicationType application"(ApplicationType applicationType) {
         when:

grails-forge-core/src/test/groovy/org/grails/forge/feature/view/ScaffoldingSpec.groovy

@@ -23,7 +23,7 @@ class ScaffoldingSpec extends ApplicationContextSpec implements CommandOutputFix
 
         then:
         template.contains('implementation("org.grails.plugins:scaffolding")')
-        template.contains('runtimeOnly("org.fusesource.jansi:jansi:1.18")')
+        template.contains('runtimeOnly("org.fusesource.jansi:jansi")')
     }
 
 }