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

3 files changed, 10 insertions, 28 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.
 
diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/Resolver.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/Resolver.java
index 68b1530f4e..780b4cb9e2 100644
--- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/Resolver.java
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/Resolver.java
@@ -94,10 +94,7 @@ public class Resolver {
     Location location = Location.fromFile(externalPackage.getFilename());
     for (Target target : externalPackage.getTargets()) {
       // Targets are //external:foo.
-      if (target.getTargetKind().startsWith("bind")
-          || target.getTargetKind().startsWith("source ")) {
-        continue;
-      } else if (target.getTargetKind().startsWith("maven_jar ")) {
+      if (target.getTargetKind().startsWith("maven_jar ")) {
         RepositoryName repositoryName;
         try {
           repositoryName = RepositoryName.create("@" + target.getName());
@@ -113,23 +110,16 @@ public class Resolver {
         AttributeMap attributeMap = AggregatingAttributeMapper.of(workspaceRule);
         Rule rule;
         try {
-          if (attributeMap.has("artifact", Type.STRING)
-              && !attributeMap.get("artifact", Type.STRING).isEmpty()) {
-            rule = new Rule(attributeMap.get("artifact", Type.STRING));
-          } else {
-            rule = new Rule(attributeMap.get("group_id", Type.STRING) + ":"
-                + attributeMap.get("artifact_id", Type.STRING) + ":"
-                + attributeMap.get("version", Type.STRING));
-          }
-          if (attributeMap.has("repository", Type.STRING)
-              && !attributeMap.get("repository", Type.STRING).isEmpty()) {
-            modelResolver.addUserRepository(attributeMap.get("repository", Type.STRING));
-            rule.setRepository(attributeMap.get("repository", Type.STRING), handler);
-          }
+          rule = new Rule(attributeMap.get("artifact", Type.STRING));
         } catch (Rule.InvalidRuleException e) {
           handler.handle(Event.error(location, "Couldn't get attribute: " + e.getMessage()));
           return;
         }
+        if (attributeMap.isAttributeValueExplicitlySpecified("repository")) {
+          modelResolver.addUserRepository(attributeMap.get("repository", Type.STRING));
+          rule.setRepository(attributeMap.get("repository", Type.STRING), handler);
+        }
+
         ModelSource modelSource;
 
         try {
@@ -142,7 +132,8 @@ public class Resolver {
         }
         resolver.addRootDependency(rule);
         resolver.resolveEffectiveModel(modelSource, Sets.<String>newHashSet(), rule);
-      } else {
+      } else if (!target.getTargetKind().startsWith("bind")
+          && !target.getTargetKind().startsWith("source ")) {
         handler.handle(Event.warn(location, "Cannot fetch transitive dependencies for " + target
             + " yet, skipping"));
       }