Merge pull request #605 from jdaugherty/4.0.x

Fix grails-bom being overridden in json-testing-support, remove older…
grails · Dec 21, 2024 · 713e2f0 · 713e2f0
2 parents 5fcc399 + e802d16
commit 713e2f0
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -106,4 +106,15 @@ tasks.withType(InitializeNexusStagingRepository).configureEach {
     shouldRunAfter = tasks.withType(Sign)
 }
 
-apply from: rootProject.layout.projectDirectory.file('gradle/dependency-updates.gradle')
+subprojects {
+    apply plugin: 'groovy'
+
+    dependencies {
+        implementation platform(libs.grails.bom), {
+            exclude group: 'org.grails.plugins', module: 'views-gradle'
+            exclude group: 'org.grails.plugins', module: 'views-json'
+            exclude group: 'org.grails', module: 'views-core'
+            exclude group: 'org.grails', module: 'views-json-testing-support'
+        }
+    }
+}
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -26,7 +26,4 @@ dependencies {
     runtimeOnly buildsrcLibs.nexus.publish.gradle.plugin
     runtimeOnly buildsrcLibs.grails.gradle.plugin
     runtimeOnly buildsrcLibs.grails.views.gradle.plugin
-    runtimeOnly buildsrcLibs.groovydoc.gradle.plugin
 }
-
-apply from: rootProject.layout.projectDirectory.file('../gradle/dependency-updates.gradle')
diff --git a/core/build.gradle b/core/build.gradle
@@ -10,7 +10,6 @@ ext.set('projectDesc', 'Grails Views Core')
 
 dependencies {
 
-    api platform(libs.grails.bom)
     api libs.caffeine // Used in public API
     api libs.grails.datastore.core // MappingContext is used in public API
     api libs.grails.mimetypes // MimeUtility is used in public API

diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
@@ -12,7 +12,6 @@ dependencies {
 
     // the gradle api is provided by java-gradle-plugin
 
-    implementation platform(libs.grails.bom)
     implementation libs.jakarta.annotation.api
 
     compileOnly libs.groovy.core // @CompileStatic

diff --git a/gradle/buildsrc.libs.versions.toml b/gradle/buildsrc.libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 asciidoctor-gradle-jvm = '4.0.3'
-grails-gradle-plugin = '7.0.0-M2'
+grails-gradle-plugin = '7.0.0-SNAPSHOT'
 grails-views = '4.0.0-SNAPSHOT'
 groovy-doc = '1.0.1'
 nexus-publish-gradle-plugin = '1.3.0'

diff --git a/gradle/dependency-updates.gradle b/gradle/dependency-updates.gradle
diff --git a/json-testing-support/build.gradle b/json-testing-support/build.gradle
@@ -10,14 +10,28 @@ ext.set('projectDesc', 'JSON Views Testing Support')
 
 dependencies {
 
-    api project(':views-json') // Used in public API
+    // Note: the bom has to be excluded on grails dependencies otherwise it will be detected as snapshot
+    // (even though none of these projects have a version that is snapshot).
+    // This behavior is only seen on a non-buildsnapshot project version.
+
+    api project(':views-json'), { // Used in public API
+        exclude group: 'org.grails', module: 'grails-bom'
+    }
     api libs.spring.web // Used in public API
-    api libs.grails.datastore.core // Used in public API
+    api libs.grails.datastore.core, { // Used in public API
+        exclude group: 'org.grails', module: 'grails-bom'
+    }
     api libs.spock.core // Used in public API
 
-    implementation libs.grails.core
-    implementation libs.grails.testing.support.core
-    implementation libs.grails.web.urlmappings
+    implementation libs.grails.core, {
+        exclude group: 'org.grails', module: 'grails-bom'
+    }
+    implementation libs.grails.testing.support.core, {
+        exclude group: 'org.grails', module: 'grails-bom'
+    }
+    implementation libs.grails.web.urlmappings, {
+        exclude group: 'org.grails', module: 'grails-bom'
+    }
     implementation libs.groovy.core
     implementation libs.groovy.json
     implementation libs.groovy.templates