Merge branch 'master' into gjoranv/exclude-scala-xml

1 files changed, 2 insertions, 6 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index 5afc570d81b..5b79415c132 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -17,7 +17,7 @@ import java.util.Set;
 /**
  * Model context containing state provided to model factories.
  *
- * @author lulf
+ * @author Ulf Lilleengen
  */
 public interface ModelContext {
 
@@ -31,11 +31,6 @@ public interface ModelContext {
     Properties properties();
     default Optional<File> appDir() { return Optional.empty();}
     
-    /** @deprecated TODO: Remove this when no config models older than 6.98 are used */
-    @SuppressWarnings("unused")
-    @Deprecated
-    default Optional<com.yahoo.config.provision.Version> vespaVersion() { return Optional.empty(); }
-    
     /** The Vespa version this model is built for */
     Version modelVespaVersion();
     
@@ -50,4 +45,5 @@ public interface ModelContext {
         Zone zone();
         Set<Rotation> rotations();
     }
+
 }