Revert "Disable validation of deployment.xml"

2 files changed, 1 insertions, 4 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java
index 06ecede09a5..26c57483a5c 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java
@@ -55,8 +55,7 @@ public class ApplicationPackageXmlFilesValidator {
     public void checkApplication() throws IOException {
         validateHostsFile(SchemaValidator.hostsXmlSchemaName);
         validateServicesFile(SchemaValidator.servicesXmlSchemaName);
-        // TODO: Disable temporarily, need to get out feature to support ignoring validation errors
-        //validateDeploymentFile(SchemaValidator.deploymentXmlSchemaName);
+        validateDeploymentFile(SchemaValidator.deploymentXmlSchemaName);
 
         if (appDirs.searchdefinitions().exists()) {
             if (FilesApplicationPackage.getSearchDefinitionFiles(appDirs.root()).isEmpty()) {
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index 0334b3c867b..b531fc515ed 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -21,7 +21,6 @@ import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.search.SearchDefinition;
 import org.json.JSONException;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -211,7 +210,6 @@ public class ApplicationDeployTest {
         createAppPkg(tmpDir.getAbsolutePath());
     }
 
-    @Ignore // TODO: Enable when code in ApplicationPackageXmlFilesValidator does validation of deployment.xml
     @Test(expected = IllegalArgumentException.class)
     public void testThatAppWithIllegalDeploymentXmlIsNotValid() throws IOException {
         File tmpDir = Files.createTempDir();