feature: Grails 7.0.0-M5 & removal of provided grails dependencies
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index c499638..25e9908 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -45,7 +45,7 @@
dependencies {
implementation platform("org.apache.grails:grails-bom:${versions.get('grailsVersion')}")
- implementation 'com.bertramlabs.plugins:asset-pipeline-gradle'
+ implementation 'cloud.wondrify:asset-pipeline-gradle'
implementation 'org.apache.grails:grails-gradle-plugins'
implementation "org.nosphere.apache.rat:org.nosphere.apache.rat.gradle.plugin:${versions.get('ratVersion')}"
implementation "org.gradle.crypto.checksum:org.gradle.crypto.checksum.gradle.plugin:${versions.get('gradleCryptoChecksumVersion')}"
diff --git a/examples/redis-demo/build.gradle b/examples/redis-demo/build.gradle
index 29639d2..761cf18 100644
--- a/examples/redis-demo/build.gradle
+++ b/examples/redis-demo/build.gradle
@@ -18,7 +18,7 @@
*/
plugins {
- id 'com.bertramlabs.asset-pipeline'
+ id 'cloud.wondrify.asset-pipeline'
id 'org.apache.grails.gradle.grails-web'
id 'org.apache.grails.gradle.grails-gsp'
}
@@ -42,7 +42,7 @@
implementation 'org.apache.grails:grails-web-boot'
implementation 'org.webjars.npm:jquery'
- runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'
+ runtimeOnly 'cloud.wondrify:asset-pipeline-grails'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'
runtimeOnly 'org.fusesource.jansi:jansi'
diff --git a/gradle.properties b/gradle.properties
index fd2b188..54f3878 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,9 +15,7 @@
projectVersion=5.0.0-SNAPSHOT
-# TODO: This is a work around since the bom does not support exclusions and spring forces groovy version 4.0.26
-groovy.version=4.0.27
-grailsVersion=7.0.0-M4
+grailsVersion=7.0.0-M5
javaVersion=17
gradleCryptoChecksumVersion=1.4.0
ratVersion=0.8.1
diff --git a/plugin/build.gradle b/plugin/build.gradle
index e43bdcc..546dca3 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -1,22 +1,22 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
plugins {
id 'java-library'
id 'org.apache.grails.gradle.grails-plugin'
@@ -29,6 +29,43 @@
dependencies {
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
+ compileOnly "org.apache.grails:grails-core", {
+ // requires groovy & is a grails plugin
+ }
+ compileOnly "org.apache.grails:grails-services", {
+ // project has a dynamic service
+ }
+ compileOnly "org.apache.grails:grails-web-boot", {
+ // project uses gsp features, including taglib
+ }
+
+ // Spring includes will be in any end grails application, do not export them
+ // as people may use undertow instead of tomcat, etc
+ compileOnly "org.springframework.boot:spring-boot-autoconfigure"
+ compileOnly "org.springframework.boot:spring-boot-starter"
+ compileOnly "org.springframework.boot:spring-boot-starter-actuator"
+ compileOnly "org.springframework.boot:spring-boot-starter-logging"
+ compileOnly "org.springframework.boot:spring-boot-starter-validation"
+ compileOnly "org.springframework.boot:spring-boot-starter-tomcat"
+
+ testImplementation platform("org.apache.grails:grails-bom:$grailsVersion")
+ testImplementation 'org.apache.grails:grails-testing-support-web'
+ testImplementation 'org.spockframework:spock-core'
+ testImplementation "org.springframework.boot:spring-boot-autoconfigure"
+ testImplementation "org.springframework.boot:spring-boot-starter"
+ testImplementation "org.springframework.boot:spring-boot-starter-actuator"
+ testImplementation "org.springframework.boot:spring-boot-starter-logging"
+ testImplementation "org.springframework.boot:spring-boot-starter-validation"
+ testImplementation "org.springframework.boot:spring-boot-starter-tomcat"
+ testImplementation "org.apache.grails:grails-core", {
+ // requires groovy & is a grails plugin
+ }
+ testImplementation "org.apache.grails:grails-services", {
+ // project has a dynamic service
+ }
+ testImplementation "org.apache.grails:grails-web-boot", {
+ // project uses gsp features, including taglib
+ }
api 'redis.clients:jedis', {
// api: Jedis, JedisConnectionException
@@ -37,31 +74,6 @@
api 'com.google.code.gson:gson', {
// api: Gson(transform)
}
- api 'org.springframework:spring-beans', {
- // api: @Autowired(transform)
- }
- api 'org.springframework:spring-core', {
- // api: Opcodes(transform)
- }
-
- implementation 'org.apache.grails.data:grails-datamapping-core', {
- // impl: @Transactional(runtime)
- }
- implementation 'org.apache.grails.views:grails-web-taglib', {
- // Project has a taglib
- }
-
- compileOnly 'org.apache.grails.bootstrap:grails-bootstrap', {
- // comp: @PluginSource(source)
- }
- compileOnly 'org.apache.grails:grails-core', { // Provided as this is a Grails Plugin
- // api GrailsApplication, Holders(transform)
- // impl: GrailsApp, GrailsAutoConfiguration, Plugin
- }
- compileOnly 'org.apache.groovy:groovy' // Provided as this is a Grails Plugin
-
- testImplementation 'org.apache.grails:grails-testing-support-web'
- testImplementation 'org.spockframework:spock-core'
}
apply {
@@ -70,4 +82,8 @@
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/reproducible-config.gradle')
+}
+
+grails {
+ springDependencyManagement = false
}
\ No newline at end of file
