Skip to content

Commit f1858c5

Browse files
jdaughertyjdaugherty
committed
explicitly define groovy in the bom so when using the spring dependency management plugin, the correct version is chosen
1 parent 19a8f14 commit f1858c5

File tree

1 file changed

+48
-16
lines changed

1 file changed

+48
-16
lines changed

‎dependencies.gradle‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ ext {
4949

5050
// Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
5151
gradleBomDependencies = [
52-
'ant' : "org.apache.ant:ant:${gradleBomDependencyVersions['ant.version']}",
53-
'ant-junit' : "org.apache.ant:ant-junit:${gradleBomDependencyVersions['ant.version']}",
54-
'asciidoctor-gradle-jvm' : "org.asciidoctor:asciidoctor-gradle-jvm:${gradleBomDependencyVersions['asciidoctor-gradle-jvm.version']}",
55-
'asciidoctorj' : "org.asciidoctor:asciidoctorj:${gradleBomDependencyVersions['asciidoctorj.version']}",
56-
'asset-pipeline-gradle' : "cloud.wondrify:asset-pipeline-gradle:${gradleBomDependencyVersions['asset-pipeline-gradle.version']}",
57-
'byte-buddy' : "net.bytebuddy:byte-buddy:${gradleBomDependencyVersions['byte-buddy.version']}",
58-
'commons-text' : "org.apache.commons:commons-text:${gradleBomDependencyVersions['commons-text.version']}",
59-
'directory-watcher' : "io.methvin:directory-watcher:${gradleBomDependencyVersions['directory-watcher.version']}",
60-
'grails-publish-plugin' : "org.apache.grails.gradle:grails-publish:${gradleBomDependencyVersions['grails-publish-plugin.version']}",
61-
'jansi' : "org.fusesource.jansi:jansi:${gradleBomDependencyVersions['jansi.version']}",
62-
'javaparser-core' : "com.github.javaparser:javaparser-core:${gradleBomDependencyVersions['javaparser-core.version']}",
63-
'jline' : "jline:jline:${gradleBomDependencyVersions['jline.version']}",
64-
'jna' : "net.java.dev.jna:jna:${gradleBomDependencyVersions['jna.version']}",
65-
'objenesis' : "org.objenesis:objenesis:${gradleBomDependencyVersions['objenesis.version']}",
66-
'spring-boot-cli' : "org.springframework.boot:spring-boot-cli:${gradleBomDependencyVersions['spring-boot.version']}",
67-
'spring-boot-gradle' : "org.springframework.boot:spring-boot-gradle-plugin:${gradleBomDependencyVersions['spring-boot.version']}",
52+
'ant' : "org.apache.ant:ant:${gradleBomDependencyVersions['ant.version']}",
53+
'ant-junit' : "org.apache.ant:ant-junit:${gradleBomDependencyVersions['ant.version']}",
54+
'asciidoctor-gradle-jvm': "org.asciidoctor:asciidoctor-gradle-jvm:${gradleBomDependencyVersions['asciidoctor-gradle-jvm.version']}",
55+
'asciidoctorj' : "org.asciidoctor:asciidoctorj:${gradleBomDependencyVersions['asciidoctorj.version']}",
56+
'asset-pipeline-gradle' : "cloud.wondrify:asset-pipeline-gradle:${gradleBomDependencyVersions['asset-pipeline-gradle.version']}",
57+
'byte-buddy' : "net.bytebuddy:byte-buddy:${gradleBomDependencyVersions['byte-buddy.version']}",
58+
'commons-text' : "org.apache.commons:commons-text:${gradleBomDependencyVersions['commons-text.version']}",
59+
'directory-watcher' : "io.methvin:directory-watcher:${gradleBomDependencyVersions['directory-watcher.version']}",
60+
'grails-publish-plugin' : "org.apache.grails.gradle:grails-publish:${gradleBomDependencyVersions['grails-publish-plugin.version']}",
61+
'jansi' : "org.fusesource.jansi:jansi:${gradleBomDependencyVersions['jansi.version']}",
62+
'javaparser-core' : "com.github.javaparser:javaparser-core:${gradleBomDependencyVersions['javaparser-core.version']}",
63+
'jline' : "jline:jline:${gradleBomDependencyVersions['jline.version']}",
64+
'jna' : "net.java.dev.jna:jna:${gradleBomDependencyVersions['jna.version']}",
65+
'objenesis' : "org.objenesis:objenesis:${gradleBomDependencyVersions['objenesis.version']}",
66+
'spring-boot-cli' : "org.springframework.boot:spring-boot-cli:${gradleBomDependencyVersions['spring-boot.version']}",
67+
'spring-boot-gradle' : "org.springframework.boot:spring-boot-gradle-plugin:${gradleBomDependencyVersions['spring-boot.version']}",
6868
]
6969

7070
bomDependencyVersions = [
@@ -102,6 +102,38 @@ ext {
102102
'bootstrap-icons' : "org.webjars.npm:bootstrap-icons:${bomDependencyVersions['bootstrap-icons.version']}",
103103
'commons-codec' : "commons-codec:commons-codec:${bomDependencyVersions['commons-codec.version']}",
104104
'geb-spock' : "org.apache.groovy.geb:geb-spock:${bomDependencyVersions['geb-spock.version']}",
105+
// start - restate the groovy-bom includes here because the spring dependency management will pick the library from spring-boot-dependencies otherwise
106+
'groovy' : "org.apache.groovy:groovy:${bomDependencyVersions['groovy.version']}",
107+
'groovy-ant' : "org.apache.groovy:groovy-ant:${bomDependencyVersions['groovy.version']}",
108+
'groovy-astbuilder' : "org.apache.groovy:groovy-astbuilder:${bomDependencyVersions['groovy.version']}",
109+
'groovy-cli-commons' : "org.apache.groovy:groovy-cli-commons:${bomDependencyVersions['groovy.version']}",
110+
'groovy-cli-picocli' : "org.apache.groovy:groovy-cli-picocli:${bomDependencyVersions['groovy.version']}",
111+
'groovy-console' : "org.apache.groovy:groovy-console:${bomDependencyVersions['groovy.version']}",
112+
'groovy-contracts' : "org.apache.groovy:groovy-contracts:${bomDependencyVersions['groovy.version']}",
113+
'groovy-datetime' : "org.apache.groovy:groovy-datetime:${bomDependencyVersions['groovy.version']}",
114+
'groovy-dateutil' : "org.apache.groovy:groovy-dateutil:${bomDependencyVersions['groovy.version']}",
115+
'groovy-docgenerator' : "org.apache.groovy:groovy-docgenerator:${bomDependencyVersions['groovy.version']}",
116+
'groovy-ginq' : "org.apache.groovy:groovy-ginq:${bomDependencyVersions['groovy.version']}",
117+
'groovy-groovydoc' : "org.apache.groovy:groovy-groovydoc:${bomDependencyVersions['groovy.version']}",
118+
'groovy-groovysh' : "org.apache.groovy:groovy-groovysh:${bomDependencyVersions['groovy.version']}",
119+
'groovy-jmx' : "org.apache.groovy:groovy-jmx:${bomDependencyVersions['groovy.version']}",
120+
'groovy-json' : "org.apache.groovy:groovy-json:${bomDependencyVersions['groovy.version']}",
121+
'groovy-jsr223' : "org.apache.groovy:groovy-jsr223:${bomDependencyVersions['groovy.version']}",
122+
'groovy-macro' : "org.apache.groovy:groovy-macro:${bomDependencyVersions['groovy.version']}",
123+
'groovy-macro-library': "org.apache.groovy:groovy-macro-library:${bomDependencyVersions['groovy.version']}",
124+
'groovy-nio' : "org.apache.groovy:groovy-nio:${bomDependencyVersions['groovy.version']}",
125+
'groovy-servlet' : "org.apache.groovy:groovy-servlet:${bomDependencyVersions['groovy.version']}",
126+
'groovy-sql' : "org.apache.groovy:groovy-sql:${bomDependencyVersions['groovy.version']}",
127+
'groovy-swing' : "org.apache.groovy:groovy-swing:${bomDependencyVersions['groovy.version']}",
128+
'groovy-templates' : "org.apache.groovy:groovy-templates:${bomDependencyVersions['groovy.version']}",
129+
'groovy-test' : "org.apache.groovy:groovy-test:${bomDependencyVersions['groovy.version']}",
130+
'groovy-test-junit5' : "org.apache.groovy:groovy-test-junit5:${bomDependencyVersions['groovy.version']}",
131+
'groovy-testng' : "org.apache.groovy:groovy-testng:${bomDependencyVersions['groovy.version']}",
132+
'groovy-toml' : "org.apache.groovy:groovy-toml:${bomDependencyVersions['groovy.version']}",
133+
'groovy-typecheckers' : "org.apache.groovy:groovy-typecheckers:${bomDependencyVersions['groovy.version']}",
134+
'groovy-xml' : "org.apache.groovy:groovy-xml:${bomDependencyVersions['groovy.version']}",
135+
'groovy-yaml' : "org.apache.groovy:groovy-yaml:${bomDependencyVersions['groovy.version']}",
136+
// end - restate the groovy-bom here because the spring dependency management
105137
'jquery' : "org.webjars.npm:jquery:${bomDependencyVersions['jquery.version']}",
106138
'liquibase-hibernate5' : "org.liquibase:liquibase:${bomDependencyVersions['liquibase-hibernate5.version']}",
107139
'liquibase-hibernate5-cdi' : "org.liquibase:liquibase-cdi:${bomDependencyVersions['liquibase-hibernate5.version']}",

0 commit comments

Comments
 (0)