Warn when using 'jvmargs' or 'jvm-options' in services.xml

Log application package warning and note that those options are
deprecated and will be removed in Vespa 8

1 files changed, 3 insertions, 2 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 0f3121afd24..2447709f778 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -1534,8 +1534,9 @@ public class ModelProvisioningTest {
             fail("Expected exception");
         }
         catch (IllegalArgumentException e) {
-            assertEquals("You have specified both jvm-options='xyz' and deprecated jvmargs='abc'. " +
-                                 "Merge jvmargs into 'options' in 'jvm' element. " +
+            assertEquals("You have specified both deprecated jvm-options='xyz' and deprecated jvmargs='abc'. " +
+                                 "'jvm-options' and 'jvmargs' are deprecated and will be removed in Vespa 8. " +
+                                 "Please merge 'jvmargs' into 'options' or 'gc-options' in 'jvm' element. " +
                                  "See https://docs.vespa.ai/en/reference/services-container.html#jvm",
                          e.getMessage());
         }