diff --git a/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java b/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
index 4bb3099..f647dac 100644
--- a/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/AbstractEffectiveMojo.java
@@ -140,11 +140,13 @@ protected static class SortedProperties extends Properties {
         static final long serialVersionUID = -8985316072702233744L;
 
         /** {@inheritDoc} */
-        @SuppressWarnings({"rawtypes", "unchecked"})
         @Override
         public Set<Object> keySet() {
             Set<Object> keynames = super.keySet();
-            List list = new ArrayList(keynames);
+            List<String> list = new ArrayList<>();
+            for (Object key : keynames) {
+                list.add((String) key);
+            }
             Collections.sort(list);
 
             return new LinkedHashSet<>(list);