Merge branch '7.0.x' into matrei/fix-distribution

# Conflicts: # gradle.properties
grails · Oct 16, 2024 · f37b9bd · f37b9bd
2 parents 0afc733 + ab1b7e9
commit f37b9bd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 34 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,9 +26,9 @@ ext {
     // When making changes in the dependencyVersions, remember to also update the Grails BOM Documentation:
     // https://docs.grails.org/snapshot/ref/Dependency%20Versions/Grails%20BOM.html
     dependencyVersions = [
-            'fieldsPlugin'           : [version: fieldsPluginVersion,
-                                        group  : 'org.grails.plugins',
-                                        names  : ['fields'],
+            'grailsGradlePlugin'      : [version: grailsGradlePluginVersion,
+                                        group  : 'org.grails',
+                                        names  : ['grails-gradle-plugin'],
                                         modules: ['']
             ],
             'jakarta-annotation'     : [version: jakartaAnnotationApiVersion,

diff --git a/gradle.properties b/gradle.properties
@@ -14,13 +14,13 @@ commonsIOVersion=2.17.0
 datastoreVersion=9.0.0-SNAPSHOT
 directoryWatcherVersion=0.18.0
 expectitCoreVersion=0.9.0
-fieldsPluginVersion=6.0.0-SNAPSHOT
 gdocEngineVersion=1.0.1
 gradleNexusPluginVersion=2.3.1
 gradleNexusPublishPluginVersion=1.3.0
 gradleExtraConfigurationsPluginVersion=10.0.1
 gradleLicensePluginVersion=0.16.1
 gradleToolingApiVersion=8.10.2
+grailsGradlePluginVersion=7.0.0-SNAPSHOT
 groovyVersion=4.0.23
 gspVersion=7.0.0-SNAPSHOT
 hamcrestVersion=3.0

diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle
@@ -45,27 +45,6 @@ publishing {
                                     if (sub.name == 'grails-dependencies') {
                                         mkp.type 'pom'
                                     }
-
-                                    if (sub.name == 'grails-bootstrap') {
-                                        mkp.exclusions {
-                                            mkp.exclusion {
-                                                mkp.groupId 'jline'
-                                                mkp.artifactId 'jline'
-                                            }
-                                            mkp.exclusion {
-                                                mkp.groupId 'org.fusesource.jansi'
-                                                mkp.artifactId 'jansi'
-                                            }
-                                            mkp.exclusion {
-                                                mkp.groupId 'net.java.dev.jna'
-                                                mkp.artifactId 'jna'
-                                            }
-                                            mkp.exclusion {
-                                                mkp.groupId 'org.apache.groovy'
-                                                mkp.artifactId 'groovy-ant'
-                                            }
-                                        }
-                                    }
                                 }
                             }
 
@@ -92,11 +71,7 @@ publishing {
                                     artifactId = artifactId.replace("gorm.", "")
                                 }
                                 mkp.dependency {
-                                    if(artifactId == 'grails-gradle-plugin') {
-                                        mkp.groupId 'org.grails'
-                                    } else {
-                                        mkp.groupId 'org.grails.plugins'
-                                    }
+                                    mkp.groupId 'org.grails.plugins'
                                     mkp.artifactId artifactId
                                     String versionValue = plugin.value
                                     if (!isBuildSnapshot && versionValue.endsWith("-SNAPSHOT")) {

diff --git a/grails-bom/plugins.properties b/grails-bom/plugins.properties
@@ -1,12 +1,12 @@
+cache=8.0.0-SNAPSHOT
+fields=6.0.0-SNAPSHOT
+geb=5.0.0-SNAPSHOT
 gorm.hibernate5=9.0.0-SNAPSHOT
 gorm.mongodb=9.0.0-SNAPSHOT
 gorm.neo4j=8.1.0
-grails-gradle-plugin=7.0.0-SNAPSHOT
-cache=8.0.0-SNAPSHOT
 rxjava=1.1.1
 rxjava2=2.0.0
 scaffolding=6.0.0-SNAPSHOT
-geb=5.0.0-SNAPSHOT
 views-json=4.0.0-SNAPSHOT
 views-json-templates=4.0.0-SNAPSHOT
-views-markup=4.0.0-SNAPSHOT
+views-markup=4.0.0-SNAPSHOT