diff --git a/RELEASE.md b/RELEASE.md index 542f64fc185..90ccf9f4881 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,6 +1,6 @@ # Grails Core Release Process -1. Perform the release of any other dependent library and update the version in `gradle.properties`/`grails-bom/plugins.properties`/`grails-bom/profiles.properties` +1. Perform the release of any other dependent library and update the version in `gradle.properties`/`grails-bom/plugins.properties` 1. Ensure you have the latest changes locally `git pull` 1. Ensure all changes from previous branches are merged up `git merge ...` 1. Ensure there are no snapshot dependencies diff --git a/dependabot/build.gradle b/dependabot/build.gradle index 306b808e42c..afe31ad97ae 100644 --- a/dependabot/build.gradle +++ b/dependabot/build.gradle @@ -1,4 +1,4 @@ -// Generated on Fri Jan 31 16:17:36 PST 2025 by: ./gradlew :grails-bom:dependabotBuild +// Generated on Mon Feb 03 21:04:18 EST 2025 by: ./gradlew :grails-bom:dependabotBuild plugins { id 'java-library' } @@ -63,16 +63,16 @@ dependencies { api "org.grails.plugins:views-json-templates:${project['plugins-views-json-templates.version']}" api "org.grails.plugins:views-json:${project['plugins-views-json.version']}" api "org.grails.plugins:views-markup:${project['plugins-views-markup.version']}" - api "org.grails.profiles:angular:${project['profiles-angular.version']}" - api "org.grails.profiles:base:${project['profiles-base.version']}" - api "org.grails.profiles:plugin:${project['profiles-plugin.version']}" - api "org.grails.profiles:profile:${project['profiles-profile.version']}" - api "org.grails.profiles:react:${project['profiles-react.version']}" - api "org.grails.profiles:rest-api-plugin:${project['profiles-rest-api-plugin.version']}" - api "org.grails.profiles:rest-api:${project['profiles-rest-api.version']}" - api "org.grails.profiles:vue:${project['profiles-vue.version']}" - api "org.grails.profiles:web-plugin:${project['profiles-web-plugin.version']}" - api "org.grails.profiles:web:${project['profiles-web.version']}" + api "org.grails.profiles:angular:${project['profiles.version']}" + api "org.grails.profiles:base:${project['profiles.version']}" + api "org.grails.profiles:plugin:${project['profiles.version']}" + api "org.grails.profiles:profile:${project['profiles.version']}" + api "org.grails.profiles:react:${project['profiles.version']}" + api "org.grails.profiles:rest-api:${project['profiles.version']}" + api "org.grails.profiles:rest-api-plugin:${project['profiles.version']}" + api "org.grails.profiles:vue:${project['profiles.version']}" + api "org.grails.profiles:web:${project['profiles.version']}" + api "org.grails.profiles:web-plugin:${project['profiles.version']}" api "io.reactivex.rxjava2:rxjava:${project['rxjava2.version']}" api "io.reactivex.rxjava3:rxjava:${project['rxjava3.version']}" api "io.reactivex:rxjava:${project['rxjava.version']}" diff --git a/gradle.properties b/gradle.properties index fcd97bc0582..5867b3b4d78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,7 +30,7 @@ preventSnapshotPublish=false # https://github.com/grails/grails-gradle-plugin/issues/222 slf4jPreventExclusion=true -# Generated on Sun Feb 02 19:37:49 PST 2025 by: ./gradlew :grails-bom:syncProps +# Generated on Mon Feb 03 21:04:24 EST 2025 by: ./gradlew :grails-bom:syncProps # Only version value modifications allowed after this point. Do not insert or change version names. ant.version=1.10.15 asciidoctorj.version=3.0.0 @@ -73,16 +73,7 @@ plugins-views-gradle.version=4.0.0-SNAPSHOT plugins-views-json.version=4.0.0-SNAPSHOT plugins-views-json-templates.version=9.0.0-SNAPSHOT plugins-views-markup.version=4.0.0-SNAPSHOT -profiles-angular.version=10.0.1 -profiles-base.version=7.0.1 -profiles-plugin.version=7.0.1 -profiles-profile.version=7.0.1 -profiles-react.version=7.0.1 -profiles-rest-api.version=7.0.1 -profiles-rest-api-plugin.version=7.0.1 -profiles-vue.version=7.0.1 -profiles-web.version=7.0.1 -profiles-web-plugin.version=7.0.1 +profiles.version=10.0.2-SNAPSHOT rxjava.version=1.3.8 rxjava2.version=2.2.21 rxjava3.version=3.1.10 diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle index 3dd66437c91..8af21e1e2d6 100644 --- a/grails-bom/build.gradle +++ b/grails-bom/build.gradle @@ -11,9 +11,6 @@ javaPlatform { def plugins = new Properties() plugins.load(new StringReader(new File("$projectDir/plugins.properties").text)) -def profiles = new Properties() -profiles.load(new StringReader(new File("$projectDir/profiles.properties").text)) - def versions = new Properties() versions.load(new StringReader(new File("$projectDir.parentFile/gradle.properties").text)) @@ -51,6 +48,7 @@ ext { org.grails:grails-gradle-plugin:: org.grails:grails:gsp,web-gsp,web-taglib,web-testing-support::gsp org.grails:views-json-testing-support:: + org.grails.profiles:base,plugin,profile,web,rest-api,web-plugin,rest-api-plugin,react,vue,angular:::profiles org.jsoup:jsoup:: org.mongodb:bson:,record-codec::mongodb org.mongodb:mongodb-driver:core,sync::mongodb @@ -83,14 +81,13 @@ ext { } } - pluginsAndProfiles = - plugins.collect { [groupId: "org.grails.plugins", artifactId:it.key, versionValue: it.value, name: "plugins-${it.key}"] } + - profiles.collect { [groupId: "org.grails.profiles", artifactId:it.key, versionValue: it.value, name: "profiles-${it.key}"] } + pluginList = + plugins.collect { [groupId: "org.grails.plugins", artifactId:it.key, versionValue: it.value, name: "plugins-${it.key}"] } - dependenciesVersions = (dependencyList + pluginsAndProfiles).sort { it.name } + dependenciesVersions = (dependencyList + pluginList).sort { it.name } .groupBy { it.name }.collect { it.value.first() } // remove duplicates - allDependencies = (pluginsAndProfiles + dependencyList).sort { it.name + it.artifactId } + allDependencies = (pluginList + dependencyList).sort { it.name + it.artifactId } allDependencies.each { it << [version: "${it.name}.version"] } } diff --git a/grails-bom/profiles.properties b/grails-bom/profiles.properties deleted file mode 100644 index e76715bfb3e..00000000000 --- a/grails-bom/profiles.properties +++ /dev/null @@ -1,10 +0,0 @@ -rest-api=7.0.1 -base=7.0.1 -web=7.0.1 -react=7.0.1 -vue=7.0.1 -plugin=7.0.1 -profile=7.0.1 -rest-api-plugin=7.0.1 -web-plugin=7.0.1 -angular=10.0.1