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

add type 'pom' and scope 'import' for grails-bom and jackson-bom #14052

Merged
merged 5 commits into from
Mar 3, 2025
Merged

add type 'pom' and scope 'import' for grails-bom and jackson-bom #14052

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
f44b33b
add type 'pom' and scope 'import' for grails-bom and jackson-bom
jamesfredley Mar 3, 2025
31c9c84
fix typo
jamesfredley Mar 3, 2025
18cf6f4
add api platform dependencies
jamesfredley Mar 3, 2025
47e0d71
add back to dependenciesOverview
jamesfredley Mar 3, 2025
e3fe575
exclude extra groovy-bom and jackson-bom dependencies
jamesfredley Mar 3, 2025
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
2 changes: 1 addition & 1 deletion dependabot/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on Wed Feb 05 18:23:24 EST 2025 by: ./gradlew :grails-bom:dependabotBuild
// Generated on Mon Mar 03 17:24:14 EST 2025 by: ./gradlew :grails-bom:dependabotBuild
plugins {
id 'java-library'
}
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 @@ -37,7 +37,7 @@ preventSnapshotPublish=true
# https://github.com/grails/grails-gradle-plugin/issues/222
slf4jPreventExclusion=true

# Generated on Wed Feb 05 18:23:13 EST 2025 by: ./gradlew :grails-bom:syncProps
# Generated on Mon Mar 03 17:23:04 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
23 changes: 22 additions & 1 deletion grails-bom/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ allDependencies.each {

dependencies {
api platform("org.springframework.boot:spring-boot-dependencies:${project['spring-boot.version']}")
api platform("org.apache.groovy:groovy-bom:${project['groovy.version']}")
api platform("com.fasterxml.jackson:jackson-bom:${project['jackson.version']}")

constraints {
allDependencies.each {
Expand Down Expand Up @@ -128,6 +130,23 @@ publishing {

def dpm = root.appendNode('dependencyManagement')
def deps = dpm.appendNode('dependencies')

appendNodes(deps.appendNode('dependency'), [
groupId: 'org.apache.groovy',
artifactId: 'groovy-bom',
version: '${groovy.version}',
type: 'pom',
scope: 'import'
])

appendNodes(deps.appendNode('dependency'), [
groupId: 'com.fasterxml.jackson',
artifactId: 'jackson-bom',
version: '${jackson.version}',
type: 'pom',
scope: 'import'
])

appendNodes(deps.appendNode('dependency'), [
groupId: 'org.springframework.boot',
artifactId: 'spring-boot-dependencies',
Expand All @@ -148,7 +167,9 @@ publishing {
allDependencies.collect { def m = it.subMap('groupId', 'artifactId', 'version')
m + [version: "\${${m.version}}"]
}.each {
appendNodes(deps.appendNode('dependency'), it)
if(it.artifactId !in ['groovy-bom', 'jackson-bom']) {
appendNodes(deps.appendNode('dependency'), it)
}
}
}
}
Expand Down
Loading