Building legal maven_jar names in generate_workspace.

generate_workspace was previously leaving '.'s and '-'s in the generated
maven_jar names. This change replaces those characters with '_'s.

--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/840
MOS_MIGRATED_REVID=113684404

2 files changed, 12 insertions, 8 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 61168ae89c..ba88faf8ca 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
@@ -102,7 +102,7 @@ public final class Rule implements Comparable<Rule> {
    * A unique name for this artifact to use in maven_jar's name attribute.
    */
   public static String name(String groupId, String artifactId) {
-    return groupId + "_" + artifactId;
+    return groupId.replaceAll("[.-]", "_") + "_" + artifactId.replaceAll("[.-]", "_");
   }
 
   public Artifact getArtifact() {
diff --git a/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/WorkspaceFileGeneratorTest.java b/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/WorkspaceFileGeneratorTest.java
index bbdf0918b1..3ff548c078 100644
--- a/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/WorkspaceFileGeneratorTest.java
+++ b/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/WorkspaceFileGeneratorTest.java
@@ -72,13 +72,17 @@ public class WorkspaceFileGeneratorTest {
     resolver.writeWorkspace(outputStream);
     outputStream.close();
 
-    assertEquals("# The following dependencies were calculated from:\n"
-        + "# " + pom + "\n\n\n"
-        + "# com.google.appengine.demos:appengine-try-java:jar:1.0\n"
-        + "maven_jar(\n"
-        + "    name = \"com.google.appengine_appengine-api-1.0-sdk\",\n"
-        + "    artifact = \"com.google.appengine:appengine-api-1.0-sdk:1.9.20\",\n"
-        + ")\n\n", new String(Files.readAllBytes(Paths.get(outputFile))));
+    assertEquals(
+        "# The following dependencies were calculated from:\n"
+            + "# "
+            + pom
+            + "\n\n\n"
+            + "# com.google.appengine.demos:appengine-try-java:jar:1.0\n"
+            + "maven_jar(\n"
+            + "    name = \"com_google_appengine_appengine_api_1_0_sdk\",\n"
+            + "    artifact = \"com.google.appengine:appengine-api-1.0-sdk:1.9.20\",\n"
+            + ")\n\n",
+        new String(Files.readAllBytes(Paths.get(outputFile))));
     // We can't recursively fetch deps over the network.
     assertTrue(handler.hasErrors());
   }