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: Idea86d9f1cb079cc267f212a267fd93ae3fbb7f2
diff --git a/BUCK b/BUCK
index 9630ba0..ae5141d 100644
--- a/BUCK
+++ b/BUCK
@@ -57,11 +57,11 @@
srcs = TEST_UTIL_SRC,
deps = [
'//lib:guava',
- '//plugins/its-phabricator/lib:easymock',
+ '//lib/easymock:easymock',
'//lib/log:impl_log4j',
'//lib/log:log4j',
'//lib:junit',
- '//plugins/its-phabricator/lib:powermock-api-easymock',
+ '//lib/powermock:powermock-api-easymock',
'//lib/powermock:powermock-api-support',
'//lib/powermock:powermock-core',
'//lib/powermock:powermock-module-junit4',
@@ -82,7 +82,7 @@
':its-phabricator_tests-utils',
':its-base_stripped',
'//gerrit-plugin-api:lib',
- '//plugins/its-phabricator/lib:easymock',
+ '//lib/easymock:easymock',
'//lib:guava',
'//lib/guice:guice',
'//lib/jgit:jgit',
@@ -90,7 +90,7 @@
'//lib/log:api',
'//lib/log:impl_log4j',
'//lib/log:log4j',
- '//plugins/its-phabricator/lib:powermock-api-easymock',
+ '//lib/powermock:powermock-api-easymock',
'//lib/powermock:powermock-api-support',
'//lib/powermock:powermock-core',
'//lib/powermock:powermock-module-junit4',
diff --git a/lib/BUCK b/lib/BUCK
deleted file mode 100644
index ea00ba3..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',
- ],
-)
