1 files changed, 5 insertions, 4 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index 22b8e841430..f1565d1fa4b 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -631,10 +631,11 @@ public class FilesApplicationPackage implements ApplicationPackage {
 
     @Override
     public void validateXML(Optional<Version> vespaVersion) throws IOException {
-        com.yahoo.component.Version modelVersion = vespaVersion.map(v -> new com.yahoo.component.Version(vespaVersion.toString())).orElse(Vtag.currentVersion);
-        ApplicationPackageXmlFilesValidator xmlFilesValidator = ApplicationPackageXmlFilesValidator.createDefaultXMLValidator(appDir, modelVersion);
-        xmlFilesValidator.checkApplication();
-        xmlFilesValidator.checkIncludedDirs(this);
+        com.yahoo.component.Version modelVersion =
+                vespaVersion.map(v -> new com.yahoo.component.Version(vespaVersion.toString())).orElse(Vtag.currentVersion);
+        ApplicationPackageXmlFilesValidator validator = ApplicationPackageXmlFilesValidator.create(appDir, modelVersion);
+        validator.checkApplication();
+        validator.checkIncludedDirs(this);
     }
 
     @Override