From bde01869cf1a6cd7cdd13323f31170cc1fa73f48 Mon Sep 17 00:00:00 2001
From: f43nd1r <account+github@faendir.com>
Date: Fri, 11 Jun 2021 23:15:07 +0200
Subject: [PATCH] work with hamcrest 2.2 single-module structure

---
 pom.xml                                                      | 4 ++--
 querydsl-collections/pom.xml                                 | 3 ++-
 .../src/main/java/com/querydsl/collections/PathMatcher.java  | 3 ---
 querydsl-examples/querydsl-example-jpa-guice/pom.xml         | 5 -----
 querydsl-examples/querydsl-example-sql-guice/pom.xml         | 5 -----
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 68c09aba0..a8e674c83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/querydsl-collections/pom.xml b/querydsl-collections/pom.xml
index 2cfb1ce0f..6dcff0cf2 100644
--- a/querydsl-collections/pom.xml
+++ b/querydsl-collections/pom.xml
@@ -43,7 +43,8 @@
     
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
+      <artifactId>hamcrest</artifactId>
+      <scope>compile</scope>
       <optional>true</optional>
     </dependency>    
     
diff --git a/querydsl-collections/src/main/java/com/querydsl/collections/PathMatcher.java b/querydsl-collections/src/main/java/com/querydsl/collections/PathMatcher.java
index a2feb3342..03432cbb2 100644
--- a/querydsl-collections/src/main/java/com/querydsl/collections/PathMatcher.java
+++ b/querydsl-collections/src/main/java/com/querydsl/collections/PathMatcher.java
@@ -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);
     }
diff --git a/querydsl-examples/querydsl-example-jpa-guice/pom.xml b/querydsl-examples/querydsl-example-jpa-guice/pom.xml
index fed9f2b6a..2c0ad3533 100644
--- a/querydsl-examples/querydsl-example-jpa-guice/pom.xml
+++ b/querydsl-examples/querydsl-example-jpa-guice/pom.xml
@@ -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>
diff --git a/querydsl-examples/querydsl-example-sql-guice/pom.xml b/querydsl-examples/querydsl-example-sql-guice/pom.xml
index dc8e18806..09f1d9762 100644
--- a/querydsl-examples/querydsl-example-sql-guice/pom.xml
+++ b/querydsl-examples/querydsl-example-sql-guice/pom.xml
@@ -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>