- CMS is not available in java 17.

- Ensure you have a modifiable list.

2 files changed, 8 insertions, 14 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index 33e28132c9a..d27f78f6a8a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -165,7 +165,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
                                                                      .filter(container -> retired == container.isRetired())
                                                                      .map(Container::getHostResource)
                                                                      .sorted(HostResource::comparePrimarilyByIndexTo)
-                                                                     .toList();
+                                                                     .collect(Collectors.toCollection(ArrayList::new));
         return hosts.subList(0, Math.min(count, hosts.size()));
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 71660c7029f..159ab26414d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -1244,7 +1244,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                                                 .filter(option -> !option.isEmpty())
                                                 .filter(option -> !Pattern.matches(validPattern.pattern(), option))
                                                 .sorted()
-                                                .toList();
+                                                .collect(Collectors.toCollection(ArrayList::new));
             if (isHosted)
                 invalidOptions.addAll(Arrays.stream(optionList)
                         .filter(option -> !option.isEmpty())
@@ -1291,17 +1291,12 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                 options = jvmGcOptions;
                 String[] optionList = options.split(" ");
                 List<String> invalidOptions = Arrays.stream(optionList)
-                                                    .filter(option -> !option.isEmpty())
-                                                    .filter(option -> !Pattern.matches(validPattern.pattern(), option))
-                                                    .toList();
-
-                if (isHosted) {
-                    // CMS GC options cannot be used in hosted, CMS is unsupported in JDK 17
-                    invalidOptions.addAll(Arrays.stream(optionList)
-                            .filter(option -> !option.isEmpty())
-                            .filter(option -> Pattern.matches(invalidCMSPattern.pattern(), option) ||
-                                    option.equals("-XX:+UseConcMarkSweepGC")).toList());
-                }
+                        .filter(option -> !option.isEmpty())
+                        .filter(option -> !Pattern.matches(validPattern.pattern(), option)
+                                || Pattern.matches(invalidCMSPattern.pattern(), option)
+                                || option.equals("-XX:+UseConcMarkSweepGC"))
+                        .sorted()
+                        .toList();
 
                 logOrFailInvalidOptions(invalidOptions);
             }
@@ -1315,7 +1310,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         private void logOrFailInvalidOptions(List<String> options) {
             if (options.isEmpty()) return;
 
-            Collections.sort(options);
             String message = "Invalid or misplaced JVM GC options in services.xml: " +
                     String.join(",", options) + "." +
                     " See https://docs.vespa.ai/en/reference/services-container.html#jvm";