Merge pull request #21182 from vespa-engine/bjorncs/deployment-warning

Output deployment warning on use of 'jetty' attribute

1 files changed, 11 insertions, 0 deletions

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 74f2d44fc03..c88d225f527 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
@@ -164,6 +164,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
         checkVersion(spec);
         checkTagName(spec, log);
+        checkDeprecatedAttributes(spec, log);
 
         ApplicationContainerCluster cluster = createContainerCluster(spec, modelContext);
         addClusterContent(cluster, spec, modelContext);
@@ -173,6 +174,16 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         model.setCluster(cluster);
     }
 
+    private void checkDeprecatedAttributes(Element spec, DeployLogger log) {
+        String version = spec.getAttribute("jetty");
+        if (!version.isEmpty()) {
+            log.logApplicationPackage(WARNING,
+                    "The 'jetty' attribute is deprecated and will be removed in Vespa 8. " +
+                            "It has no effect - Jetty is always enabled." +
+                            "Please remove the attribute from the 'container'/'jdisc' element in services.xml.");
+        }
+    }
+
     private ApplicationContainerCluster createContainerCluster(Element spec, ConfigModelContext modelContext) {
         return new VespaDomBuilder.DomConfigProducerBuilder<ApplicationContainerCluster>() {
             @Override