opendev/gerrit
Code Issues Proposed changes

Merge "Establish library compliance for powermock and its dependencies"

Browse Source
This commit is contained in:
David Pursehouse
2016-09-22 08:08:34 +00:00
committed by Gerrit Code Review
parent ae4a8a0d8f 3ef6bc7f99
commit f84710dff5
5 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
WORKSPACE
View File

@@ -613,58 +613,58 @@ maven_jar(
maven_jar( maven_jar(
name = 'easymock', name = 'easymock',
artifact = 'org.easymock:easymock:3.4', # When bumping the version artifact = 'org.easymock:easymock:3.1', # When bumping the version
sha1 = '9fdeea183a399f25c2469497612cad131e920fa3', sha1 = '3e127311a86fc2e8f550ef8ee4abe094bbcf7e7e',
) )
maven_jar( maven_jar(
name = 'cglib_2_2', name = 'cglib_3_2',
artifact = 'cglib:cglib-nodep:2.2.2', artifact = 'cglib:cglib-nodep:3.2.0',
sha1 = '00d456bb230c70c0b95c76fb28e429d42f275941', sha1 = 'cf1ca207c15b04ace918270b6cb3f5601160cdfd',
) )
maven_jar( maven_jar(
name = 'objenesis', name = 'objenesis',
artifact = 'org.objenesis:objenesis:2.2', artifact = 'org.objenesis:objenesis:1.3',
sha1 = '3fb533efdaa50a768c394aa4624144cf8df17845', sha1 = 'dc13ae4faca6df981fc7aeb5a522d9db446d5d50',
) )
POWERM_VERS = '1.6.4' POWERM_VERS = '1.6.1'
maven_jar( maven_jar(
name = 'powermock_module_junit4', name = 'powermock_module_junit4',
artifact = 'org.powermock:powermock-module-junit4:' + POWERM_VERS, artifact = 'org.powermock:powermock-module-junit4:' + POWERM_VERS,
sha1 = '8692eb1d9bb8eb1310ffe8a20c2da7ee6d1b5994', sha1 = 'ea8530b2848542624f110a393513af397b37b9cf',
) )
maven_jar( maven_jar(
name = 'powermock_module_junit4_common', name = 'powermock_module_junit4_common',
artifact = 'org.powermock:powermock-module-junit4-common:' + POWERM_VERS, artifact = 'org.powermock:powermock-module-junit4-common:' + POWERM_VERS,
sha1 = 'b0b578da443794ceb8224bd5f5f852aaf40f1b81', sha1 = '7222ced54dabc310895d02e45c5428ca05193cda',
) )
maven_jar( maven_jar(
name = 'powermock_reflect', name = 'powermock_reflect',
artifact = 'org.powermock:powermock-reflect:' + POWERM_VERS, artifact = 'org.powermock:powermock-reflect:' + POWERM_VERS,
sha1 = '5532f4e7c42db4bca4778bc9f1afcd4b0ee0b893', sha1 = '97d25eda8275c11161bcddda6ef8beabd534c878',
) )
maven_jar( maven_jar(
name = 'powermock_api_easymock', name = 'powermock_api_easymock',
artifact = 'org.powermock:powermock-api-easymock:' + POWERM_VERS, artifact = 'org.powermock:powermock-api-easymock:' + POWERM_VERS,
sha1 = '5c385a0d8c13f84b731b75c6e90319c532f80b45', sha1 = 'aa740ecf89a2f64d410b3d93ef8cd6833009ef00',
) )
maven_jar( maven_jar(
name = 'powermock_api_support', name = 'powermock_api_support',
artifact = 'org.powermock:powermock-api-support:' + POWERM_VERS, artifact = 'org.powermock:powermock-api-support:' + POWERM_VERS,
sha1 = '314daafb761541293595630e10a3699ebc07881d', sha1 = '592ee6d929c324109d3469501222e0c76ccf0869',
) )
maven_jar( maven_jar(
name = 'powermock_core', name = 'powermock_core',
artifact = 'org.powermock:powermock-core:' + POWERM_VERS, artifact = 'org.powermock:powermock-core:' + POWERM_VERS,
sha1 = '85fb32e9ccba748d569fc36aef92e0b9e7f40b87', sha1 = '5afc1efce8d44ed76b30af939657bd598e45d962',
) )
maven_jar( maven_jar(

1
gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.httpd;
import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.newCapture;
import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.registration.ReloadableRegistrationHandle; import com.google.gerrit.extensions.registration.ReloadableRegistrationHandle;

16
lib/easymock/BUCK
View File

@@ -2,28 +2,28 @@ include_defs('//lib/maven.defs')
maven_jar( maven_jar(
name = 'easymock', name = 'easymock',
id = 'org.easymock:easymock:3.4', # When bumping the version id = 'org.easymock:easymock:3.1', # When bumping the version
# number, make sure to also move powermock to a compatible version # number, make sure to also move powermock to a compatible version
sha1 = '9fdeea183a399f25c2469497612cad131e920fa3', sha1 = '3e127311a86fc2e8f550ef8ee4abe094bbcf7e7e',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
deps = [ deps = [
':cglib-2_2', ':cglib-3_2',
':objenesis', ':objenesis',
], ],
) )
maven_jar( maven_jar(
name = 'cglib-2_2', name = 'cglib-3_2',
id = 'cglib:cglib-nodep:2.2.2', id = 'cglib:cglib-nodep:3.2.0',
sha1 = '00d456bb230c70c0b95c76fb28e429d42f275941', sha1 = 'cf1ca207c15b04ace918270b6cb3f5601160cdfd',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
attach_source = False, attach_source = False,
) )
maven_jar( maven_jar(
name = 'objenesis', name = 'objenesis',
id = 'org.objenesis:objenesis:2.2', id = 'org.objenesis:objenesis:1.3',
sha1 = '3fb533efdaa50a768c394aa4624144cf8df17845', sha1 = 'dc13ae4faca6df981fc7aeb5a522d9db446d5d50',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
visibility = ['//lib/powermock:powermock-reflect'], visibility = ['//lib/powermock:powermock-reflect'],
attach_source = False, attach_source = False,

6
lib/easymock/BUILD
View File

@@ -2,15 +2,15 @@ java_library(
name = 'easymock', name = 'easymock',
exports = ['@easymock//jar'], exports = ['@easymock//jar'],
runtime_deps = [ runtime_deps = [
':cglib-2_2', ':cglib-3_2',
':objenesis', ':objenesis',
], ],
visibility = ['//visibility:public'], visibility = ['//visibility:public'],
) )
java_library( java_library(
name = 'cglib-2_2', name = 'cglib-3_2',
exports = ['@cglib_2_2//jar'], exports = ['@cglib_3_2//jar'],
visibility = ['//visibility:public'], visibility = ['//visibility:public'],
) )

14
lib/powermock/BUCK
View File

@@ -1,12 +1,12 @@
include_defs('//lib/maven.defs') include_defs('//lib/maven.defs')
VERSION = '1.6.4' # When bumping VERSION, make sure to also move VERSION = '1.6.1' # When bumping VERSION, make sure to also move
# easymock to a compatible version # easymock to a compatible version
maven_jar( maven_jar(
name = 'powermock-module-junit4', name = 'powermock-module-junit4',
id = 'org.powermock:powermock-module-junit4:' + VERSION, id = 'org.powermock:powermock-module-junit4:' + VERSION,
sha1 = '8692eb1d9bb8eb1310ffe8a20c2da7ee6d1b5994', sha1 = 'ea8530b2848542624f110a393513af397b37b9cf',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
deps = [ deps = [
':powermock-module-junit4-common', ':powermock-module-junit4-common',
@@ -17,7 +17,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'powermock-module-junit4-common', name = 'powermock-module-junit4-common',
id = 'org.powermock:powermock-module-junit4-common:' + VERSION, id = 'org.powermock:powermock-module-junit4-common:' + VERSION,
sha1 = 'b0b578da443794ceb8224bd5f5f852aaf40f1b81', sha1 = '7222ced54dabc310895d02e45c5428ca05193cda',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
deps = [ deps = [
':powermock-reflect', ':powermock-reflect',
@@ -28,7 +28,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'powermock-reflect', name = 'powermock-reflect',
id = 'org.powermock:powermock-reflect:' + VERSION, id = 'org.powermock:powermock-reflect:' + VERSION,
sha1 = '5532f4e7c42db4bca4778bc9f1afcd4b0ee0b893', sha1 = '97d25eda8275c11161bcddda6ef8beabd534c878',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
deps = [ deps = [
'//lib:junit', '//lib:junit',
@@ -39,7 +39,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'powermock-api-easymock', name = 'powermock-api-easymock',
id = 'org.powermock:powermock-api-easymock:' + VERSION, id = 'org.powermock:powermock-api-easymock:' + VERSION,
sha1 = '5c385a0d8c13f84b731b75c6e90319c532f80b45', sha1 = 'aa740ecf89a2f64d410b3d93ef8cd6833009ef00',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
deps = [ deps = [
':powermock-api-support', ':powermock-api-support',
@@ -50,7 +50,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'powermock-api-support', name = 'powermock-api-support',
id = 'org.powermock:powermock-api-support:' + VERSION, id = 'org.powermock:powermock-api-support:' + VERSION,
sha1 = '314daafb761541293595630e10a3699ebc07881d', sha1 = '592ee6d929c324109d3469501222e0c76ccf0869',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
deps = [ deps = [
':powermock-core', ':powermock-core',
@@ -62,7 +62,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'powermock-core', name = 'powermock-core',
id = 'org.powermock:powermock-core:' + VERSION, id = 'org.powermock:powermock-core:' + VERSION,
sha1 = '85fb32e9ccba748d569fc36aef92e0b9e7f40b87', sha1 = '5afc1efce8d44ed76b30af939657bd598e45d962',
license = 'DO_NOT_DISTRIBUTE', license = 'DO_NOT_DISTRIBUTE',
deps = [ deps = [
':powermock-reflect', ':powermock-reflect',