opendev/gerrit
Code Issues Proposed changes

Bump to powermock 1.6.2 and to compatible easymock 3.3.1

Browse Source 
We were at powermock 1.5 and easymock 3.2. However, powermock 1.5
requires easymock 3.1. This mismatch in easymock versions caused tests
for plugins to fail with

  org.powermock.reflect.exceptions.FieldNotFoundException: No instance
    field of type "org.easymock.internal.MocksControl$MockType" could be
    found in the class hierarchy of org.easymock.internal.MocksControl.

For example its-phabricator worked around it by providing and forcing
easymock 3.1. In order to be able to get rid of such workarounds, we
bump to powermock 1.6.2 and easymock 3.3.1, which are compatible
versions again.

Although easymock requires to bump objenesis only to 1.3, we
nonetheless bump it objenesis to 2.1 as powermock 1.6.2 requires
objenesis 2.1.

Change-Id: Ie61f51b937b8753f933b66d61f62c174b51c5ea6
This commit is contained in:
Christian Aistleitner 2015-06-06 23:48:50 +02:00 committed by David Pursehouse
parent 5137268d01
commit c5f6b665a0
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/easymock/BUCK
View File

@ -2,8 +2,9 @@ include_defs('//lib/maven.defs')
maven_jar(
name = 'easymock',
id = 'org.easymock:easymock:3.2',
sha1 = '00c82f7fa3ef377d8954b1db25123944b5af2ba4',
id = 'org.easymock:easymock:3.3.1', # When bumping the version
# number, make sure to also move powermock to a compatible version
sha1 = 'a497d7f00c9af78b72b6d8f24762d9210309148a',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':cglib-2_2',
@ -21,8 +22,8 @@ maven_jar(
maven_jar(
name = 'objenesis',
id = 'org.objenesis:objenesis:1.2',
sha1 = 'bfcb0539a071a4c5a30690388903ac48c0667f2a',
id = 'org.objenesis:objenesis:2.1',
sha1 = '87c0ea803b69252868d09308b4618f766f135a96',
license = 'DO_NOT_DISTRIBUTE',
visibility = ['//lib/powermock:powermock-reflect'],
attach_source = False,

15
lib/powermock/BUCK
View File

@ -1,11 +1,12 @@
include_defs('//lib/maven.defs')
VERSION = '1.5'
VERSION = '1.6.2' # When bumping VERSION, make sure to also move
# easymock to a compatible version
maven_jar(
name = 'powermock-module-junit4',
id = 'org.powermock:powermock-module-junit4:' + VERSION,
sha1 = '9f6f8d0485249171f9d870e2b269048fa8cad43b',
sha1 = 'dff58978da716e000463bc1b08013d6a7cf3d696',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-module-junit4-common',
@ -16,7 +17,7 @@ maven_jar(
maven_jar(
name = 'powermock-module-junit4-common',
id = 'org.powermock:powermock-module-junit4-common:' + VERSION,
sha1 = '43db4720ff57af42a1bd5c73fb5cdfebeebd564c',
sha1 = '48dd7406e11a14fe2ae4ab641e1f27510e896640',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-reflect',
@ -27,7 +28,7 @@ maven_jar(
maven_jar(
name = 'powermock-reflect',
id = 'org.powermock:powermock-reflect:' + VERSION,
sha1 = '8df1548eeabb8492ba97d4f3eb84ae4d5f69215e',
sha1 = '1af1bbd1207c3ecdcf64973e6f9d57dcd17cc145',
license = 'DO_NOT_DISTRIBUTE',
deps = [
'//lib:junit',
@ -38,7 +39,7 @@ maven_jar(
maven_jar(
name = 'powermock-api-easymock',
id = 'org.powermock:powermock-api-easymock:' + VERSION,
sha1 = 'a485b570b9debb46b53459a8e866a40343b2cfe2',
sha1 = 'addd25742ac9fe3e0491cbd68e2515e3b06c77fd',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-api-support',
@ -49,7 +50,7 @@ maven_jar(
maven_jar(
name = 'powermock-api-support',
id = 'org.powermock:powermock-api-support:' + VERSION,
sha1 = '7c1b2e4555cfa333aec201c4612345c092820a38',
sha1 = '93b21413b4ee99b7bc0dd34e1416fdca96866aaf',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-core',
@ -61,7 +62,7 @@ maven_jar(
maven_jar(
name = 'powermock-core',
id = 'org.powermock:powermock-core:' + VERSION,
sha1 = '4415337ff3fdb7ceb484f11fd08e39711e408976',
sha1 = 'ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-reflect',