From d3a5c57a5e375d5f49b62a02ac7ab8a0a016b8e9 Mon Sep 17 00:00:00 2001 From: wjywbs Date: Thu, 19 Nov 2015 17:01:44 +0000 Subject: Skip optional maven dependencies in generate_workspace. -- Reviewed-on: https://github.com/bazelbuild/bazel/pull/627 MOS_MIGRATED_REVID=108252420 --- .../main/java/com/google/devtools/build/workspace/maven/Resolver.java | 3 +++ 1 file changed, 3 insertions(+) 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()); -- cgit v1.2.3