Revert "Allow tests to use hamcrest matchers directly"

This reverts commit 2efc3e7efb.

It's no longer necessary to use the hamcrest matchers since we
have the Google Truth library.

Change-Id: Ib2cddfc52b3eeef4721b263ea1d693f45ac3cf15

gerrit-acceptance-tests/BUCK

@@ -28,8 +28,6 @@ java_library(
     '//lib:servlet-api-3_1',
     '//lib:truth',
 
-    '//lib/hamcrest:hamcrest-core',
-    '//lib/hamcrest:hamcrest-library',
     '//lib/httpcomponents:httpclient',
     '//lib/httpcomponents:httpcore',
     '//lib/log:impl_log4j',

lib/BUCK

@@ -175,7 +175,15 @@ maven_jar(
   id = 'junit:junit:4.10',
   sha1 = 'e4f1766ce7404a08f45d859fb9c226fc9e41a861',
   license = 'DO_NOT_DISTRIBUTE',
-  deps = ['//lib/hamcrest:hamcrest-core'],
+  deps = [':hamcrest-core'],
+)
+
+maven_jar(
+  name = 'hamcrest-core',
+  id = 'org.hamcrest:hamcrest-core:1.3',
+  sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
+  license = 'DO_NOT_DISTRIBUTE',
+  visibility = ['//lib:junit'],
 )
 
 maven_jar(

lib/hamcrest/BUCK

@@ -1,25 +0,0 @@
-include_defs('//lib/maven.defs')
-
-VERSION = '1.3'
-
-maven_jar(
-  name = 'hamcrest-core',
-  id = 'org.hamcrest:hamcrest-core:' + VERSION,
-  sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = [
-    '//lib:junit',
-    '//gerrit-acceptance-tests:lib'
-  ],
-)
-
-maven_jar(
-  name = 'hamcrest-library',
-  id = 'org.hamcrest:hamcrest-library:' + VERSION,
-  sha1 = '4785a3c21320980282f9f33d0d1264a69040538f',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = [
-    '//lib:junit',
-    '//gerrit-acceptance-tests:lib'
-  ],
-)