Merge branch 'stable-2.14' * stable-2.14: Update dependency names Add transitive dependency on eclipse runtime Don't include transitive gerrit core dependencies in plugin Format BUILD file with buildifier Change-Id: If47cd8701075543e877098c8d1c3c471567aeb55
diff --git a/BUILD b/BUILD index 7b60169..0c89247 100644 --- a/BUILD +++ b/BUILD
@@ -1,15 +1,14 @@ load("//tools/bzl:junit.bzl", "junit_tests") load( "//tools/bzl:plugin.bzl", - "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", + "gerrit_plugin", ) gerrit_plugin( name = "x-docs", srcs = glob(["src/main/java/**/*.java"]), - resources = glob(["src/main/**/*"]), gwt_module = "com.googlesource.gerrit.plugins.xdocs.XDocs", manifest_entries = [ "Gerrit-PluginName: x-docs", @@ -17,29 +16,33 @@ "Gerrit-Module: com.googlesource.gerrit.plugins.xdocs.Module", "Gerrit-InitStep: com.googlesource.gerrit.plugins.xdocs.XDocInit", ], + provided_deps = [ + "@commons-codec//jar:neverlink", + "@commons-lang//jar:neverlink", + "@guava//jar:neverlink", + "@log-api//jar:neverlink", + "@org-antlr//jar:neverlink", + ], + resources = glob(["src/main/**/*"]), deps = [ - "@asciidoctor//jar", - "@jruby//jar", - "@org_antlr//jar", - "@daisydiff//jar", - "@commons_codec//jar", - "@commons_io//jar", - "@commons_lang//jar", - "@guava//jar", ":avalon_framework_lib", - "@poi//jar", - "@poi_scratchpad//jar", + ":xmlgraphics_lib", + "@asciidoctor//jar", + "@commons-io//jar", + "@daisydiff//jar", + "@docx4j//jar", + "@eclipse_runtime//jar", "@jaxb_svg11//jar", "@jaxb_xmldsig_core//jar", "@jaxb_xslfo//jar", - "@xalan//jar", - "@docx4j//jar", + "@jruby//jar", "@mbassador//jar", - "@log_api//jar", - "@wmf2svg//jar", - "@xml_apis//jar", + "@poi//jar", + "@poi_scratchpad//jar", "@serializer//jar", - ":xmlgraphics_lib", + "@wmf2svg//jar", + "@xalan//jar", + "@xml_apis//jar", ], ) @@ -53,33 +56,33 @@ ) java_library( - name = "avalon_framework_lib", - exports = [ - "@avalon_framework_api//jar", - "@avalon_framework_impl//jar", - ], + name = "avalon_framework_lib", + exports = [ + "@avalon_framework_api//jar", + "@avalon_framework_impl//jar", + ], ) java_library( - name = "xmlgraphics_lib", - exports = [ - "@batik_anim//jar", - "@batik_awt_util//jar", - "@batik_bridge//jar", - "@batik_css//jar", - "@batik_dom//jar", - "@batik_ext//jar", - "@batik_extension//jar", - "@batik_gvt//jar", - "@batik_js//jar", - "@batik_parser//jar", - "@batik_script//jar", - "@batik_svg_dom//jar", - "@batik_svggen//jar", - "@batik_transcoder//jar", - "@batik_util//jar", - "@batik_xml//jar", - "@fop//jar", - "@xmlgraphics_commons//jar", - ], + name = "xmlgraphics_lib", + exports = [ + "@batik_anim//jar", + "@batik_awt_util//jar", + "@batik_bridge//jar", + "@batik_css//jar", + "@batik_dom//jar", + "@batik_ext//jar", + "@batik_extension//jar", + "@batik_gvt//jar", + "@batik_js//jar", + "@batik_parser//jar", + "@batik_script//jar", + "@batik_svg_dom//jar", + "@batik_svggen//jar", + "@batik_transcoder//jar", + "@batik_util//jar", + "@batik_xml//jar", + "@fop//jar", + "@xmlgraphics_commons//jar", + ], )
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index 161a4c4..8599465 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -24,6 +24,14 @@ ) maven_jar( + name = 'eclipse_runtime', + artifact = 'org.eclipse.core:runtime:20070801', + sha1 = '474e99ed838d5721569d658b68025134f920278f', + repository = 'https://maven.atlassian.com/content/repositories/atlassian-3rdparty', + attach_source = False, + ) + + maven_jar( name = 'docx4j', artifact = 'org.docx4j:docx4j:3.2.1', sha1 = '35b2ef9f7eb12efe9708b986ecf6e86cfd77a162',