Merge pull request #13875 from bkoehm/bkoehm.7.0.x

Upgrade hamcrest: #13828
grails · Nov 22, 2024 · eb223e9 · eb223e9
2 parents abf1afa + 4eba379
commit eb223e9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/grails-core/build.gradle b/grails-core/build.gradle
@@ -1,9 +1,3 @@
-configurations.all {
-    resolutionStrategy {
-        force "org.hamcrest:hamcrest-core:1.3"
-    }
-}
-
 dependencies {
     compileOnly "org.aspectj:aspectjrt", "org.aspectj:aspectjweaver"
     api "jakarta.inject:jakarta.inject-api"
@@ -27,7 +21,7 @@ dependencies {
 
     testImplementation "org.springframework:spring-jdbc"
 
-    testImplementation "org.hamcrest:hamcrest-core:1.3"
+    testImplementation "org.hamcrest:hamcrest"
 
     testRuntimeOnly "com.h2database:h2"
     testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind"

diff --git a/grails-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerTests.java b/grails-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerTests.java
@@ -16,7 +16,6 @@
 package org.grails.transaction;
 
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.junit.jupiter.api.Test;
 import org.springframework.transaction.*;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -176,7 +175,6 @@ public TestPlatformTransactionManager(String name) {
 			this.name = name;
 		}
 
-		@Factory
 		static PlatformTransactionManager createFailingTransactionManager(String name) {
 			return new TestPlatformTransactionManager(name + "-failing") {
 				@Override
@@ -191,7 +189,6 @@ public void rollback(TransactionStatus status) throws TransactionException {
 			};
 		}
 
-		@Factory
 		static PlatformTransactionManager createNonFailingTransactionManager(String name) {
 			return new TestPlatformTransactionManager(name + "-non-failing");
 		}
@@ -296,12 +293,10 @@ public void describeTo(Description description) {
 			description.appendText("that a " + (commitCheck ? "committed" : "rolled-back") + " TransactionManager");
 		}
 
-		@Factory
 		public static TransactionManagerMatcher isCommitted() {
 			return new TransactionManagerMatcher(true);
 		}
 
-		@Factory
 		public static TransactionManagerMatcher wasRolledback() {
 			return new TransactionManagerMatcher(false);
 		}