Move major-version from services to deploy

1 files changed, 5 insertions, 3 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index c7258d8aede..c6e44e3aef3 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -145,9 +145,11 @@ public interface ApplicationPackage {
 
     /** Returns the major version this application is valid for, or empty if it is valid for all versions */
     default Optional<Integer> getMajorVersion() {
-        Element servicesElement = XML.getDocument(getServices()).getDocumentElement();
-        if (servicesElement == null) return Optional.empty();
-        String majorVersionString = servicesElement.getAttribute("major-version");
+        if ( ! getDeployment().isPresent()) return Optional.empty();
+
+        Element deployElement = XML.getDocument(getDeployment().get()).getDocumentElement();
+        if (deployElement == null) return Optional.empty();
+        String majorVersionString = deployElement.getAttribute("major-version");
         if (majorVersionString == null || majorVersionString.isEmpty())
             return Optional.empty();
         try {