Bump org.hamcrest:hamcrest-library from 2.2 to 3.0

pom.xml

@@ -431,6 +431,12 @@
             <configuration>
               <rules>
                 <dependencyConvergence></dependencyConvergence>
+                <bannedDependencies>
+                  <excludes>
+                    <exclude>org.hamcrest:*:*:*:*</exclude>
+                  </excludes>
+                  <searchTransitive>false</searchTransitive>
+                </bannedDependencies>
               </rules>
             </configuration>
           </execution>

querydsl-examples/querydsl-example-jpa-guice/pom.xml

@@ -74,12 +74,6 @@
       <artifactId>h2</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <!-- TEST dependencies -->
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-    </dependency>
   </dependencies>
 
   <pluginRepositories>

querydsl-examples/querydsl-example-jpa-quarkus/src/test/java/com/querydsl/example/FruitsEndpointTest.java

@@ -2,7 +2,7 @@
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.Matchers.not;
 
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Test;

querydsl-examples/querydsl-example-jpa-spring/pom.xml

@@ -55,6 +55,12 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 

querydsl-examples/querydsl-example-kotlin-mongodb/pom.xml

@@ -35,6 +35,10 @@
           <groupId>org.junit.vintage</groupId>
           <artifactId>junit-vintage-engine</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

querydsl-examples/querydsl-example-r2dbc-sql-codegen/pom.xml

@@ -61,10 +61,6 @@
     </dependency>
 
     <!-- TEST dependencies -->
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>

querydsl-examples/querydsl-example-sql-guice/pom.xml

@@ -40,12 +40,6 @@
       <artifactId>c3p0</artifactId>
       <version>0.9.1.2</version>
     </dependency>
-
-    <!-- TEST dependencies -->
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

querydsl-examples/querydsl-example-sql-spring/pom.xml

@@ -59,10 +59,6 @@
     </dependency>
 
     <!-- TEST dependencies -->
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>

querydsl-libraries/querydsl-mongodb/src/test/java/com/querydsl/mongodb/PackageVerification.java

@@ -25,7 +25,7 @@
 import java.net.URLClassLoader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import org.junit.Test;
 
 public class PackageVerification {
@@ -53,7 +53,7 @@ private void verify(File oneJar) throws Exception {
     var resourceKey = "META-INF/services/javax.annotation.processing.Processor";
     assertThat(
             new String(
-                Files.readAllBytes(Paths.get(oneJarClassLoader.findResource(resourceKey).toURI())),
+                Files.readAllBytes(Path.of(oneJarClassLoader.findResource(resourceKey).toURI())),
                 StandardCharsets.UTF_8))
         .isEqualTo(MorphiaAnnotationProcessor.class.getName());
   }

querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/BooleanExtensionsTest.java

@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
@@ -39,7 +39,7 @@ public void process() throws IOException {
     var qtypeContent =
         new String(
             Files.readAllBytes(
-                Paths.get("target", "booleanExtensions", "com", "querydsl", "QExampleEntity.java")),
+                Path.of("target", "booleanExtensions", "com", "querydsl", "QExampleEntity.java")),
             StandardCharsets.UTF_8);
     assertThat(qtypeContent).contains("ext.java.lang.QBoolean booleanProp");
     assertThat(qtypeContent).contains("ext.java.lang.QBoolean booleanProp2");
@@ -55,8 +55,7 @@ public void process2() throws IOException {
     var qtypeContent =
         new String(
             Files.readAllBytes(
-                Paths.get(
-                    "target", "booleanExtensions2", "com", "querydsl", "QExampleEntity.java")),
+                Path.of("target", "booleanExtensions2", "com", "querydsl", "QExampleEntity.java")),
             StandardCharsets.UTF_8);
     assertThat(qtypeContent).contains("ext.java.lang.QBoolean booleanProp");
     assertThat(qtypeContent).contains("ext.java.lang.QBoolean booleanProp2");

querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/IntegerExtensionsTest.java

@@ -6,7 +6,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
@@ -25,8 +25,7 @@ public void process() throws IOException {
     var qtypeContent =
         new String(
             Files.readAllBytes(
-                Paths.get(
-                    "target", "integerExtensions", "com", "querydsl", "QExampleEntity2.java")),
+                Path.of("target", "integerExtensions", "com", "querydsl", "QExampleEntity2.java")),
             StandardCharsets.UTF_8);
     // The superclass' id property is inherited, but can't be assigned to the custom QInteger
     assertThat(qtypeContent)

querydsl-tooling/querydsl-apt/src/test/java/com/querydsl/apt/domain/InnerExtensionsTest.java

@@ -8,7 +8,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
@@ -27,7 +27,7 @@ public void process() throws IOException {
     var qtypeContent =
         new String(
             Files.readAllBytes(
-                Paths.get("target", "innerextensions", "com", "querydsl", "QExampleEntity2.java")),
+                Path.of("target", "innerextensions", "com", "querydsl", "QExampleEntity2.java")),
             StandardCharsets.UTF_8);
     assertThat(qtypeContent)
         .contains("return InnerExtensions.ExampleEntity2Extensions.isZero(this);");

querydsl-tooling/querydsl-codegen-utils/pom.xml

@@ -31,12 +31,6 @@
     </dependency>
 
     <!-- test -->
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>jakarta.validation</groupId>
       <artifactId>jakarta.validation-api</artifactId>

querydsl-tooling/querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporterTest.java

@@ -1,24 +1,19 @@
 package com.querydsl.jpa.codegen.ant;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ErrorCollector;
 import org.junit.rules.TemporaryFolder;
 
 public class AntJPADomainExporterTest {
 
   @Rule public TemporaryFolder folder = new TemporaryFolder();
 
-  @Rule public ErrorCollector errors = new ErrorCollector();
-
   @Test
   public void test() throws IOException {
     var exporter = new AntJPADomainExporter();
@@ -40,7 +35,7 @@ public void test() throws IOException {
       var reference =
           new String(java.nio.file.Files.readAllBytes(origFile), StandardCharsets.UTF_8);
       var content = new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
-      errors.checkThat("Mismatch for " + file.getPath(), content, is(equalTo(reference)));
+      assertThat(content).withFailMessage("Mismatch for %s", file.getPath()).isEqualTo(reference);
     }
   }
 }

querydsl-tooling/querydsl-kotlin-codegen/pom.xml

@@ -66,13 +66,6 @@
       <groupId>jakarta.inject</groupId>
       <artifactId>jakarta.inject-api</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>

querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/EmbeddableSerializerTest.kt

@@ -31,11 +31,11 @@ import com.querydsl.codegen.utils.model.Types
 import com.querydsl.core.annotations.Generated
 import com.querydsl.core.annotations.PropertyType
 import com.querydsl.kotlin.codegen.CompileUtils.assertCompiles
-import org.hamcrest.Matchers
 import org.junit.Assert
 import org.junit.Ignore
 import org.junit.Test
 import org.junit.jupiter.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 
 import java.io.StringWriter
 import java.sql.Time
@@ -183,8 +183,8 @@ class EmbeddableSerializerTest {
         typeMappings.register(entityType, queryTypeFactory.create(entityType))
         serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
         val generatedSource = writer.toString()
-        Assert.assertThat(generatedSource, Matchers.containsString("import $generatedAnnotationImport"))
-        Assert.assertThat(generatedSource, Matchers.containsString("@Generated(\"com.querydsl.kotlin.codegen.KotlinEmbeddableSerializer\")\npublic class"))
+        assertThat(generatedSource).contains("import $generatedAnnotationImport")
+        assertThat(generatedSource).contains("@Generated(\"com.querydsl.kotlin.codegen.KotlinEmbeddableSerializer\")\npublic class")
         assertCompiles("QEntity", generatedSource)
     }
 
@@ -195,7 +195,7 @@ class EmbeddableSerializerTest {
         typeMappings.register(entityType, queryTypeFactory.create(entityType))
         KotlinEmbeddableSerializer(typeMappings, emptySet(), Generated::class.java).serialize(entityType, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
         val generatedSourceCode = writer.toString()
-        Assert.assertThat(generatedSourceCode, Matchers.containsString("@Generated(\"com.querydsl.kotlin.codegen.KotlinEmbeddableSerializer\")\npublic class"))
+        assertThat(generatedSourceCode).contains("@Generated(\"com.querydsl.kotlin.codegen.KotlinEmbeddableSerializer\")\npublic class")
         assertCompiles("QEntity", generatedSourceCode)
     }
 }

querydsl-tooling/querydsl-kotlin-codegen/src/test/kotlin/com/querydsl/kotlin/codegen/ProjectionSerializerTest.kt

@@ -25,7 +25,7 @@ import com.querydsl.codegen.utils.model.Type
 import com.querydsl.codegen.utils.model.TypeCategory
 import com.querydsl.codegen.utils.model.Types
 import com.querydsl.core.annotations.Generated
-import org.hamcrest.Matchers
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Assert
 import org.junit.Test
 import org.junit.jupiter.api.Assertions
@@ -61,8 +61,8 @@ class ProjectionSerializerTest {
         val serializer: ProjectionSerializer = KotlinProjectionSerializer(KotlinTypeMappings())
         serializer.serialize(type, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
         val generatedSource = writer.toString()
-        Assert.assertThat(generatedSource, Matchers.containsString("import $generatedAnnotationImport"))
-        Assert.assertThat(generatedSource, Matchers.containsString("@Generated(\"com.querydsl.kotlin.codegen.KotlinProjectionSerializer\")\npublic class"))
+        assertThat(generatedSource).contains("import $generatedAnnotationImport")
+        assertThat(generatedSource).contains("@Generated(\"com.querydsl.kotlin.codegen.KotlinProjectionSerializer\")\npublic class")
     }
 
     @Test
@@ -73,7 +73,7 @@ class ProjectionSerializerTest {
         val serializer: ProjectionSerializer = KotlinProjectionSerializer(KotlinTypeMappings(), Generated::class.java)
         serializer.serialize(type, SimpleSerializerConfig.DEFAULT, JavaWriter(writer))
         val generatedSource = writer.toString()
-        Assert.assertThat(generatedSource, Matchers.containsString("import com.querydsl.core.annotations.Generated"))
-        Assert.assertThat(generatedSource, Matchers.containsString("@Generated(\"com.querydsl.kotlin.codegen.KotlinProjectionSerializer\")\npublic class"))
+        assertThat(generatedSource).contains("import com.querydsl.core.annotations.Generated")
+        assertThat(generatedSource).contains("@Generated(\"com.querydsl.kotlin.codegen.KotlinProjectionSerializer\")\npublic class")
     }
 }

querydsl-tooling/querydsl-sql-codegen/src/test/java/com/querydsl/sql/codegen/CustomTypesTest.java

@@ -31,7 +31,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.sql.SQLException;
 import org.junit.Before;
 import org.junit.Test;
@@ -81,7 +81,7 @@ public void export() throws SQLException, IOException {
 
     // export
     exporter.export(connection.getMetaData());
-    var qpersonFile = Paths.get("target", "customExport", "test", "QPerson.java");
+    var qpersonFile = Path.of("target", "customExport", "test", "QPerson.java");
     assertThat(qpersonFile).exists();
     var person = new String(Files.readAllBytes(qpersonFile), StandardCharsets.UTF_8);
     // System.err.println(person);