opendev/gerrit
Code Issues Proposed changes

Move powermock and easymock library definitions to separate BUCK files

Browse Source 
Move the definitions to a separate file, thus making the lib/BUCK file
smaller.

Add a VERSION definition for powermock and reuse it for all the libary
declarations, rather than hard-coding the same version string every
time.

Depends-On: I695efcfabe67416104b0efb71f090a5303393702
Change-Id: I8840ef29d9ddfa241740fb0e4c4715c52ff07e30
This commit is contained in:
David Pursehouse
2014-06-26 14:51:18 +09:00
committed by Dave Borowitz
parent f7cba4d970
commit 1a9d928a1e
7 changed files with 111 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-httpd/BUCK
View File

@@ -53,12 +53,12 @@ java_test(
'//gerrit-extension-api:api', '//gerrit-extension-api:api',
'//gerrit-reviewdb:server', '//gerrit-reviewdb:server',
'//gerrit-server:server', '//gerrit-server:server',
'//lib:easymock',
'//lib:junit', '//lib:junit',
'//lib:gson', '//lib:gson',
'//lib:gwtorm', '//lib:gwtorm',
'//lib:guava', '//lib:guava',
'//lib:servlet-api-3_1', '//lib:servlet-api-3_1',
'//lib/easymock:easymock',
'//lib/guice:guice', '//lib/guice:guice',
'//lib/jgit:jgit', '//lib/jgit:jgit',
'//lib/jgit:junit', '//lib/jgit:junit',

2
gerrit-pgm/BUCK
View File

@@ -141,7 +141,7 @@ java_test(
':pgm', ':pgm',
'//gerrit-server:server', '//gerrit-server:server',
'//lib:junit', '//lib:junit',
'//lib:easymock', '//lib/easymock:easymock',
'//lib/guice:guice', '//lib/guice:guice',
'//lib/jgit:jgit', '//lib/jgit:jgit',
'//lib/jgit:junit', '//lib/jgit:junit',

12
gerrit-server/BUCK
View File

@@ -107,12 +107,12 @@ java_library(
'//lib/log:log4j', '//lib/log:log4j',
], ],
exported_deps = [ exported_deps = [
'//lib:easymock', '//lib/easymock:easymock',
'//lib:powermock-api-easymock', '//lib/powermock:powermock-api-easymock',
'//lib:powermock-api-support', '//lib/powermock:powermock-api-support',
'//lib:powermock-core', '//lib/powermock:powermock-core',
'//lib:powermock-module-junit4', '//lib/powermock:powermock-module-junit4',
'//lib:powermock-module-junit4-common', '//lib/powermock:powermock-module-junit4-common',
], ],
visibility = ['PUBLIC'], visibility = ['PUBLIC'],
) )

97
lib/BUCK
View File

