Skip to content

Commit

Permalink
Merge pull request #13995 from grails/consolidate-profile-version
Browse files Browse the repository at this point in the history
Update and consolidate version for 10 active profiles
  • Loading branch information
jamesfredley authored Feb 4, 2025
2 parents 322b0ee + 93153fc commit abd623a
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 41 deletions.
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 11 additions & 11 deletions dependabot/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
Expand Down Expand Up @@ -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']}"
Expand Down
13 changes: 2 additions & 11 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
13 changes: 5 additions & 8 deletions grails-bom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"] }
}

Expand Down
10 changes: 0 additions & 10 deletions grails-bom/profiles.properties

This file was deleted.

0 comments on commit abd623a

Please sign in to comment.