opendev/gerrit
Code Issues Proposed changes

Make gerrit-acceptance-framework's artifacts match plugin's scheme

Browse Source 
The plugin and extension jars follow the scheme

  gerrit-$FOO -> $FOO.jar
  gerrit-$FOO -> $FOO-src.jar
  gerrit-$FOO -> $FOO-javadoc.jar

Hence, for the gerrit-acceptance-framework directory, the artifacts
were expected as:

* gerrit-acceptance-framework.jar
* gerrit-acceptance-framework-src.jar
* gerrit-acceptance-framework-javadoc.jar

However, they are called 'api.jar', 'src.jar', 'javadoc.jar' without
any qualifier in front. To make naming more consistent, we make the
new gerrit-acceptance-framework artifacts follow the above scheme.

Change-Id: I6fcefed4a8ba05aae4ae2dc6f22ff39e48dea56d
This commit is contained in:
Christian Aistleitner
2015-09-29 10:57:20 +02:00
parent 60b386ec58
commit 97d7b0d7b9
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BUCK
View File

@@ -9,9 +9,9 @@ gerrit_war(name = 'withdocs', docs = True)
gerrit_war(name = 'release', ui = 'ui_optdbg_r', docs = True, context = ['//plugins:core'], visibility = ['//tools/maven:'])
API_DEPS = [
'//gerrit-acceptance-framework:api',
'//gerrit-acceptance-framework:src',
'//gerrit-acceptance-framework:javadoc',
'//gerrit-acceptance-framework:acceptance-framework',
'//gerrit-acceptance-framework:acceptance-framework-src',
'//gerrit-acceptance-framework:acceptance-framework-javadoc',
'//gerrit-extension-api:extension-api',
'//gerrit-extension-api:extension-api-src',
'//gerrit-extension-api:extension-api-javadoc',

14
gerrit-acceptance-framework/BUCK
View File

@@ -31,7 +31,7 @@ PROVIDED = [
]
java_binary(
name = 'api',
name = 'acceptance-framework',
deps = [':lib'],
visibility = ['PUBLIC'],
)
@@ -57,8 +57,18 @@ java_sources(
visibility = ['PUBLIC'],
)
# The above java_sources produces a .jar somewhere in the depths of
# buck-out, but it does not bring it to
# buck-out/gen/gerrit-acceptance-framework/gerrit-acceptance-framework-src.jar.
# We fix that by the following java_binary.
java_binary(
name = 'acceptance-framework-src',
deps = [ ':src' ],
visibility = ['PUBLIC'],
)
java_doc(
name = 'javadoc',
name = 'acceptance-framework-javadoc',
title = 'Gerrit Acceptance Test Framework Documentation',
pkgs = [' com.google.gerrit.acceptance'],
paths = ['src/test/java'],

6
tools/maven/BUCK
View File

@@ -10,19 +10,19 @@ maven_package(
url = URL,
version = GERRIT_VERSION,
jar = {
'gerrit-acceptance-framework': '//gerrit-acceptance-framework:api',
'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework',
'gerrit-extension-api': '//gerrit-extension-api:extension-api',
'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api',
'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api',
},
src = {
'gerrit-acceptance-framework': '//gerrit-acceptance-framework:src',
'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework-src',
'gerrit-extension-api': '//gerrit-extension-api:extension-api-src',
'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api-src',
'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api-src',
},
doc = {
'gerrit-acceptance-framework': '//gerrit-acceptance-framework:javadoc',
'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework-javadoc',
'gerrit-extension-api': '//gerrit-extension-api:extension-api-javadoc',
'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api-javadoc',
'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api-javadoc',