CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-04 21:01:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

work with hamcrest 2.2 single-module structure

Browse Source
This commit is contained in:
f43nd1r 2021-06-11 23:15:07 +02:00
parent bd76ec8efc
commit bde01869cf
5 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@ -152,7 +152,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.veresion}</version>
<scope>test</scope>
</dependency>

3
querydsl-collections/pom.xml
View File

@ -43,7 +43,8 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<artifactId>hamcrest</artifactId>
<scope>compile</scope>
<optional>true</optional>
</dependency>

3
querydsl-collections/src/main/java/com/querydsl/collections/PathMatcher.java
View File

@ -15,7 +15,6 @@ package com.querydsl.collections;
import com.querydsl.core.types.Path;
import org.hamcrest.Description;
import org.hamcrest.Factory;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeDiagnosingMatcher;
@ -50,12 +49,10 @@ public class PathMatcher<T, V> extends TypeSafeDiagnosingMatcher<T> {
this.accessor = accessor;
}
@Factory
public static <T,P> Matcher<T> hasValue(Path<P> path) {
return new PathMatcher<T,P>(path, notNullValue());
}
@Factory
public static <T,P> Matcher<T> hasValue(Path<P> path, Matcher<? super P> matcher) {
return new PathMatcher<T,P>(path, matcher);
}

5
querydsl-examples/querydsl-example-jpa-guice/pom.xml
View File

@ -144,11 +144,6 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>

5
querydsl-examples/querydsl-example-sql-guice/pom.xml
View File

@ -73,11 +73,6 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>