Remove compileVersion from application and instance responses

7 files changed, 0 insertions, 14 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 69c19caf086..637c5d019ad 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -762,10 +762,6 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                 toSlime(object.setObject("outstandingChange"), status.outstandingChange(instance.name()));
         });
 
-        // TODO jonmv: remove once clients use new path
-        // Compile version. The version that should be used when building an application
-        object.setString("compileVersion", compileVersion(application.id()).toFullString());
-
         application.majorVersion().ifPresent(majorVersion -> object.setLong("majorVersion", majorVersion));
 
         Cursor instancesArray = object.setArray("instances");
@@ -947,10 +943,6 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
             }));
         }
 
-        // TODO jonmv: remove once clients use new path
-        // Compile version. The version that should be used when building an application
-        object.setString("compileVersion", compileVersion(application.id()).toFullString());
-
         application.majorVersion().ifPresent(majorVersion -> object.setLong("majorVersion", majorVersion));
 
         // Global endpoint
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-instances.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-instances.json
index 411f9074582..2ee72f150e5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-instances.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-instances.json
@@ -2,7 +2,6 @@
   "tenant": "tenant1",
   "application": "application1",
   "deployments": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/job/",
-  "compileVersion": "6.1.0",
   "instances": [],
   "pemDeployKeys": [],
   "metrics": {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
index cfe775a1965..59c32bb2f1c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json
@@ -14,7 +14,6 @@
     "commit": "commit1"
   },
   "projectId": 1000,
-  "compileVersion": "6.1.0",
   "majorVersion": 7,
   "instances": [
     {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
index 14c693ddaf8..6934d81a8d9 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json
@@ -14,7 +14,6 @@
     "commit": "commit1"
   },
   "projectId": 1000,
-  "compileVersion": "6.1.0",
   "instances": [
     {
       "instance": "default",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-with-routing-policy.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-with-routing-policy.json
index 16061053b98..e6b5dac0c37 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-with-routing-policy.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-with-routing-policy.json
@@ -179,7 +179,6 @@
     }
   ],
   "changeBlockers": [],
-  "compileVersion": "(ignore)",
   "globalRotations": [],
   "instances": [
     {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json
index 3d1c5ade300..7b264c8e28e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json
@@ -253,7 +253,6 @@
       ]
     }
   ],
-  "compileVersion": "6.0.0",
   "globalRotations": [
     "https://instance1--application1--tenant1.global.vespa.oath.cloud:4443/"
   ],
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json
index 1b7e7893222..389b07dcdfb 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json
@@ -253,7 +253,6 @@
       ]
     }
   ],
-  "compileVersion": "6.0.0",
   "globalRotations": [
     "https://instance1--application1--tenant1.global.vespa.oath.cloud:4443/"
   ],