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

7.0.x dependency cleanup - new grails-bom #13787

Merged
merged 81 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from 72 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
344b568
bom cleanup
codeconsole Oct 18, 2024
5ede19c
Use bom versions
codeconsole Oct 18, 2024
398637b
more bom cleanup
codeconsole Oct 18, 2024
79927d4
more bom cleanup
codeconsole Oct 18, 2024
0e85c0e
Use bom versions
codeconsole Oct 18, 2024
a736522
More bom cleanup
codeconsole Oct 18, 2024
48517fe
More bom cleanup
codeconsole Oct 18, 2024
1d2d065
More bom cleanup
codeconsole Oct 18, 2024
7224e37
More bom cleanup
codeconsole Oct 18, 2024
16ab3ff
More bom cleanup
codeconsole Oct 18, 2024
63aec89
Use bom versions
codeconsole Oct 18, 2024
22a86ce
Use bom versions
codeconsole Oct 18, 2024
204195f
Use bom versions
codeconsole Oct 18, 2024
f76cf5a
add snapshot version check for plugins and profiles
codeconsole Oct 18, 2024
8e434f0
Sort bom dependencies
codeconsole Oct 18, 2024
80534e7
Build cleanup
codeconsole Oct 18, 2024
ce4cbbc
sort modules, use javaPlatform
codeconsole Oct 18, 2024
866362d
fix typo ant.xml -> ant,xml
codeconsole Oct 18, 2024
01124c2
Add bom to root project
codeconsole Oct 18, 2024
67b9c5b
Revert subproject duplicate bom addition
codeconsole Oct 18, 2024
004f591
Revert documentation bom version resolution
codeconsole Oct 18, 2024
1d9effe
generate bom manually
codeconsole Oct 18, 2024
6f0c592
use bom for docs
codeconsole Oct 18, 2024
b45b21a
Sort dependencies by variable name
codeconsole Oct 18, 2024
fc5e826
fix spock-core versioning
codeconsole Oct 18, 2024
3e447eb
remove hsqldb
codeconsole Oct 18, 2024
7f14c04
name override suppport, fix slf4j, add grails-web-taglib
codeconsole Oct 18, 2024
c7fe2cc
Move dependency versions to top of pom
codeconsole Oct 18, 2024
3b94cc8
cleanup
codeconsole Oct 18, 2024
6f03304
Add project subprojects to bom
codeconsole Oct 18, 2024
6f6acdc
remove juinit deps from bom
codeconsole Oct 18, 2024
3d1d0ca
clean up grails-test-suite-web
codeconsole Oct 18, 2024
e12d06b
Remove one time use version references
codeconsole Oct 18, 2024
3d84144
Fix plugin an profiles bom rendering
codeconsole Oct 18, 2024
dfb2f7f
Fix version references
codeconsole Oct 18, 2024
12147ef
dependabot generation scripts
codeconsole Oct 19, 2024
547c7e6
Generate to dependabot to a file
codeconsole Oct 19, 2024
452ca25
Properties file generation
codeconsole Oct 19, 2024
e2c3aec
Add generated bom properties
codeconsole Oct 19, 2024
81ad574
Use generated bom properties
codeconsole Oct 19, 2024
db234c3
Add generated build.gradle for dependabot only
codeconsole Oct 19, 2024
9af918a
Add copyright
codeconsole Oct 19, 2024
e9bdba2
Document format used
codeconsole Oct 19, 2024
32ee08c
Missing quotes
codeconsole Oct 19, 2024
ad4b3f3
more version renaming / simplification
codeconsole Oct 19, 2024
1d5b728
Add generation timestamp
codeconsole Oct 19, 2024
61d1c1a
fix preferences
codeconsole Oct 19, 2024
2e89e83
api dependency
codeconsole Oct 19, 2024
27654a2
dependabot generation improvements
codeconsole Oct 19, 2024
c704596
Do not append properties. Just overwrite existing.
codeconsole Oct 20, 2024
8c7137a
Fix version numbers for project dependencies
codeconsole Oct 20, 2024
50d59e5
Update description
codeconsole Oct 20, 2024
4f6230f
Remove unused args
codeconsole Oct 20, 2024
78fec40
update gradle.properties reference
codeconsole Oct 20, 2024
03693fb
use rootProject.layout references
codeconsole Oct 20, 2024
358c80b
Remove unused break
codeconsole Oct 20, 2024
712a2ab
fix grails-web-taglib
codeconsole Oct 21, 2024
08e9c1c
use mongodb.version, update dependabot refernces
codeconsole Oct 21, 2024
25e5141
Use Spring bom slf4j version
codeconsole Oct 21, 2024
a0c97c8
remove aspect j
codeconsole Oct 21, 2024
de7cc76
use spring aspectj
codeconsole Oct 21, 2024
36b4252
use spring boot caffeine
codeconsole Oct 21, 2024
faaacf3
use jackson bom
codeconsole Oct 21, 2024
ab5d5f0
switch to groovy bom
codeconsole Oct 21, 2024
d0c74aa
Fix plugins.properties to match module
codeconsole Oct 21, 2024
e2b00c1
add asset-pipeline, commons-io, geb-spock, database-migration
codeconsole Oct 21, 2024
b26f779
use spring bom tomcat version
codeconsole Oct 21, 2024
4b8b4bc
asset-pipeline-grails
codeconsole Oct 21, 2024
18c25f2
Separate bom tasks
codeconsole Oct 21, 2024
1180106
Use task name variable
codeconsole Oct 21, 2024
8bc20e6
Use commmons io version property
codeconsole Oct 21, 2024
603688e
use spring bom snakeyaml
codeconsole Oct 21, 2024
ab073a2
use spring bom for jarkarta deps
codeconsole Oct 21, 2024
d4587f5
commons-io not needed in buildscript
codeconsole Oct 21, 2024
ff4dfa7
datastoreVersion no logner needed
codeconsole Oct 21, 2024
02779d8
hamcrest is a testImplementation needed by grails-core and which alre…
codeconsole Oct 21, 2024
598a7f7
Remove groovyVersion from groovydoc
codeconsole Oct 22, 2024
69ce220
remove no longer needed exclusions. remove commons-codec.
codeconsole Oct 22, 2024
1f3f4f6
remove dependencyResolutionManagement config
codeconsole Oct 22, 2024
878790d
remove commons-codec exclusion.
codeconsole Oct 22, 2024
b873a44
jcl-over-slf4j version set by spring bom
codeconsole Oct 22, 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
203 changes: 52 additions & 151 deletions build.gradle

