From 02779d83ef8a821d12520c13ea3722cba70d257f Mon Sep 17 00:00:00 2001 From: Scott Murphy Heiberg Date: Mon, 21 Oct 2024 14:37:01 -0700 Subject: [PATCH] hamcrest is a testImplementation needed by grails-core and which already requires a configuration exclusion. The locations that requires it should be updated to the current hamcrest version already referenced in the spring bom. --- dependabot/build.gradle | 3 +-- gradle.properties | 4 +--- grails-bom/build.gradle | 1 - grails-core/build.gradle | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dependabot/build.gradle b/dependabot/build.gradle index 9b4e248211..1c001dd8a4 100644 --- a/dependabot/build.gradle +++ b/dependabot/build.gradle @@ -1,4 +1,4 @@ -// Generated on Mon Oct 21 14:20:05 PDT 2024 by: ./gradlew :grails-bom:dependabotBuild +// Generated on Mon Oct 21 14:36:55 PDT 2024 by: ./gradlew :grails-bom:dependabotBuild plugins { id 'java-library' } @@ -44,7 +44,6 @@ dependencies { 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 "org.fusesource.jansi:jansi:${project['jansi.version']}" api "com.github.javaparser:javaparser-core:${project['javaparser-core.version']}" diff --git a/gradle.properties b/gradle.properties index ebb2266033..fe296417c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,6 @@ gradleExtraConfigurationsPluginVersion=10.0.1 gradleLicensePluginVersion=0.16.1 gradleToolingApiVersion=8.10.2 groovyVersion=4.0.23 -hamcrestVersion=1.3 joptSimpleVersion=5.0.4 plexusComponentApiVersion=1.0-alpha-33 plexusSecDispatcherVersion=1.4 @@ -22,7 +21,7 @@ org.gradle.parallel=true org.gradle.daemon=true org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=1024M -# Generated on Mon Oct 21 14:20:05 PDT 2024 by: ./gradlew :grails-bom:syncProps +# Generated on Mon Oct 21 14:36:55 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 @@ -43,7 +42,6 @@ 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 jansi.version=2.4.1 javaparser-core.version=3.26.2 diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle index 518aeb73c9..96a5a0ae00 100644 --- a/grails-bom/build.gradle +++ b/grails-bom/build.gradle @@ -52,7 +52,6 @@ ext { org.grails:grails-testing-support,grails-gorm-testing-support,grails-web-testing-support:: org.grails:grails:gsp,web-gsp,web-taglib::gsp org.grails:views-json-testing-support:: - org.hamcrest:hamcrest-core::$hamcrestVersion org.jsoup:jsoup:: org.mongodb:bson:,record-codec::mongodb org.mongodb:mongodb-driver:core,sync::mongodb diff --git a/grails-core/build.gradle b/grails-core/build.gradle index a98901cde4..9d2040c1b3 100644 --- a/grails-core/build.gradle +++ b/grails-core/build.gradle @@ -27,7 +27,7 @@ dependencies { testImplementation "org.springframework:spring-jdbc" - testImplementation "org.hamcrest:hamcrest-core:$hamcrestVersion" + testImplementation "org.hamcrest:hamcrest-core:1.3" testRuntimeOnly "com.h2database:h2" testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind"