Merge pull request querydsl#2877 from querydsl/dependabot/maven/org.h…

…amcrest-hamcrest-core-2.2 Bump hamcrest-core from 1.3 to 2.2
yorlov · Jun 12, 2021 · e4d946b · e4d946b
2 parents 2fd9213 + bde0186
commit e4d946b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -72,6 +72,7 @@
     <h2gis.version>1.5.0</h2gis.version>
     <morphia.version>1.3.2</morphia.version>
     <jmh.version>1.32</jmh.version>
+    <hamcrest.veresion>2.2</hamcrest.veresion>
 
     <!-- Import-Package definitions for maven-bundle-plugin -->
     <osgi.import.package.root>
@@ -88,8 +89,7 @@
     </dependency>
     <dependency>
         <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-library</artifactId>
-        <version>1.3</version>
+        <artifactId>hamcrest</artifactId>
         <scope>test</scope>
     </dependency>
     <dependency>
@@ -156,6 +156,24 @@
         <artifactId>junit</artifactId>
         <version>4.13.2</version>
       </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <version>${hamcrest.veresion}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-core</artifactId>
+        <version>${hamcrest.veresion}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-all</artifactId>
+        <version>${hamcrest.veresion}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jdt.core.compiler</groupId>
         <artifactId>ecj</artifactId>

diff --git a/querydsl-collections/pom.xml b/querydsl-collections/pom.xml
@@ -42,8 +42,8 @@
 
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
+      <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
@@ -15,7 +15,6 @@
 
 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 PathMatcher(Path<V> path, Matcher<? super V> matcher, Function<T, V> acce
         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
@@ -133,12 +133,6 @@
       <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.3</version>
-      <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
@@ -73,12 +73,6 @@
       <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>