Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Bom #13755

Merged
merged 5 commits into from
Oct 15, 2024
Merged

Fix Bom #13755

Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ 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 = [
'grailsGradlePlugin' : [version: grailsGradlePluginVersion,
group : 'org.grails',
names : ['grails-gradle-plugin'],
modules: ['']
],
'fieldsPlugin' : [version: fieldsPluginVersion,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also move the fields plugin to plugins.properties? fields was probably added here because it was using group io.github.gpc at the time of inclusion. Now that fields is using org.grails.plugins we can delete it here and add fields=6.0.0-SNAPSHOT to plugins.properties instead. Then we should also be able to remove fieldsPluginVersion=6.0.0-SNAPSHOT from gradle.properties.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great idea!

group : 'org.grails.plugins',
names : ['fields'],
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ gradleNexusPluginVersion=2.3.1
gradleNexusPublishPluginVersion=1.3.0
gradleExtraConfigurationsPluginVersion=10.0.1
gradleLicensePluginVersion=0.16.1
grailsGradlePluginVersion=7.0.0-SNAPSHOT
groovyVersion=4.0.23
gspVersion=7.0.0-SNAPSHOT
hamcrestVersion=3.0
Expand Down
27 changes: 1 addition & 26 deletions grails-bom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
}
}

Expand All @@ -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")) {
Expand Down
1 change: 0 additions & 1 deletion grails-bom/plugins.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
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
Expand Down
Loading