fix: failures due to different set of JVM properties

Author: ppkarwasz

src/test/java/org/apache/commons/release/plugin/mojos/BuildAttestationMojoTest.java

@@ -21,6 +21,7 @@
 import static net.javacrumbs.jsonunit.JsonAssert.assertJsonNodePresent;
 import static net.javacrumbs.jsonunit.JsonAssert.assertJsonPartEquals;
 import static net.javacrumbs.jsonunit.JsonAssert.whenIgnoringPaths;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +34,10 @@
 import java.time.Instant;
 import java.util.Collections;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -173,14 +177,31 @@ private static void assertStatementContent(final JsonNode statement) {
                 JsonAssert.when(Option.IGNORING_VALUES).whenIgnoringPaths("jvm.args", "env"));
         assertJsonEquals(expectedStatement.at("/predicate/buildDefinition/internalParameters"),
                 statement.at("/predicate/buildDefinition/internalParameters"));
+        // `[0].annotations` holds JVM system properties;
+        // Not all properties are available on all JDKs, so they are either null or strings, which json-unit treats as a structural mismatch.
+        // We will check them below
         assertJsonEquals(expectedStatement.at("/predicate/buildDefinition/resolvedDependencies"),
                 statement.at("/predicate/buildDefinition/resolvedDependencies"),
-                JsonAssert.when(Option.IGNORING_VALUES));
+                JsonAssert.when(Option.IGNORING_VALUES).whenIgnoringPaths("[0].annotations"));
+        Set<String> expectedJdkFields = fieldNames(
+                expectedStatement.at("/predicate/buildDefinition/resolvedDependencies/0/annotations"));
+        Set<String> actualJdkFields = fieldNames(
+                statement.at("/predicate/buildDefinition/resolvedDependencies/0/annotations"));
+        assertEquals(expectedJdkFields, actualJdkFields);
         assertJsonEquals(expectedStatement.at("/predicate/runDetails"),
                 statement.at("/predicate/runDetails"),
                 whenIgnoringPaths("metadata.finishedOn"));
     }
 
+    private static Set<String> fieldNames(final JsonNode node) {
+        Set<String> names = new TreeSet<>();
+        Iterator<String> it = node.fieldNames();
+        while (it.hasNext()) {
+            names.add(it.next());
+        }
+        return names;
+    }
+
     @Test
     void attestationTest() throws Exception {
         MavenProjectHelper projectHelper = container.lookup(MavenProjectHelper.class);

src/test/resources/attestations/commons-text-1.4.intoto.json

@@ -114,7 +114,7 @@
             "vendor": "Eclipse Adoptium",
             "vm.vendor": "Eclipse Adoptium",
             "vendor.url": "https://adoptium.net/",
-            "specification.maintenance.version": "",
+            "specification.maintenance.version": null,
             "vm.specification.version": "25",
             "vm.name": "OpenJDK 64-Bit Server VM",
             "vm.specification.name": "Java Virtual Machine Specification",