workaround for bazelbuild#47

nevillelyh · Nov 23, 2017 · f10e14f · f10e14f
1 parent a5e6874
commit f10e14f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/deploy.sh b/deploy.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+jar -tf bazel-bin/generate_workspace/generate_workspace_deploy.jar
+cp bazel-bin/generate_workspace/generate_workspace_deploy.jar transitive_maven_jar
diff --git a/...te_workspace/src/main/java/com/google/devtools/build/workspace/maven/VersionResolver.java b/...te_workspace/src/main/java/com/google/devtools/build/workspace/maven/VersionResolver.java
@@ -17,6 +17,8 @@
 import static com.google.devtools.build.workspace.maven.ArtifactBuilder.InvalidArtifactCoordinateException;
 
 import com.google.common.annotations.VisibleForTesting;
+
+import java.util.Collections;
 import java.util.List;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.resolution.VersionRangeResolutionException;
@@ -69,9 +71,13 @@ String resolveVersion(String groupId, String artifactId, String versionSpec)
    */
   private List<String> requestVersionList(String groupId, String artifactId, String versionSpec)
       throws VersionRangeResolutionException, InvalidArtifactCoordinateException {
-    String transformedSpec = makeVersionRange(versionSpec);
-    Artifact artifact = ArtifactBuilder.fromCoords(groupId, artifactId, transformedSpec);
-    return aether.requestVersionRange(artifact);
+    if (isVersionRange(versionSpec)) {
+      String transformedSpec = makeVersionRange(versionSpec);
+      Artifact artifact = ArtifactBuilder.fromCoords(groupId, artifactId, transformedSpec);
+      return aether.requestVersionRange(artifact);
+    } else {
+      return Collections.singletonList(versionSpec);
+    }
   }
 
   /**

diff --git a/transitive_maven_jar/generate_workspace_deploy.jar b/transitive_maven_jar/generate_workspace_deploy.jar