@@ -185,35 +185,6 @@ maven_jar(
visibility = ['//lib:junit'], visibility = ['//lib:junit'],
) )
maven_jar(
name = 'easymock',
id = 'org.easymock:easymock:3.2',
sha1 = '00c82f7fa3ef377d8954b1db25123944b5af2ba4',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':cglib-2_2',
':objenesis',
],
)
maven_jar(
name = 'cglib-2_2',
id = 'cglib:cglib-nodep:2.2.2',
sha1 = '00d456bb230c70c0b95c76fb28e429d42f275941',
license = 'DO_NOT_DISTRIBUTE',
visibility = ['//lib:easymock'],
attach_source = False,
)
maven_jar(
name = 'objenesis',
id = 'org.objenesis:objenesis:1.2',
sha1 = 'bfcb0539a071a4c5a30690388903ac48c0667f2a',
license = 'DO_NOT_DISTRIBUTE',
visibility = ['//lib:easymock'],
attach_source = False,
)
maven_jar( maven_jar(
name = 'tukaani-xz', name = 'tukaani-xz',
id = 'org.tukaani:xz:1.4', id = 'org.tukaani:xz:1.4',
@@ -223,74 +194,6 @@ maven_jar(
visibility = ['//lib/jgit:jgit-archive'], visibility = ['//lib/jgit:jgit-archive'],
) )
maven_jar(
name = 'powermock-module-junit4',
id = 'org.powermock:powermock-module-junit4:1.5',
sha1 = '9f6f8d0485249171f9d870e2b269048fa8cad43b',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':junit',
':powermock-module-junit4-common',
],
)
maven_jar(
name = 'powermock-module-junit4-common',
id = 'org.powermock:powermock-module-junit4-common:1.5',
sha1 = '43db4720ff57af42a1bd5c73fb5cdfebeebd564c',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':junit',
':powermock-reflect',
],
)
maven_jar(
name = 'powermock-reflect',
id = 'org.powermock:powermock-reflect:1.5',
sha1 = '8df1548eeabb8492ba97d4f3eb84ae4d5f69215e',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':junit',
':objenesis',
],
)
maven_jar(
name = 'powermock-api-easymock',
id = 'org.powermock:powermock-api-easymock:1.5',
sha1 = 'a485b570b9debb46b53459a8e866a40343b2cfe2',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':easymock',
':powermock-api-support',
],
)
maven_jar(
name = 'powermock-api-support',
id = 'org.powermock:powermock-api-support:1.5',
sha1 = '7c1b2e4555cfa333aec201c4612345c092820a38',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':junit',
':powermock-core',
':powermock-reflect',
],
)
maven_jar(
name = 'powermock-core',
id = 'org.powermock:powermock-core:1.5',
sha1 = '4415337ff3fdb7ceb484f11fd08e39711e408976',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':junit',
':powermock-reflect',
':javassist-3.17.1-GA',
],
)
maven_jar( maven_jar(
name = 'javassist-3.17.1-GA', name = 'javassist-3.17.1-GA',
# The GWT version is still at 3.16.1-GA, so those do not match # The GWT version is still at 3.16.1-GA, so those do not match

30
lib/easymock/BUCK Normal file
View File

@@ -0,0 +1,30 @@
include_defs('//lib/maven.defs')
maven_jar(
name = 'easymock',
id = 'org.easymock:easymock:3.2',
sha1 = '00c82f7fa3ef377d8954b1db25123944b5af2ba4',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':cglib-2_2',
':objenesis',
],
)
maven_jar(
name = 'cglib-2_2',
id = 'cglib:cglib-nodep:2.2.2',
sha1 = '00d456bb230c70c0b95c76fb28e429d42f275941',
license = 'DO_NOT_DISTRIBUTE',
attach_source = False,
)
maven_jar(
name = 'objenesis',
id = 'org.objenesis:objenesis:1.2',
sha1 = 'bfcb0539a071a4c5a30690388903ac48c0667f2a',
license = 'DO_NOT_DISTRIBUTE',
visibility = ['//lib/powermock:powermock-reflect'],
attach_source = False,
)

72
lib/powermock/BUCK Normal file
View File

@@ -0,0 +1,72 @@
include_defs('//lib/maven.defs')
VERSION = '1.5'
maven_jar(
name = 'powermock-module-junit4',
id = 'org.powermock:powermock-module-junit4:' + VERSION,
sha1 = '9f6f8d0485249171f9d870e2b269048fa8cad43b',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-module-junit4-common',
'//lib:junit',
],
)
maven_jar(
name = 'powermock-module-junit4-common',
id = 'org.powermock:powermock-module-junit4-common:' + VERSION,
sha1 = '43db4720ff57af42a1bd5c73fb5cdfebeebd564c',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-reflect',
'//lib:junit',
],
)
maven_jar(
name = 'powermock-reflect',
id = 'org.powermock:powermock-reflect:' + VERSION,
sha1 = '8df1548eeabb8492ba97d4f3eb84ae4d5f69215e',
license = 'DO_NOT_DISTRIBUTE',
deps = [
'//lib:junit',
'//lib/easymock:objenesis',
],
)
maven_jar(
name = 'powermock-api-easymock',
id = 'org.powermock:powermock-api-easymock:' + VERSION,
sha1 = 'a485b570b9debb46b53459a8e866a40343b2cfe2',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-api-support',
'//lib/easymock:easymock',
],
)
maven_jar(
name = 'powermock-api-support',
id = 'org.powermock:powermock-api-support:' + VERSION,
sha1 = '7c1b2e4555cfa333aec201c4612345c092820a38',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-core',
':powermock-reflect',
'//lib:junit',
],
)
maven_jar(
name = 'powermock-core',
id = 'org.powermock:powermock-core:' + VERSION,
sha1 = '4415337ff3fdb7ceb484f11fd08e39711e408976',
license = 'DO_NOT_DISTRIBUTE',
deps = [
':powermock-reflect',
'//lib:javassist-3.17.1-GA',
'//lib:junit',
],
)

2
plugins/replication

Submodule plugins/replication updated: c6ae0f60d3...89b4dc5c1c