Large diffs are not rendered by default.

94 changes: 94 additions & 0 deletions dependabot/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
// Generated on Mon Oct 21 12:41:56 PDT 2024 by: ./gradlew :grails-bom:dependabotBuild
plugins {
id 'java-library'
}

dependencies {
api "org.apache.ant:ant:${project['ant.version']}"
api "org.apache.ant:ant-junit:${project['ant.version']}"
api "org.asciidoctor:asciidoctorj:${project['asciidoctorj.version']}"
api "com.bertramlabs.plugins:asset-pipeline-grails:${project['asset-pipeline-grails.version']}"
api "net.bytebuddy:byte-buddy:${project['byte-buddy.version']}"
api "commons-codec:commons-codec:${project['commons-codec.version']}"
api "commons-io:commons-io:${project['commons-io.version']}"
api "org.apache.commons:commons-text:${project['commons-text.version']}"
api "org.grails.plugins:converters:${project['converters.version']}"
api "io.methvin:directory-watcher:${project['directory-watcher.version']}"
api "org.xhtmlrenderer:flying-saucer-pdf-openpdf:${project['flying-saucer-pdf-openpdf.version']}"
api "org.gebish:geb-spock:${project['geb-spock.version']}"
api "org.grails.plugins:async:${project['grails-async.version']}"
api "org.grails.plugins:events:${project['grails-async.version']}"
api "org.grails:grails-async-gpars:${project['grails-async.version']}"
api "org.grails:grails-async-rxjava:${project['grails-async.version']}"
api "org.grails:grails-async-rxjava2:${project['grails-async.version']}"
api "org.grails:grails-events-gpars:${project['grails-async.version']}"
api "org.grails:grails-events-rxjava:${project['grails-async.version']}"
api "org.grails:grails-events-rxjava2:${project['grails-async.version']}"
api "org.grails:grails-datastore-gorm-hibernate5:${project['grails-datastore-gorm-hibernate5.version']}"
api "org.grails:grails-datastore-async:${project['grails-datastore.version']}"
api "org.grails:grails-datastore-core:${project['grails-datastore.version']}"
api "org.grails:grails-datastore-gorm:${project['grails-datastore.version']}"
api "org.grails:grails-datastore-gorm-async:${project['grails-datastore.version']}"
api "org.grails:grails-datastore-gorm-rx:${project['grails-datastore.version']}"
api "org.grails:grails-datastore-gorm-support:${project['grails-datastore.version']}"
api "org.grails:grails-datastore-gorm-test:${project['grails-datastore.version']}"
api "org.grails:grails-datastore-gorm-validation:${project['grails-datastore.version']}"
api "org.grails:grails-datastore-web:${project['grails-datastore.version']}"
api "org.grails:grails-gdoc-engine:${project['grails-gdoc-engine.version']}"
api "org.grails:grails-gradle-plugin:${project['grails-gradle-plugin.version']}"
api "org.grails:grails-gorm-testing-support:${project['grails-testing-support.version']}"
api "org.grails:grails-testing-support:${project['grails-testing-support.version']}"
api "org.grails:grails-web-testing-support:${project['grails-testing-support.version']}"
api "org.apache.groovy:groovy-bom:${project['groovy.version']}"
api "org.grails:grails-gsp:${project['gsp.version']}"
api "org.grails:grails-web-gsp:${project['gsp.version']}"
api "org.grails:grails-web-taglib:${project['gsp.version']}"
api "org.grails.plugins:gsp:${project['gsp.version']}"
api "com.h2database:h2:${project['h2.version']}"
api "org.hamcrest:hamcrest-core:${project['hamcrest-core.version']}"
api "com.fasterxml.jackson:jackson-bom:${project['jackson.version']}"
api "jakarta.annotation:jakarta.annotation-api:${project['jakarta.annotation-api.version']}"
api "jakarta.inject:jakarta.inject-api:${project['jakarta.inject-api.version']}"
api "jakarta.persistence:jakarta.persistence-api:${project['jakarta.persistence-api.version']}"
api "jakarta.servlet:jakarta.servlet-api:${project['jakarta.servlet-api.version']}"
api "jakarta.xml.bind:jakarta.xml.bind-api:${project['jakarta.xml.bind-api.version']}"
api "org.fusesource.jansi:jansi:${project['jansi.version']}"
api "com.github.javaparser:javaparser-core:${project['javaparser-core.version']}"
api "jline:jline:${project['jline.version']}"
api "net.java.dev.jna:jna:${project['jna.version']}"
api "org.jsoup:jsoup:${project['jsoup.version']}"
api "org.mongodb:bson:${project['mongodb.version']}"
api "org.mongodb:bson-record-codec:${project['mongodb.version']}"
api "org.mongodb:mongodb-driver-core:${project['mongodb.version']}"
api "org.mongodb:mongodb-driver-sync:${project['mongodb.version']}"
api "org.objenesis:objenesis:${project['objenesis.version']}"
api "org.grails.plugins:cache:${project['plugins-cache.version']}"
api "org.grails.plugins:database-migration:${project['plugins-database-migration.version']}"
api "org.grails.plugins:fields:${project['plugins-fields.version']}"
api "org.grails.plugins:geb:${project['plugins-geb.version']}"
api "org.grails.plugins:hibernate5:${project['plugins-hibernate5.version']}"
api "org.grails.plugins:mongodb:${project['plugins-mongodb.version']}"
api "org.grails.plugins:neo4j:${project['plugins-neo4j.version']}"
api "org.grails.plugins:rxjava2:${project['plugins-rxjava2.version']}"
api "org.grails.plugins:rxjava:${project['plugins-rxjava.version']}"
api "org.grails.plugins:scaffolding:${project['plugins-scaffolding.version']}"
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.spockframework:spock-core:${project['spock.version']}"
api "org.spockframework:spock-spring:${project['spock.version']}"
api "com.github.spotbugs:spotbugs-annotations:${project['spotbugs-annotations.version']}"
api "org.springframework.boot:spring-boot-cli:${project['spring-boot.version']}"
api "org.springframework:springloaded:${project['springloaded.version']}"
api "org.grails:views-json-testing-support:${project['views-json-testing-support.version']}"
}
116 changes: 68 additions & 48 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,69 +1,89 @@
projectVersion=7.0.0-SNAPSHOT
antVersion=1.10.15

