diff options
| author |  Rohit Saboo <rohit@laserlike.com> | 2016-02-03 21:32:50 +0000 |
|---|---|---|
| committer |  David Chen <dzc@google.com> | 2016-02-03 22:07:29 +0000 |
| commit | f8c673230e08aa1bd6c303a3ebb2aa79af988a62 (patch) | |
| tree | 581ed51f394356b8e7db66b1555d9414b0718c6d /src | |
| parent | a09fb73fddc936cc48821b0bcbfb8b4cbf38eb20 (diff) | |
Trim sha1 in generate_workspace.
Sometimes, sha1 values in the generated maven rules contains newlines as
shown in the example below, which breaks the build.
maven_jar(
name = "com_google_code_findbugs_jsr305",
artifact = "com.google.code.findbugs:jsr305:1.3.9",
sha1 = "40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf
",
)
This change fixes that.
--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/843
MOS_MIGRATED_REVID=113776575
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Rule.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Rule.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Rule.java index ba88faf8ca..fb9fa8938d 100644 --- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Rule.java +++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Rule.java @@ -133,7 +133,7 @@ public final class Rule implements Comparable<Rule> { HttpURLConnection connection = (HttpURLConnection) new URL(jarSha1Url).openConnection(); connection.setInstanceFollowRedirects(true); connection.connect(); - this.sha1 = CharStreams.toString(new InputStreamReader(connection.getInputStream())); + this.sha1 = CharStreams.toString(new InputStreamReader(connection.getInputStream())).trim(); } catch (IOException e) { handler.handle(Event.warn("Failed to download the sha1 at " + jarSha1Url)); } |