diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
index 9d0a9a4414f5..6bbe8774665c 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
@@ -101,13 +101,9 @@ public static void serialize(Properties props, String key, Object value) {
             for (Iterator it = collection.iterator(); it.hasNext(); i++) {
                 serialize(props, key + "." + i, it.next());
             }
-        } else if (value instanceof Map) {
-            Map map = (Map) value;
+        } else if (value instanceof Map<?, ?> map) {
             props.setProperty(key, Integer.toString(map.size()));
-            @SuppressWarnings("checkstyle:UnusedLocalVariable")
-            int i = 0;
-            for (Iterator it = map.keySet().iterator(); it.hasNext(); i++) {
-                Object k = it.next();
+            for (Object k : map.keySet()) {
                 Object v = map.get(k);
                 serialize(props, key + "." + k, v);
             }