apacheMavenVersion=3.9.9
apacheMavenResolverVersion=1.9.22
asciidoctorjVersion=3.0.0
aspectjVersion=1.9.22.1
asyncVersion=6.0.0-SNAPSHOT
bytebuddyVersion=1.15.5
caffeineVersion=3.1.8
coberturaVersion=2.1.1
commonsCodecVersion=1.17.1
commonsTextVersion=1.12.0
commonsIOVersion=2.17.0
datastoreVersion=9.0.0-SNAPSHOT
directoryWatcherVersion=0.18.0
expectitCoreVersion=0.9.0
gdocEngineVersion=1.0.1
gradleNexusPluginVersion=2.3.1
gradleNexusPublishPluginVersion=2.0.0
gradleExtraConfigurationsPluginVersion=10.0.1
gradleLicensePluginVersion=0.16.1
gradleToolingApiVersion=8.10.2
grailsGradlePluginVersion=7.0.0-SNAPSHOT
groovyVersion=4.0.23
gspVersion=7.0.0-SNAPSHOT
hamcrestVersion=3.0
h2Version=2.3.232
hsqldbVesion=1.8.1.1
hibernateDatastoreVersion=9.0.0-SNAPSHOT
itextVersion=4.2.2
jacksonVersion=2.18.0
jakartaAnnotationApiVersion=3.0.0
jakartaXmlBindVersion=4.0.2
jakartaInjectVersion=2.0.1
jakartaPersistenceVersion=3.1.0
jansiVersion=2.4.1
javaParserCoreVersion=3.26.2
jlineVersion=2.14.6
jnaVersion=5.15.0
jnrPosixVersion=3.1.20
hamcrestVersion=1.3
codeconsole marked this conversation as resolved.
Show resolved Hide resolved
joptSimpleVersion=5.0.4
jsoupVersion=1.18.1
jsr305Version=4.8.6
junitVersion=5.11.2
junitPlatformRunnerVersion=1.11.2
logbackVersion=1.5.8
legacyConvertersVersion=6.0.0-SNAPSHOT
mongodbJavaDriverVersion=5.1.4
objenesisVersion=3.4
plexusComponentApiVersion=1.0-alpha-33
plexusSecDispatcherVersion=1.4
plexusSisuInjectVersion=2.6.0
servletApiVersion=6.0.0
slf4jVersion=2.0.16
snakeyamlVersion=2.3
spockVersion=2.3-groovy-4.0
springBootVersion=3.3.4
springLoadedVersion=1.2.8.RELEASE
springVersion=6.1.14
testingSupportVersion=4.0.0-SNAPSHOT
testingSupportVersionForTests=4.0.0-SNAPSHOT
tomcatLog4jVersion=8.5.2
tomcatVersion=10.1.31
viewsVersion=4.0.0-SNAPSHOT
xhtmlRendererVersion=9.4.0

