From fc255cd320735b24b1105d0512d6e1d20f95d031 Mon Sep 17 00:00:00 2001
From: Stephanie Wang <stephaniewang526@users.noreply.github.com>
Date: Wed, 29 Jan 2020 10:52:41 -0500
Subject: [PATCH] deps: bump hamcrest dep version and artifactId (#136)

* deps: bump hamcrest dep version and artifactId

address build error: https://source.cloud.google.com/results/invocations/146b9fcc-cf53-41f1-a52e-e6ff1f857b2e/targets/cloud-devrel%2Fclient-libraries%2Fjava%2Fjava-bigquery%2Fpresubmit%2Fdependencies/log

[WARNING] Used undeclared dependencies found:
[WARNING]    org.hamcrest:hamcrest:jar:2.2:test
[WARNING] Unused declared dependencies found:
[WARNING]    org.hamcrest:hamcrest-core:jar:2.2:test

* declaring hamcrest-core too to fix build error

build error: https://source.cloud.google.com/results/invocations/47658b43-45f4-436e-baa7-7f709f5f3863/targets/cloud-devrel%2Fclient-libraries%2Fjava%2Fjava-bigquery%2Fpresubmit%2Fdependencies/log

[WARNING] Used undeclared dependencies found:
[WARNING]    org.hamcrest:hamcrest-core:jar:1.3:test
[WARNING] Unused declared dependencies found:
[WARNING]    org.hamcrest:hamcrest:jar:2.2:test

* removing hamcrest-core, again since build error re-occurred saying it's unused

https://source.cloud.google.com/results/invocations/c11a77e3-59fc-49e2-ae8b-4e10f4d968d4/targets/cloud-devrel%2Fclient-libraries%2Fjava%2Fjava-bigquery%2Fpresubmit%2Fdependencies/log

[WARNING] Unused declared dependencies found:
[WARNING]    org.hamcrest:hamcrest-core:jar:2.2:test

* move hamcrest to be above junit to fix build error

* remove hamcrest-core since it's claimed as unused in build
---
 google-cloud-bigquery/pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index 244a23d2f..2c36d32cd 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -85,6 +85,12 @@
     </dependency>
 
     <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -102,12 +108,6 @@
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>