diff options
author | 2017-01-19 17:44:54 +0000 | |
---|---|---|
committer | 2017-01-19 18:05:24 +0000 | |
commit | 7d5b31f9cb33dd86542cd2cd0fea63954010fc00 (patch) | |
tree | 32ff0afd606c224ecd9dbb932ebfc53b06e19dcc /src/test/shell/bazel/maven_skylark_test.sh | |
parent | fc346a9814d6ee9de4fc0df45ee7ec20dcdce886 (diff) |
maven_rules.bzl: Fix maven coordinates order mismatch
Classifier should be provided in the form:
"groupId:artifactId:version[:packaging][:classifier]"
because that's what maven-dependency-plugin expects and not in the form:
"groupId:artifactId[:packaging][:classifier]:version"
as documented here: [1]. Also it was missed to reflect the classifier in
the output artifact name.
TEST PLAN:
WORKSPACE:
load("//tools:maven_rules.bzl", "maven_jar",
"maven_dependency_plugin")
maven_dependency_plugin()
maven_jar(
name = "jetty_server_sources",
artifact = "org.eclipse.jetty:jetty-server:9.3.11.v20160721:jar:sources",
sha1 = "b23cac190808baed928260b2c9beca3b1ed232b4",
)
BUILD:
java_library(
name = "jetty-server-sources",
exports = ["@jetty_server_sources//jar"],
)
$ bazel build :jetty-server-sources
[...]
Target //:jetty-server-sources up-to-date:
bazel-bin/libjetty-server-sources.jar
[1] https://maven.apache.org/pom.html#Maven_Coordinates
Fixes #2049.
--
Change-Id: I3297fb3676324cc6b4bb6ff6b2b6e18ce33f633c
Reviewed-on: https://cr.bazel.build/7213
PiperOrigin-RevId: 144972944
MOS_MIGRATED_REVID=144972944
Diffstat (limited to 'src/test/shell/bazel/maven_skylark_test.sh')
-rwxr-xr-x | src/test/shell/bazel/maven_skylark_test.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/test/shell/bazel/maven_skylark_test.sh b/src/test/shell/bazel/maven_skylark_test.sh index 32538db45f..3b5a496505 100755 --- a/src/test/shell/bazel/maven_skylark_test.sh +++ b/src/test/shell/bazel/maven_skylark_test.sh @@ -102,6 +102,30 @@ EOF expect_log "Tra-la!" } +function test_maven_jar_with_classifier_skylark() { + setup_zoo + version="1.21" + packaging = "jar" + classifier = "sources" + serve_artifact com.example.carnivore carnivore $version $packaging $classifier + setup_local_maven_settings_xml "http://localhost:$fileserver_port" + + cat > WORKSPACE <<EOF +load("@bazel_tools//tools/build_defs/repo:maven_rules.bzl", "maven_jar") +maven_jar( + name = 'bar_sources', + artifact = "com.example.foo:bar:$version:jar:sources", + sha1 = '$sha1', + settings = '//:$local_maven_settings_xml', +) + +bind(name = 'baz_sources', actual = '@bar_sources//jar') +EOF + + bazel run //zoo:ball-pit >& $TEST_log || fail "Expected run to succeed" + expect_log "Tra-la!" +} + function setup_android_binary() { mkdir -p java/com/app cat > java/com/app/BUILD <<EOF |