Skip to content

Commit 4eba379

Browse files
committed
Upgrade hamcrest: #13828
1 parent abf1afa commit 4eba379

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

grails-core/build.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
configurations.all {
2-
resolutionStrategy {
3-
force "org.hamcrest:hamcrest-core:1.3"
4-
}
5-
}
6-
71
dependencies {
82
compileOnly "org.aspectj:aspectjrt", "org.aspectj:aspectjweaver"
93
api "jakarta.inject:jakarta.inject-api"
@@ -27,7 +21,7 @@ dependencies {
2721

2822
testImplementation "org.springframework:spring-jdbc"
2923

30-
testImplementation "org.hamcrest:hamcrest-core:1.3"
24+
testImplementation "org.hamcrest:hamcrest"
3125

3226
testRuntimeOnly "com.h2database:h2"
3327
testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind"

grails-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.grails.transaction;
1717

1818
import org.hamcrest.Description;
19-
import org.hamcrest.Factory;
2019
import org.junit.jupiter.api.Test;
2120
import org.springframework.transaction.*;
2221
import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -176,7 +175,6 @@ public TestPlatformTransactionManager(String name) {
176175
this.name = name;
177176
}
178177

179-
@Factory
180178
static PlatformTransactionManager createFailingTransactionManager(String name) {
181179
return new TestPlatformTransactionManager(name + "-failing") {
182180
@Override
@@ -191,7 +189,6 @@ public void rollback(TransactionStatus status) throws TransactionException {
191189
};
192190
}
193191

194-
@Factory
195192
static PlatformTransactionManager createNonFailingTransactionManager(String name) {
196193
return new TestPlatformTransactionManager(name + "-non-failing");
197194
}
@@ -296,12 +293,10 @@ public void describeTo(Description description) {
296293
description.appendText("that a " + (commitCheck ? "committed" : "rolled-back") + " TransactionManager");
297294
}
298295

299-
@Factory
300296
public static TransactionManagerMatcher isCommitted() {
301297
return new TransactionManagerMatcher(true);
302298
}
303299

304-
@Factory
305300
public static TransactionManagerMatcher wasRolledback() {
306301
return new TransactionManagerMatcher(false);
307302
}

0 commit comments

Comments
 (0)