From 444be1ef391518c73f2698600301dbdd25fa6e40 Mon Sep 17 00:00:00 2001 From: Mickey Reiss Date: Tue, 25 Oct 2016 14:33:12 -0700 Subject: [PATCH 1/2] Add verison to workspace names This will make the tool work well when multiple versions of the same library in are present in transitive dependencies. --- src/main/java/braintree/BazelDeps.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/braintree/BazelDeps.java b/src/main/java/braintree/BazelDeps.java index 32f8719..53a322d 100755 --- a/src/main/java/braintree/BazelDeps.java +++ b/src/main/java/braintree/BazelDeps.java @@ -104,7 +104,7 @@ private static void printForBuildFile(Artifact artifact, Set dependenc } private static String artifactName(Artifact artifact) { - return sanitizeName(artifact.getGroupId()) + "_" + sanitizeName(artifact.getArtifactId()); + return sanitizeName(artifact.getGroupId()) + "_" + sanitizeName(artifact.getArtifactId()) + "_" + sanitizeName(artifact.getVersion()); } private static String sanitizeName(String name) { From 8644dae2fadba0e88ee3c01781cad467627f0827 Mon Sep 17 00:00:00 2001 From: Mickey Reiss Date: Tue, 25 Oct 2016 14:34:25 -0700 Subject: [PATCH 2/2] Bump version number to 2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb091b7..c6141d2 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ braintree bazel-deps - 1.0-SNAPSHOT + 2.0-SNAPSHOT 1.8