From ac6fabccd6c6a48226e2c77906e988bf6e55baa3 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 2 Oct 2025 14:13:37 -0400 Subject: [PATCH 1/5] Change dependencies to compileOnly so they are not in POM or Gradle Module Switched several dependencies from implementation/api to compileOnly. Disabled Grails springDependencyManagement and added testImplementation for grails-bom. --- build.gradle | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 48e4a2f9..b514a332 100644 --- a/build.gradle +++ b/build.gradle @@ -57,9 +57,13 @@ repositories { } } +grails { + springDependencyManagement = false +} + dependencies { - implementation platform("org.apache.grails:grails-bom:$grailsVersion") + compileOnly platform("org.apache.grails:grails-bom:$grailsVersion") api "org.quartz-scheduler:quartz:$quartzVersion", { // api: AdaptableJobFactory, InterruptableJob, JobExecutionContext, JobExecutionException, @@ -67,22 +71,22 @@ dependencies { // runtime: @DisallowConcurrentExecution(runtime), @PersistJobDataAfterExecution(runtime) } - api 'org.springframework:spring-beans', { + compileOnly 'org.springframework:spring-beans', { // api: BeansException // impl: BeanUtils, BeanWrapper, FactoryBean, InitializingBean, PropertyAccessorFactory } - api 'org.springframework:spring-context', { + compileOnly 'org.springframework:spring-context', { // api: ApplicationContext // impl: ApplicationContextAware } - implementation 'org.apache.groovy:groovy-sql', { + compileOnly 'org.apache.groovy:groovy-sql', { // impl: Sql } - implementation 'org.springframework:spring-context-support', { + compileOnly 'org.springframework:spring-context-support', { // impl: AdaptableJobFactory } - implementation 'org.springframework:spring-core', { + compileOnly 'org.springframework:spring-core', { // impl: ReflectionUtils } @@ -95,6 +99,8 @@ dependencies { // api: Logger, LoggerFactory } + testImplementation platform("org.apache.grails:grails-bom:$grailsVersion") + testImplementation 'org.apache.grails:grails-core', { // impl: GrailsClass } From 07a9dd72395db58e3e049dccd0da0082d1eefa10 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 2 Oct 2025 14:16:41 -0400 Subject: [PATCH 2/5] Update Gradle wrapper to 8.14.3 Bump Gradle wrapper version from 8.14.2 to 8.14.3 to use the latest features and fixes. --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ff23a68d..d4081da4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 8ad85f882feb04874c67d159a01fcd9d50b0f74a Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 2 Oct 2025 14:36:19 -0400 Subject: [PATCH 3/5] Update Gradle version to 8.14.3 in .sdkmanrc Bumps the Gradle version from 8.14.2 to 8.14.3 for local development environment configuration. --- .sdkmanrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sdkmanrc b/.sdkmanrc index 450e0c9b..bd52f2b8 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,3 +1,3 @@ # Enable auto-env through the sdkman_auto_env config - https://sdkman.io/usage#env java=17.0.15-librca -gradle=8.14.2 \ No newline at end of file +gradle=8.14.3 \ No newline at end of file From 6b0431c3ec8d4d22f5525cf526a4818f023caeb5 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Thu, 2 Oct 2025 15:29:29 -0400 Subject: [PATCH 4/5] Refactor dependencies in build.gradle Reorganized and simplified dependency declarations by removing individual compileOnly and testImplementation entries in favor of 'grails-dependencies-starter-web' and 'grails-dependencies-test'. This streamlines dependency management and reduces redundancy. --- build.gradle | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index b514a332..302542e8 100644 --- a/build.gradle +++ b/build.gradle @@ -63,48 +63,19 @@ grails { dependencies { - compileOnly platform("org.apache.grails:grails-bom:$grailsVersion") - api "org.quartz-scheduler:quartz:$quartzVersion", { // api: AdaptableJobFactory, InterruptableJob, JobExecutionContext, JobExecutionException, // UnableToInterruptJobException, TriggerFiredBundle, // runtime: @DisallowConcurrentExecution(runtime), @PersistJobDataAfterExecution(runtime) } - compileOnly 'org.springframework:spring-beans', { - // api: BeansException - // impl: BeanUtils, BeanWrapper, FactoryBean, InitializingBean, PropertyAccessorFactory - } - compileOnly 'org.springframework:spring-context', { - // api: ApplicationContext - // impl: ApplicationContextAware - } - - compileOnly 'org.apache.groovy:groovy-sql', { - // impl: Sql - } - compileOnly 'org.springframework:spring-context-support', { - // impl: AdaptableJobFactory - } - compileOnly 'org.springframework:spring-core', { - // impl: ReflectionUtils - } + compileOnly platform("org.apache.grails:grails-bom:$grailsVersion") - compileOnly 'org.apache.grails:grails-core', { // Provided as this is a Grails Plugin - // api: PersistenceContextInterceptor - // impl: AbstractGrailsClass, GrailsClass, GrailsClassUtils - } - compileOnly 'org.apache.groovy:groovy' // Provided as this is a Grails Plugin - compileOnly 'org.slf4j:slf4j-api', { - // api: Logger, LoggerFactory - } + compileOnly 'org.apache.grails:grails-dependencies-starter-web' testImplementation platform("org.apache.grails:grails-bom:$grailsVersion") - testImplementation 'org.apache.grails:grails-core', { - // impl: GrailsClass - } - testImplementation 'org.spockframework:spock-core' + testImplementation 'org.apache.grails:grails-dependencies-test' } apply { From 52126c455ed73fdb6338ca1b21f73b6a2da98b2a Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 8 Oct 2025 14:09:50 -0400 Subject: [PATCH 5/5] Refactor quartz dependencies to use Grails BOM platform Updated build.gradle to use implementation platform for Grails BOM and removed redundant platform declarations. Also removed the unused quartzVersion property from gradle.properties, as the version is now managed by the BOM. --- build.gradle | 8 +++----- gradle.properties | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 302542e8..31e059aa 100644 --- a/build.gradle +++ b/build.gradle @@ -63,18 +63,16 @@ grails { dependencies { - api "org.quartz-scheduler:quartz:$quartzVersion", { + implementation platform("org.apache.grails:grails-bom:$grailsVersion") + + api "org.quartz-scheduler:quartz", { // api: AdaptableJobFactory, InterruptableJob, JobExecutionContext, JobExecutionException, // UnableToInterruptJobException, TriggerFiredBundle, // runtime: @DisallowConcurrentExecution(runtime), @PersistJobDataAfterExecution(runtime) } - compileOnly platform("org.apache.grails:grails-bom:$grailsVersion") - compileOnly 'org.apache.grails:grails-dependencies-starter-web' - testImplementation platform("org.apache.grails:grails-bom:$grailsVersion") - testImplementation 'org.apache.grails:grails-dependencies-test' } diff --git a/gradle.properties b/gradle.properties index 7bd1234d..acafeede 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,6 @@ javaVersion=17 asciidoctorGradlePluginVersion=4.0.4 gradleCryptoChecksumVersion=1.4.0 -quartzVersion=2.5.0 ratVersion=0.8.1 # This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs