Update orbit to I20210711110031

and update
- assertj to 3.20.2.v20210706-1104
- hamcrest to 2.2.0.v20210711-0821
  - classes which were in org.hamcrest.core 1.3 and org.hamcrest.library
    1.3 were all moved to org.hamcrest in 2.2
  - the annotation org.hamcrest.Factory was removed and is no longer
    needed
  - junit 4.13 requires hamcrest-core and hamcrest-library 1.3 therefore
    keep them in the target platform

CQ: 23501
Change-Id: Ife871c0343b611be9203aed7f86577e85bbf5c95

1 files changed, 5 insertions, 11 deletions

diff --git a/WORKSPACE b/WORKSPACE
index 5e28525ea8..b415c7af2c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -188,15 +188,9 @@ maven_jar(
 )
 
 maven_jar(
-    name = "hamcrest-library",
-    artifact = "org.hamcrest:hamcrest-library:1.3",
-    sha1 = "4785a3c21320980282f9f33d0d1264a69040538f",
-)
-
-maven_jar(
-    name = "hamcrest-core",
-    artifact = "org.hamcrest:hamcrest-core:1.3",
-    sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
+    name = "hamcrest",
+    artifact = "org.hamcrest:hamcrest:2.2",
+    sha1 = "1820c0968dba3a11a1b30669bb1f01978a91dedc",
 )
 
 maven_jar(
@@ -207,8 +201,8 @@ maven_jar(
 
 maven_jar(
     name = "assertj-core",
-    artifact = "org.assertj:assertj-core:3.14.0",
-    sha1 = "3b7b0fcac821f3d167764e9926573cd64f78f9e9",
+    artifact = "org.assertj:assertj-core:3.20.2",
+    sha1 = "66f1f0ebd6db2b24e4a731979171da16ba919cd5",
 )
 
 BYTE_BUDDY_VERSION = "1.9.0"