Merge pull request #15181 from apache/grails-plugin-not-grails-web

Update plugin logic and profile excludes for web plugin

Author: jamesfredley

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

@@ -71,10 +71,10 @@ public void apply(GeneratorContext generatorContext) {
 
         if (applicationType == ApplicationType.PLUGIN || applicationType == ApplicationType.WEB_PLUGIN) {
             generatorContext.addBuildPlugin(GradlePlugin.builder().id("org.apache.grails.gradle.grails-plugin").useApplyPlugin(true).build());
-        }
-        if (generatorContext.getFeature(GrailsWeb.class).isPresent()) {
+        } else if (generatorContext.getFeature(GrailsWeb.class).isPresent()) {
             generatorContext.addBuildPlugin(GradlePlugin.builder().id("org.apache.grails.gradle.grails-web").useApplyPlugin(true).build());
         }
+
         if (generatorContext.getFeature(GrailsGsp.class).isPresent()) {
             generatorContext.addBuildPlugin(GradlePlugin.builder().id("org.apache.grails.gradle.grails-gsp").useApplyPlugin(true).build());
         }

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

@@ -111,7 +111,22 @@ class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixtu
         build.contains("implementation \"org.apache.grails:grails-gsp\"")
 
         where:
-        applicationType << [ApplicationType.WEB, ApplicationType.WEB_PLUGIN]
+        applicationType << [ApplicationType.WEB]
+    }
+
+    @Unroll
+    void "test grails-plugin gradle plugins and dependencies are present for #applicationType application"() {
+        when:
+        final def output = generate(applicationType, new Options(TestFramework.SPOCK))
+        final String build = output['build.gradle']
+
+        then:
+        build.contains('apply plugin: "org.apache.grails.gradle.grails-plugin"')
+        build.contains('apply plugin: "org.apache.grails.gradle.grails-gsp"')
+        build.contains("implementation \"org.apache.grails:grails-gsp\"")
+
+        where:
+        applicationType << [ApplicationType.WEB_PLUGIN]
     }
 
     @Unroll

grails-profiles/web-plugin/profile.yml

@@ -35,5 +35,6 @@ build:
         - plugin
     excludes:
         - war
+        - org.apache.grails.gradle.grails-web