org.gradle.caching=true
org.gradle.parallel=true
org.gradle.daemon=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=1024M

# Generated on Mon Oct 21 12:41:56 PDT 2024 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
asset-pipeline-grails.version=5.0.1
byte-buddy.version=1.15.5
commons-codec.version=1.17.1
commons-io.version=2.17.0
commons-text.version=1.12.0
converters.version=6.0.0-SNAPSHOT
directory-watcher.version=0.18.0
flying-saucer-pdf-openpdf.version=9.4.0
geb-spock.version=7.0
grails-async.version=6.0.0-SNAPSHOT
grails-datastore.version=9.0.0-SNAPSHOT
grails-datastore-gorm-hibernate5.version=9.0.0-SNAPSHOT
grails-gdoc-engine.version=1.0.1
grails-gradle-plugin.version=7.0.0-SNAPSHOT
grails-testing-support.version=4.0.0-SNAPSHOT
groovy.version=4.0.23
gsp.version=7.0.0-SNAPSHOT
h2.version=2.3.232
hamcrest-core.version=1.3
jackson.version=2.18.0
jakarta.annotation-api.version=3.0.0
jakarta.inject-api.version=2.0.1
jakarta.persistence-api.version=3.1.0
jakarta.servlet-api.version=6.0.0
jakarta.xml.bind-api.version=4.0.2
jansi.version=2.4.1
javaparser-core.version=3.26.2
jline.version=2.14.6
jna.version=5.15.0
jsoup.version=1.18.1
mongodb.version=5.1.4
objenesis.version=3.4
plugins-cache.version=8.0.0-SNAPSHOT
plugins-database-migration.version=6.0.0-SNAPSHOT
plugins-fields.version=6.0.0-SNAPSHOT
plugins-geb.version=5.0.0-SNAPSHOT
plugins-hibernate5.version=9.0.0-SNAPSHOT
plugins-mongodb.version=9.0.0-SNAPSHOT
plugins-neo4j.version=8.1.0
plugins-rxjava.version=1.1.1
plugins-rxjava2.version=2.0.0
plugins-scaffolding.version=6.0.0-SNAPSHOT
plugins-views-json.version=4.0.0-SNAPSHOT
plugins-views-json-templates.version=4.0.0-SNAPSHOT
plugins-views-markup.version=4.0.0-SNAPSHOT
profiles-angular.version=10.0.1-SNAPSHOT
profiles-base.version=7.0.1-SNAPSHOT
profiles-plugin.version=7.0.1-SNAPSHOT
profiles-profile.version=7.0.1-SNAPSHOT
profiles-react.version=7.0.1-SNAPSHOT
profiles-rest-api.version=7.0.1-SNAPSHOT
profiles-rest-api-plugin.version=7.0.1-SNAPSHOT
profiles-vue.version=7.0.1-SNAPSHOT
profiles-web.version=7.0.1-SNAPSHOT
profiles-web-plugin.version=7.0.1-SNAPSHOT
spock.version=2.3-groovy-4.0
spotbugs-annotations.version=4.8.6
spring-boot.version=3.3.4
springloaded.version=1.2.8.RELEASE
views-json-testing-support.version=4.0.0-SNAPSHOT
Loading
Loading