diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2021-02-26 18:49:37 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2021-02-26 18:54:44 +0100 |
| commit | 7d8ad5658e890e7eb2437633e39ee3cb43e35bed (patch) | |
| tree | 2364ccb2dfb34fb55b0a1bd306d8302943873cc4 | |
| parent | 8278667669d8bfe3c3875c481431676a0b9cef74 (diff) | |
Bazel: Fix source jar fetching with provided classifier
If classifier is provided, then it should be stripped before appending
"-sources.jar" suffix for fetching sources artefact.
Bug: Issue 14154
Change-Id: Ic1886fa0887e532b1fbfae445500346a1e65b719
| -rw-r--r-- | tools/bzl/maven_jar.bzl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl index 15b1797b84..d96ffc2692 100644 --- a/tools/bzl/maven_jar.bzl +++ b/tools/bzl/maven_jar.bzl @@ -60,7 +60,7 @@ def _create_coordinates(fully_qualified_name): if len(parts) == 3: group_id, artifact_id, version = parts elif len(parts) == 4: - group_id, artifact_id, version, packaging = parts + group_id, artifact_id, version, classifier = parts elif len(parts) == 5: group_id, artifact_id, version, packaging, classifier = parts else: @@ -158,7 +158,10 @@ def _maven_jar_impl(ctx): srcjar = None if ctx.attr.src_sha1 or ctx.attr.attach_source: srcjar = jar + "-src.jar" - srcurl = url + "-sources.jar" + srcurl = url + if coordinates.classifier != None: + srcurl = url.replace("-" + coordinates.classifier, "") + srcurl += "-sources.jar" srcjar_path = ctx.path("jar/" + srcjar) args = [python, script, "-o", srcjar_path, "-u", srcurl] if ctx.attr.src_sha1: |