aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar wjywbs <wjywbs@gmail.com>2015-11-19 17:01:44 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2015-11-20 09:17:13 +0000
commitd3a5c57a5e375d5f49b62a02ac7ab8a0a016b8e9 (patch)
treebb8c3c316bbb2d249346f3f31f7bf315b9c6f59f
parentbf6281d165b9cfc6c8b9931f235293f50d48284c (diff)
Skip optional maven dependencies in generate_workspace.
-- Reviewed-on: https://github.com/bazelbuild/bazel/pull/627 MOS_MIGRATED_REVID=108252420
-rw-r--r--src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java
index d735408796..d52979866a 100644
--- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java
@@ -162,6 +162,9 @@ public class Resolver {
if (!dependency.getScope().equals(COMPILE_SCOPE)) {
continue;
}
+ if (dependency.isOptional()) {
+ continue;
+ }
try {
Rule artifactRule = new Rule(dependency);
boolean isNewDependency = addArtifact(artifactRule, model.toString());