Merge remote-tracking branch 'origin/main' into generalizeScoring and

fix minor merge conflict.

Author: Dave Wichers

plugin/pom.xml

@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.9.9</version>
+            <version>3.9.10</version>
             <scope>provided</scope>
         </dependency>
 
@@ -195,7 +195,7 @@
         <version.fasterxml.jackson>2.19.0</version.fasterxml.jackson>
         <!-- 3.0.3+ version of eclipse.persistence requires jakarta.xml.bind instead of jaxb -->
         <version.eclipse.persistence>2.7.15</version.eclipse.persistence>
-        <version.junit.jupiter>5.12.2</version.junit.jupiter>
+        <version.junit.jupiter>5.13.1</version.junit.jupiter>
     </properties>
 
 </project>

plugin/src/main/java/org/owasp/benchmarkutils/score/Configuration.java

@@ -25,6 +25,7 @@
 import java.util.Map;
 import org.owasp.benchmarkutils.helpers.Categories;
 import org.owasp.benchmarkutils.helpers.CategoryGroups;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 
 /**
@@ -93,7 +94,16 @@ public class Configuration {
 
     public final Report report;
 
-    private static final Yaml yaml = new Yaml();
+    private static final Yaml yaml = new Yaml(defaultLoaderOptions());
+
+    private static LoaderOptions defaultLoaderOptions() {
+        LoaderOptions loaderOptions = new LoaderOptions();
+
+        loaderOptions.setAllowDuplicateKeys(true);
+        loaderOptions.setWarnOnDuplicateKeys(false);
+
+        return loaderOptions;
+    }
 
     public static Configuration fromDefaultConfig() {
         return fromInputStream(resourceAsStream(DEFAULT_CONFIG), DEFAULT_SUCCESS_MESSAGE);

plugin/src/test/java/org/owasp/benchmarkutils/score/BenchmarkScoreTest.java

@@ -28,7 +28,7 @@
 
 public class BenchmarkScoreTest {
 
-    private static final String SEP = System.getProperty("line.separator");
+    private static final String SEP = System.lineSeparator();
     private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
     private final PrintStream originalOut = System.out;
 

pom.xml

@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
             </plugin>
 
             <plugin>