Merge pull request #14942 from apache/match-profile-forge

Update base, web and rest-api profiles to more closely match Forge

Author: jamesfredley

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

@@ -70,7 +70,6 @@ public void apply(GeneratorContext generatorContext) {
 
         generatorContext.addBuildPlugin(GradlePlugin.builder().id("eclipse").build());
         generatorContext.addBuildPlugin(GradlePlugin.builder().id("idea").build());
-        generatorContext.addBuildPlugin(GradlePlugin.builder().id("groovy").build());
 
         BuildTool buildTool = BuildTool.DEFAULT_OPTION;
         GradleBuild build = dependencyResolver.create(generatorContext);

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

@@ -82,6 +82,10 @@ public void apply(GeneratorContext generatorContext) {
                 .groupId("org.apache.grails")
                 .artifactId("grails-logging")
                 .implementation());
+        generatorContext.addDependency(Dependency.builder()
+                .groupId("org.apache.grails")
+                .artifactId("grails-events")
+                .implementation());
 
         final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         generatorContext.addTemplate("src/main/groovy", new URLTemplate("src/main/groovy/.gitkeep", classLoader.getResource(".gitkeep")));

grails-profiles/base/features/less-asset-pipeline/feature.yml

@@ -1,7 +1,7 @@
 description: Adds LESS Transpiler Asset Pipeline to a Grails project
 build:
     plugins:
-        - asset-pipeline
+        - cloud.wondrify.asset-pipeline
 dependencies:
     - scope: build
       coords: "cloud.wondrify:asset-pipeline-gradle"

grails-profiles/base/profile.yml

@@ -17,11 +17,12 @@ skeleton:
     executable: ["**/gradlew*", "**/grailsw*"]
     binaryExtensions: ['png','gif','jpg','jpeg','ico','icns','pdf','zip','jar','class']
 repositories:
-    - "https://repository.apache.org/content/groups/public"
     - "https://repo.grails.org/grails/restricted"
+features:
+  defaults:
+    - events
 build:
     repositories:
-        - "https://repository.apache.org/content/groups/public"
         - "https://repo.grails.org/grails/restricted"
     plugins:
         - eclipse
@@ -30,12 +31,6 @@ build:
 dependencies:
     - scope: build
       coords: "org.apache.grails:grails-gradle-plugins"
-    - scope: testAndDevelopmentOnly
-      coords: "org.webjars.npm:bootstrap"
-    - scope: testAndDevelopmentOnly
-      coords: "org.webjars.npm:bootstrap-icons"
-    - scope: testAndDevelopmentOnly
-      coords: "org.webjars.npm:jquery"
     - scope: implementation
       coords: "org.springframework.boot:spring-boot-starter-logging"
     - scope: implementation
@@ -46,7 +41,13 @@ dependencies:
       coords: "org.springframework.boot:spring-boot-starter"
     - scope: implementation
       coords: "org.apache.grails:grails-core"
+    - scope: implementation
+      coords: "org.apache.grails:grails-i18n"
     - scope: testImplementation
       coords: "org.apache.grails:grails-testing-support-datamapping"
     - scope: console
       coords: "org.apache.grails:grails-console"
+    - scope: runtimeOnly
+      coords: "org.fusesource.jansi:jansi"
+    - scope: testImplementation
+      coords: "org.spockframework:spock-core"

grails-profiles/base/skeleton/build.gradle

@@ -2,7 +2,12 @@ buildscript {
     repositories {
         mavenCentral()
 @buildRepositories@
-
+        maven {
+           url = 'https://repository.apache.org/content/groups/snapshots'
+           content {
+              includeVersionByRegex('org[.]apache[.](grails|groovy).*', '.*', '.*-SNAPSHOT')
+           }
+        }
     }
     dependencies {
         classpath platform("org.apache.grails:grails-bom:$grailsVersion")
@@ -18,11 +23,17 @@ group "@grails.app.group@"
 repositories {
     mavenCentral()
 @repositories@
+    maven {
+       url = 'https://repository.apache.org/content/groups/snapshots'
+       content {
+          includeVersionByRegex('org[.]apache[.](grails|groovy).*', '.*', '.*-SNAPSHOT')
+       }
+    }
 }
 
 dependencies {
     implementation platform("org.apache.grails:grails-bom:$grailsVersion")
-    developmentOnly("org.springframework.boot:spring-boot-devtools") // Spring Boot DevTools may cause performance slowdowns or compatibility issues on larger applications
+    developmentOnly "org.springframework.boot:spring-boot-devtools" // Spring Boot DevTools may cause performance slowdowns or compatibility issues on larger applications
     integrationTestImplementation testFixtures("org.apache.grails:grails-geb")
 @dependencies@
 }

grails-profiles/plugin/features/asset-pipeline-plugin/feature.yml

@@ -1,7 +1,7 @@
 description: Adds Asset Pipeline to a Grails Plugin for packaging
 build:
     plugins:
-        - asset-pipeline
+        - cloud.wondrify.asset-pipeline
 dependencies:
     - scope: build
       coords: 'cloud.wondrify:asset-pipeline-gradle'

grails-profiles/rest-api/profile.yml

@@ -16,7 +16,6 @@ description: Profile for REST API applications
 features:
     defaults: 
         - hibernate5
-        - events
     required:
         - json-views
 build:
@@ -34,31 +33,17 @@ dependencies:
       coords: "org.apache.grails:grails-url-mappings"
     - scope: implementation
       coords: "org.apache.grails:grails-rest-transforms"
-    - scope: implementation
-      coords: "org.apache.grails:grails-codecs"
     - scope: implementation
       coords: "org.apache.grails:grails-interceptors"
     - scope: implementation
       coords: "org.apache.grails:grails-services"
-    - scope: implementation
-      coords: "org.apache.grails:grails-datasource"
     - scope: implementation
       coords: "org.apache.grails:grails-databinding"
     - scope: implementation
       coords: "org.apache.grails:grails-web-boot"
     - scope: implementation
       coords: "org.apache.grails:grails-logging"
-    - scope: implementation
-      coords: "org.apache.grails:grails-cache"
-    - scope: implementation
-      coords: "org.apache.grails:grails-async"
-    - scope: testImplementation
-      coords: "io.micronaut:micronaut-http-client:4.6.5"
-    - scope: testImplementation
-      coords: "org.apache.grails:grails-testing-support-web"
     - scope: testImplementation
       coords: "org.apache.grails:grails-testing-support-datamapping"
     - scope: testImplementation
       coords: "org.apache.grails:grails-testing-support-views-gson"
-    - scope: testImplementation
-      coords: "org.hibernate.validator:hibernate-validator"

grails-profiles/web/profile.yml

@@ -39,17 +39,21 @@ dependencies:
       coords: "org.apache.grails:grails-rest-transforms"
     - scope: implementation
       coords: "org.apache.grails:grails-databinding"
-    - scope: implementation
-      coords: "org.apache.grails:grails-i18n"
     - scope: implementation
       coords: "org.apache.grails:grails-services"
     - scope: implementation
       coords: "org.apache.grails:grails-url-mappings"
+    - scope: implementation
+      coords: "org.apache.grails:grails-layout"
     - scope: implementation
       coords: "org.apache.grails:grails-interceptors"
     - scope: implementation
       coords: "org.apache.grails:grails-scaffolding"
     - scope: testImplementation
       coords: "org.apache.grails:grails-testing-support-web"
-    - scope: testImplementation
-      coords: "org.spockframework:spock-core"
+    - scope: testAndDevelopmentOnly
+      coords: "org.webjars.npm:bootstrap"
+    - scope: testAndDevelopmentOnly
+      coords: "org.webjars.npm:bootstrap-icons"
+    - scope: testAndDevelopmentOnly
+      coords: "org.webjars.npm:jquery"