diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-02-12 16:52:30 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-02-15 09:17:52 +0000 |
| commit | 307803e1236b9af89cad3803cebd4a84a47ec9c8 (patch) | |
| tree | 85d4ea62ee98984fa5d4c9f681e3496f042227a0 /src/main/java | |
| parent | 4242d207765f1de037f4b777da1ac9fba35e7f3f (diff) | |
Remove deprecated fields
Starting some cleanup on generate_ws.
RELNOTES[INC]: maven_jar no longer supports separate artifact_id, group_id, and
verison fields. This information should be provided in the artifact field,
instead.
--
MOS_MIGRATED_REVID=114538437
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java index 1bbe61ffa2..be4e9f7cb0 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java @@ -170,13 +170,7 @@ public class MavenJarFunction extends HttpArchiveFunction { this.name = name; this.outputDirectory = outputDirectory; - if (!mapper.get("artifact", Type.STRING).isEmpty()) { - this.artifact = mapper.get("artifact", Type.STRING); - } else { - this.artifact = mapper.get("group_id", Type.STRING) + ":" - + mapper.get("artifact_id", Type.STRING) + ":" - + mapper.get("version", Type.STRING); - } + this.artifact = mapper.get("artifact", Type.STRING); this.sha1 = (mapper.has("sha1", Type.STRING)) ? mapper.get("sha1", Type.STRING) : null; this.url = serverValue.getUrl(); this.server = serverValue.getServer(); diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java index da8639481c..cbcab5a8e7 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/workspace/MavenJarRule.java @@ -43,9 +43,6 @@ public class MavenJarRule implements RuleDefinition { see <a href="#maven_jar_examples">the documentation below</a> for an example. <!-- #END_BLAZE_RULE.ATTRIBUTE --> */ .add(attr("artifact", Type.STRING)) - .add(attr("artifact_id", Type.STRING).undocumented("deprecated")) - .add(attr("group_id", Type.STRING).undocumented("deprecated")) - .add(attr("version", Type.STRING).undocumented("deprecated")) /* <!-- #BLAZE_RULE(maven_jar).ATTRIBUTE(repository) --> A URL for a Maven repository to fetch the jar from. |