Fix issue 1345 and allow artifacts with classifier=native again (#1346)

Author: cheister

MODULE.bazel

@@ -610,6 +610,15 @@ dev_maven.artifact(
     version = "v1-rev235-1.25.0",
 )
 
+# https://github.com/bazelbuild/rules_jvm_external/issues/1345
+dev_maven.artifact(
+    name = "regression_testing_coursier",
+    artifact = "jffi",
+    classifier = "native",
+    group = "com.github.jnr",
+    version = "1.3.13",
+)
+
 # These artifacts helped discover limitations in the Maven resolver. Each
 # artifact listed here *must have* an accompanying issue. We build_test these
 # targets to ensure that they remain supported by the rule.

WORKSPACE

@@ -281,6 +281,13 @@ maven_install(
         "com.github.spotbugs:spotbugs:4.7.0",
         # https://github.com/bazelbuild/rules_jvm_external/issues/1267
         "org.mockito:mockito-core:pom:3.3.3",
+        # https://github.com/bazelbuild/rules_jvm_external/issues/1345
+        maven.artifact(
+            artifact = "jffi",
+            classifier = "native",
+            group = "com.github.jnr",
+            version = "1.3.13",
+        ),
     ],
     fail_if_repin_required = True,
     generate_compat_repositories = True,

private/coursier_utilities.bzl

@@ -48,7 +48,7 @@ def strip_packaging_and_classifier(coord):
     unpacked_struct = unpack_coordinates(coord)
     unpacked = {} | struct_to_dict(unpacked_struct)
 
-    if unpacked.get("classifier", None) in ["sources", "native"]:
+    if unpacked.get("classifier", None) in ["sources", "natives"]:
         unpacked["classifier"] = None
 
     # Note that although "pom" is not a packaging type that Coursier CLI accepts,

private/lib/coordinates.bzl

@@ -2,9 +2,9 @@ SUPPORTED_PACKAGING_TYPES = [
     "aar",
     "bundle",
     "dll",
+    "dylib",
     "eclipse-plugin",
     "exe",
-    "dylib",
     "hk2-jar",
     "jar",
     "json",

tests/custom_maven_install/regression_testing_coursier_install.json

@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -1504192575,
-  "__RESOLVED_ARTIFACTS_HASH": 2021711580,
+  "__INPUT_ARTIFACTS_HASH": 1215293307,
+  "__RESOLVED_ARTIFACTS_HASH": -1385682992,
   "artifacts": {
     "android.arch.core:common": {
       "shasums": {
@@ -375,6 +375,12 @@
       },
       "version": "1.1"
     },
+    "com.github.jnr:jffi": {
+      "shasums": {
+        "native": "a38dd049951a27f7a423389fecf0195a5bd414f418e90f5ac9992652c22a5b8e"
+      },
+      "version": "1.3.13"
+    },
     "com.github.luben:zstd-jni": {
       "shasums": {
         "jar": "ebefe5b8698a57c55c64a297eaf8ba931c2cbc7df5b72de38ac1d034372b46e6"
@@ -618,9 +624,9 @@
     },
     "com.nimbusds:nimbus-jose-jwt": {
       "shasums": {
-        "jar": "f28dbd9ab128324f05050d76b78469d3a9cd83e0319aabc68d1c276e3923e13a"
+        "jar": "960b978a6cd6cbc3319648adc73959789f6742a2bf1e8dd0c843dbc91624218a"
       },
-      "version": "10.0.1"
+      "version": "10.0.2"
     },
     "com.nimbusds:oauth2-oidc-sdk": {
       "shasums": {
@@ -6174,6 +6180,7 @@
       "com.github.fommil.netlib:netlib-native_system-win-i686:jar:natives",
       "com.github.fommil.netlib:netlib-native_system-win-x86_64:jar:natives",
       "com.github.fommil:jniloader",
+      "com.github.jnr:jffi:jar:native",
       "com.github.luben:zstd-jni",
       "com.github.oshi:oshi-core",
       "com.github.oshi:oshi-parent:pom",
@@ -6459,6 +6466,7 @@
       "com.github.fommil.netlib:netlib-native_system-win-i686:jar:natives",
       "com.github.fommil.netlib:netlib-native_system-win-x86_64:jar:natives",
       "com.github.fommil:jniloader",
+      "com.github.jnr:jffi:jar:native",
       "com.github.luben:zstd-jni",
       "com.github.oshi:oshi-core",
       "com.github.oshi:oshi-parent:pom",
@@ -6744,6 +6752,7 @@
       "com.github.fommil.netlib:netlib-native_system-win-i686:jar:natives",
       "com.github.fommil.netlib:netlib-native_system-win-x86_64:jar:natives",
       "com.github.fommil:jniloader",
+      "com.github.jnr:jffi:jar:native",
       "com.github.luben:zstd-jni",
       "com.github.oshi:oshi-core",
       "com.github.oshi:oshi-parent:pom",

tests/unit/build_tests/BUILD

@@ -7,22 +7,23 @@ load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
 build_test(
     name = "all_artifacts",
     targets = [
-        "@regression_testing_coursier//:org_pantsbuild_jarjar",
+        "@regression_testing_coursier//:build_buf_protovalidate",
+        "@regression_testing_coursier//:ch_epfl_scala_compiler_interface",
+        "@regression_testing_coursier//:com_fasterxml_jackson_jackson_bom",
         "@regression_testing_coursier//:com_github_fommil_netlib_all",
+        "@regression_testing_coursier//:com_github_jnr_jffi_native",
+        "@regression_testing_coursier//:com_google_protobuf_protoc_linux_x86_64",
+        "@regression_testing_coursier//:com_google_protobuf_protoc_osx_aarch_64",
+        "@regression_testing_coursier//:io_kubernetes_client_java",
+        "@regression_testing_coursier//:io_netty_netty_tcnative_boringssl_static",
+        "@regression_testing_coursier//:io_quarkus_http_quarkus_http_servlet",
         "@regression_testing_coursier//:nz_ac_waikato_cms_weka_weka_stable",
+        "@regression_testing_coursier//:org_apache_flink_flink_test_utils_2_12",
         "@regression_testing_coursier//:org_eclipse_jetty_jetty_http_tests",
         "@regression_testing_coursier//:org_eclipse_jetty_orbit_javax_servlet",
-        "@regression_testing_coursier//:org_apache_flink_flink_test_utils_2_12",
-        "@regression_testing_coursier//:ch_epfl_scala_compiler_interface",
-        "@regression_testing_coursier//:org_openjfx_javafx_base",
-        "@regression_testing_coursier//:io_kubernetes_client_java",
-        "@regression_testing_coursier//:io_quarkus_http_quarkus_http_servlet",
-        "@regression_testing_coursier//:com_fasterxml_jackson_jackson_bom",
         "@regression_testing_coursier//:org_junit_junit_bom",
-        "@regression_testing_coursier//:io_netty_netty_tcnative_boringssl_static",
-        "@regression_testing_coursier//:com_google_protobuf_protoc_linux_x86_64",
-        "@regression_testing_coursier//:com_google_protobuf_protoc_osx_aarch_64",
-        "@regression_testing_coursier//:build_buf_protovalidate",
+        "@regression_testing_coursier//:org_openjfx_javafx_base",
+        "@regression_testing_coursier//:org_pantsbuild_jarjar",
         "@regression_testing_maven//:org_apache_parquet_parquet_common",
     ],
 )

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: