From 1af023cc2d78b921b5c031313d81d0a60616dc4f Mon Sep 17 00:00:00 2001
From: Atsushi Yoshikawa <yoshikawaa@pm.nttdata.co.jp>
Date: Tue, 14 Jan 2020 18:03:10 +0900
Subject: [PATCH] Upgrade to hamcrest 2.x #950 (#955)

---
 .../terasoluna-gfw-codepoints/pom.xml                  |  5 -----
 .../terasoluna-gfw-common/pom.xml                      |  5 -----
 .../terasoluna-gfw-jodatime/pom.xml                    |  5 -----
 .../terasoluna-gfw-security-web/pom.xml                |  5 -----
 .../terasoluna-gfw-string/pom.xml                      |  5 -----
 .../terasoluna-gfw-validator/pom.xml                   |  5 -----
 .../terasoluna-gfw-web-jsp/pom.xml                     |  5 -----
 .../terasoluna-gfw-web/pom.xml                         |  5 -----
 terasoluna-gfw-parent/pom.xml                          | 10 ----------
 9 files changed, 50 deletions(-)

diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/pom.xml
index ae8aed63e..fcde83ab3 100644
--- a/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/pom.xml
+++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/pom.xml
@@ -84,11 +84,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml
index 72eacf61d..e37a61459 100644
--- a/terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml
+++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml
@@ -148,11 +148,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/pom.xml
index ba2f2c259..6c1c07e66 100644
--- a/terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/pom.xml
+++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/pom.xml
@@ -87,11 +87,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
     <!-- == End Unit Test == -->
 
     <!-- == Begin Database == -->
diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-security-web/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-security-web/pom.xml
index ae1d38482..f669e2ea8 100644
--- a/terasoluna-gfw-common-libraries/terasoluna-gfw-security-web/pom.xml
+++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-security-web/pom.xml
@@ -111,11 +111,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-string/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-string/pom.xml
index 827f9e724..89bc0de78 100644
--- a/terasoluna-gfw-common-libraries/terasoluna-gfw-string/pom.xml
+++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-string/pom.xml
@@ -73,11 +73,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-validator/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-validator/pom.xml
index 2180697c4..7ec836df8 100644
--- a/terasoluna-gfw-common-libraries/terasoluna-gfw-validator/pom.xml
+++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-validator/pom.xml
@@ -77,11 +77,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-web-jsp/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-web-jsp/pom.xml
index d184fd71e..5b28dda34 100644
--- a/terasoluna-gfw-common-libraries/terasoluna-gfw-web-jsp/pom.xml
+++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-web-jsp/pom.xml
@@ -125,11 +125,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml b/terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml
index e74be158e..c23511725 100644
--- a/terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml
+++ b/terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml
@@ -107,11 +107,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/terasoluna-gfw-parent/pom.xml b/terasoluna-gfw-parent/pom.xml
index f2fd388bf..28bcb784f 100644
--- a/terasoluna-gfw-parent/pom.xml
+++ b/terasoluna-gfw-parent/pom.xml
@@ -502,14 +502,6 @@
       </dependency>
       <!-- == End Other JavaEE/SE APIs == -->
 
-      <!-- == Begin Unit Test == -->
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-all</artifactId>
-        <version>${hamcrest.version}</version>
-      </dependency>
-      <!-- == Begin Unit Test == -->
-
     </dependencies>
   </dependencyManagement>
   <properties>
@@ -563,8 +555,6 @@
     <javax-inject.version>1</javax-inject.version>
     <javax-jsp.version>2.3.3</javax-jsp.version>
     <taglibs-standard.version>1.2.5</taglibs-standard.version>
-    <!-- == Unit Test == -->
-    <hamcrest.version>1.3</hamcrest.version>
     <!-- == Project Properties == -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <archetype.test.skip>true</archetype.test.skip>