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.

Sign up for GitHub

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 all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
977db15
No longer needed thanks to #13749
codeconsole Oct 14, 2024
098c6a2
grails-gradle-plugin is a gradle plugin, not a grails plugin
codeconsole Oct 14, 2024
0a9796a
Merge branch '7.0.x' into 7.0.x-fix-bom
codeconsole Oct 14, 2024
7053f19
workaround no longer needed
codeconsole Oct 14, 2024
6446d5c
Move fields plugin to plugins.properties and sort versions
codeconsole Oct 15, 2024
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
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ 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
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
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions grails-bom/plugins.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cache=8.0.0-SNAPSHOT
fieldsPluginVersion=6.0.0-SNAPSHOT
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the property must be fields=6.0.0-SNAPSHOT as the artifactId is taken from the property name.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whoops! You shouldn't have pre-approved lol

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's what happens when I copy and paste while talking to 3 people at the same time. 🤦

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
Loading