Fix outdated target to survive artifacts without a version number

.allstar/binary_artifacts.yaml

@@ -2,4 +2,3 @@
 ignorePaths:
 - private/tools/prebuilt/hasher_deploy.jar
 - private/tools/prebuilt/list_packages_deploy.jar
-- private/tools/prebuilt/outdated_deploy.jar

private/rules/coursier.bzl

@@ -80,23 +80,28 @@ sh_binary(
 )
 """
 
+outdated_library = Label("//private/tools/java/com/github/bazelbuild/rules_jvm_external/maven:outdated-lib")
+
 _BUILD_OUTDATED = """
-sh_binary(
+java_binary(
     name = "outdated",
-    srcs = ["outdated.sh"],
+    main_class = "com.github.bazelbuild.rules_jvm_external.maven.Outdated",
+    runtime_deps = [
+        "%s",
+    ],
     data = [
-        "@rules_jvm_external//private/tools/prebuilt:outdated_deploy.jar",
         "outdated.artifacts",
         "outdated.repositories",
     ],
     args = [
-        "$(location @rules_jvm_external//private/tools/prebuilt:outdated_deploy.jar)",
+        "--artifacts-file",
         "$(location outdated.artifacts)",
+        "--repositories-file",
         "$(location outdated.repositories)",
     ],
     visibility = ["//visibility:public"],
 )
-"""
+""" % Label("//private/tools/java/com/github/bazelbuild/rules_jvm_external/maven:outdated-lib")
 
 EMPTY_FILE_SHA256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 

private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/BUILD

@@ -46,11 +46,26 @@ java_binary(
     ],
 )
 
+java_library(
+    name = "outdated-lib",
+    srcs = ["Outdated.java"],
+    visibility = ["//visibility:public"],
+    deps = [
+        artifact(
+            "org.apache.maven:maven-artifact",
+            repository_name = "rules_jvm_external_deps",
+        ),
+    ],
+)
+
+# Just used for testing the binary
 java_binary(
     name = "outdated",
     srcs = ["Outdated.java"],
     main_class = "com.github.bazelbuild.rules_jvm_external.maven.Outdated",
-    visibility = ["//visibility:public"],
+    visibility = [
+        "//tests/com/github/bazelbuild/rules_jvm_external/maven:__pkg__",
+    ],
     deps = [
         artifact(
             "org.apache.maven:maven-artifact",

private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/Outdated.java

@@ -247,6 +247,12 @@ public static void main(String[] args) throws IOException {
       String[] artifactParts = artifact.split(":");
       String groupId = artifactParts[0];
       String artifactId = artifactParts[1];
+
+      // If a dependency is one where the version is selected by a BOM, there
+      // may not be a version number. In this case, skip the artifact.
+      if (artifactParts.length < 3) {
+        continue;
+      }
       String version = artifactParts[2];
 
       ArtifactReleaseInfo artifactReleaseInfo = null;

private/tools/prebuilt/BUILD

@@ -5,5 +5,4 @@ exports_files([
     "hasher_deploy.jar",  # built from //private/tools/java/com/github/bazelbuild/rules_jvm_external:hasher-tool_deploy.jar
     "index_jar_deploy.jar",  # built from //private/tools/java/com/github/bazelbuild/rules_jvm_external/jar:IndexJar_deploy.jar
     "lock_file_converter_deploy.jar",  # built from //private/tools/java/com/github/bazelbuild/rules_jvm_external/coursier:LockFileConverter_deploy.jar
-    "outdated_deploy.jar",  # built from //private/tools/java/com/github/bazelbuild/rules_jvm_external/maven:outdated_deploy.jar
 ])

scripts/BUILD

@@ -105,13 +105,10 @@ sh_binary(
         "lock_file_converter_deploy.jar",
         "$(location //private/tools/java/com/github/bazelbuild/rules_jvm_external/jar:IndexJar_deploy.jar)",
         "index_jar_deploy.jar",
-        "$(location //private/tools/java/com/github/bazelbuild/rules_jvm_external/maven:outdated_deploy.jar)",
-        "outdated_deploy.jar",
     ],
     data = [
         "//private/tools/java/com/github/bazelbuild/rules_jvm_external:hasher-tool_deploy.jar",
         "//private/tools/java/com/github/bazelbuild/rules_jvm_external/coursier:LockFileConverter_deploy.jar",
         "//private/tools/java/com/github/bazelbuild/rules_jvm_external/jar:IndexJar_deploy.jar",
-        "//private/tools/java/com/github/bazelbuild/rules_jvm_external/maven:outdated_deploy.jar",
     ],
 )

tests/com/github/bazelbuild/rules_jvm_external/maven/OutdatedTest.java

@@ -17,6 +17,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.List;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.junit.Rule;
@@ -438,4 +439,32 @@ public void worksWithCommonsVersions() throws IOException {
     assertThat(releaseInfo.releaseVersion, equalTo("20040616"));
     assertThat(releaseInfo.preReleaseVersion, is(nullValue()));
   }
+
+  @Test
+  public void shouldSkipArtifactWhenAnArtifactLacksAVersionNumber() throws IOException {
+    Path artifactsFile = temp.newFile("outdated.artifacts").toPath();
+    Files.write(artifactsFile, List.of("com.google.guava:guava"), StandardCharsets.UTF_8);
+
+    Path repositoriesFile = temp.newFile("outdated.repositories").toPath();
+    Files.write(
+        repositoriesFile, List.of("https://repo1.maven.org/maven2"), StandardCharsets.UTF_8);
+
+    ByteArrayOutputStream outdatedOutput = new ByteArrayOutputStream();
+    try {
+      System.setOut(new PrintStream(outdatedOutput));
+      Outdated.main(
+          new String[] {
+            "--artifacts-file", artifactsFile.toAbsolutePath().toString(),
+            "--repositories-file", repositoriesFile.toAbsolutePath().toString()
+          });
+    } finally {
+      System.setOut(originalOut);
+    }
+
+    assertThat(
+        outdatedOutput.toString(),
+        containsString("Checking for updates of 1 artifacts against the following repositories"));
+    assertThat(outdatedOutput.toString(), containsString("https://repo1.maven.org/maven2"));
+    assertThat(outdatedOutput.toString(), containsString("No updates found"));
+  }
 }

tests/integration/BUILD

@@ -27,6 +27,8 @@ genquery(
         "@testonly_testing//:com_google_auto_value_auto_value_annotations",
         "@testonly_testing//:defs",
         "@testonly_testing//:outdated",
+        # This seems fragile
+        "@testonly_testing//:outdated_deployjars_internal_rule",
         "@testonly_testing//:pin",
     ],
 )

tests/unit/coordinates_test.bzl

@@ -121,10 +121,10 @@ def _unusual_version_format_impl(ctx):
     # Unusual version formats
     versions = [
         "809c471bf94f09bf4699ba53eb337768d5d9882f",  # A git sha
-        "FY21R16",    # Based on year and release number
-        "PRERELEASE", # Just a nice name
+        "FY21R16",  # Based on year and release number
+        "PRERELEASE",  # Just a nice name
         "VX.2.5.0.0",  # Also seen in the wild
-        "jcef-7f53d6d+cef-100.0.14+g4e5ba66+chromium-100.0.4896.75", # Seen in the wild
+        "jcef-7f53d6d+cef-100.0.14+g4e5ba66+chromium-100.0.4896.75",  # Seen in the wild
     ]
 
     for version in versions: