Remove error handling for 'servlet' element in services.xml

1 files changed, 0 insertions, 7 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 d5c64689648..7f0948cccda 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
@@ -187,7 +187,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         addConfiguredComponents(deployState, cluster, spec);
         addSecretStore(cluster, spec, deployState);
 
-        addServlets(deployState, spec, cluster);
         addModelEvaluation(spec, cluster, context);
         addModelEvaluationBundles(cluster);
 
@@ -527,12 +526,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         return http;
     }
 
-    // TODO Vespa 8: Remove
-    private void addServlets(DeployState deployState, Element spec, ApplicationContainerCluster cluster) {
-        if (XML.getChildren(spec, "servlet").size() > 0)
-            throw new IllegalArgumentException("The 'servlet' tag is no longer supported in services.xml. Please use a handler instead.");
-    }
-
     private void addDocumentApi(Element spec, ApplicationContainerCluster cluster) {
         ContainerDocumentApi containerDocumentApi = buildDocumentApi(cluster, spec);
         if (containerDocumentApi == null) return;