Switch back to core's powermock and easymock

Gerrit core provided incompatible powermock and easymock
versions. Since Ie61f51b937b8753f933b66d61f62c174b51c5ea6, they are
compatible again, hence we no longer need to provide our own versions

Change-Id: Icd0e74c108e929ffa01d6bbae60003c9625b0f56

BUCK

diff --git a/BUCK b/BUCK
index ad6f6a6..a315493 100644
--- a/BUCK
+++ b/BUCK
@@ -59,11 +59,11 @@
   srcs = TEST_UTIL_SRC,
   deps = [
     '//lib:guava',
-    '//plugins/its-storyboard/lib:easymock',
+    '//lib/easymock:easymock',
     '//lib/log:impl_log4j',
     '//lib/log:log4j',
     '//lib:junit',
-    '//plugins/its-storyboard/lib:powermock-api-easymock',
+    '//lib/powermock:powermock-api-easymock',
     '//lib/powermock:powermock-api-support',
     '//lib/powermock:powermock-core',
     '//lib/powermock:powermock-module-junit4',
@@ -84,7 +84,7 @@
     ':its-storyboard_tests-utils',
     ':its-base_stripped',
     '//gerrit-plugin-api:lib',
-    '//plugins/its-storyboard/lib:easymock',
+    '//lib/easymock:easymock',
     '//lib:guava',
     '//lib/guice:guice',
     '//lib/jgit:jgit',
@@ -92,7 +92,7 @@
     '//lib/log:api',
     '//lib/log:impl_log4j',
     '//lib/log:log4j',
-    '//plugins/its-storyboard/lib:powermock-api-easymock',
+    '//lib/powermock:powermock-api-easymock',
     '//lib/powermock:powermock-api-support',
     '//lib/powermock:powermock-core',
     '//lib/powermock:powermock-module-junit4',

lib/BUCK

diff --git a/lib/BUCK b/lib/BUCK
deleted file mode 100644
index fb07316..0000000
--- a/lib/BUCK
+++ /dev/null
@@ -1,38 +0,0 @@
-include_defs('//lib/maven.defs')
-
-# Upstream is at 3.2, which does not work with PowerMock 1.5's expectNew.
-# So we force EasyMock 3.1.
-maven_jar(
-  name = 'easymock',
-  id = 'org.easymock:easymock:3.1',
-  sha1 = '3e127311a86fc2e8f550ef8ee4abe094bbcf7e7e',
-  license = 'DO_NOT_DISTRIBUTE',
-  deps = [
-    '//lib/easymock:cglib-2_2',
-    ':objenesis',
-  ],
-)
-
-# Duplicate upstream's objenesis, which would not be
-# visible otherwise.
-maven_jar(
-  name = 'objenesis',
-  id = 'org.objenesis:objenesis:1.2',
-  sha1 = 'bfcb0539a071a4c5a30690388903ac48c0667f2a',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['//lib/powermock:powermock-reflect'],
-  attach_source = False,
-)
-
-# Upstream's powermock-api-easymock would pull in upstream's
-# EasyMock 3.2, so we hard-wire dependency to the plugin's EasyMock.
-maven_jar(
-  name = 'powermock-api-easymock',
-  id = 'org.powermock:powermock-api-easymock:1.5',
-  sha1 = 'a485b570b9debb46b53459a8e866a40343b2cfe2',
-  license = 'DO_NOT_DISTRIBUTE',
-  deps = [
-    '//lib/powermock:powermock-api-support',
-    ':easymock',
-  ],
-)
\ No newline at end of file