Remove config version on Vespa 8

11 files changed, 4 insertions, 51 deletions

diff --git a/application/abi-spec.json b/application/abi-spec.json
index 21eacb152c0..2053eabd9ad 100644
--- a/application/abi-spec.json
+++ b/application/abi-spec.json
@@ -239,7 +239,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.application.MockApplicationConfig$Builder)",
       "public com.yahoo.application.MockApplicationConfig$Mystruct mystruct()",
       "public java.util.List mystructlist()",
@@ -255,7 +254,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java
index f3816adb260..2560b218e54 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java
@@ -86,15 +86,13 @@ public class JavaClassBuilder implements ClassBuilder {
                 "  public final static String CONFIG_DEF_MD5 = \"" + root.getMd5() + "\";\n" + //
                 "  public final static String CONFIG_DEF_NAME = \"" + root.getName() + "\";\n" + //
                 "  public final static String CONFIG_DEF_NAMESPACE = \"" + root.getNamespace() + "\";\n" + //
-                "  public final static String CONFIG_DEF_VERSION = \"\";\n" + // TODO: Remove in Vespa 8
                 "  public final static String[] CONFIG_DEF_SCHEMA = {\n" + //
                 "" + indentCode(INDENTATION + INDENTATION, getDefSchema()) + "\n" + //
                 "  };\n" + //
                 "\n" + //
                 "  public static String getDefMd5()       { return CONFIG_DEF_MD5; }\n" + //
                 "  public static String getDefName()      { return CONFIG_DEF_NAME; }\n" + //
-                "  public static String getDefNamespace() { return CONFIG_DEF_NAMESPACE; }\n" + //
-                "  public static String getDefVersion()   { return CONFIG_DEF_VERSION; }";
+                "  public static String getDefNamespace() { return CONFIG_DEF_NAMESPACE; }";
     }
 
     private String getDefSchema() {
diff --git a/configgen/src/test/resources/allfeatures.reference b/configgen/src/test/resources/allfeatures.reference
index 21f49d21413..6ebcfc4ba12 100644
--- a/configgen/src/test/resources/allfeatures.reference
+++ b/configgen/src/test/resources/allfeatures.reference
@@ -38,7 +38,6 @@ public final class AllfeaturesConfig extends ConfigInstance {
   public final static String CONFIG_DEF_MD5 = "f901bdc5c96e7005130399c63f247823";
   public final static String CONFIG_DEF_NAME = "allfeatures";
   public final static String CONFIG_DEF_NAMESPACE = "configgen";
-  public final static String CONFIG_DEF_VERSION = "";
   public final static String[] CONFIG_DEF_SCHEMA = {
     "namespace=configgen",
     "boolVal bool",
@@ -92,7 +91,6 @@ public final class AllfeaturesConfig extends ConfigInstance {
   public static String getDefMd5()       { return CONFIG_DEF_MD5; }
   public static String getDefName()      { return CONFIG_DEF_NAME; }
   public static String getDefNamespace() { return CONFIG_DEF_NAMESPACE; }
-  public static String getDefVersion()   { return CONFIG_DEF_VERSION; }
 
   public interface Producer extends ConfigInstance.Producer {
     void getConfig(Builder builder);
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index 35dd216eb0a..70b4faa342e 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -355,7 +355,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.container.handler.ThreadpoolConfig$Builder)",
       "public int maxthreads()",
       "public int corePoolSize()",
@@ -368,7 +367,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
@@ -1394,7 +1392,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.jdisc.http.ConnectorConfig$Builder)",
       "public int listenPort()",
       "public java.lang.String name()",
@@ -1423,7 +1420,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
@@ -2029,7 +2025,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.jdisc.http.ServerConfig$Builder)",
       "public boolean developerMode()",
       "public int responseCompressionLevel()",
@@ -2051,7 +2046,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
diff --git a/container-disc/abi-spec.json b/container-disc/abi-spec.json
index d924d5196b9..aae37552283 100644
--- a/container-disc/abi-spec.json
+++ b/container-disc/abi-spec.json
@@ -190,7 +190,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Builder)",
       "public java.util.List groups()",
       "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups groups(int)",
@@ -201,7 +200,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   }
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index fa66d4aeb60..1cc397d2ed3 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -4436,7 +4436,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.search.handler.SearchWithRendererHandlerConfig$Builder)",
       "public java.lang.String rendererId()"
     ],
@@ -4444,7 +4443,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
@@ -4681,7 +4679,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.search.pagetemplates.PageTemplatesConfig$Builder)",
       "public java.util.List page()",
       "public java.lang.String page(int)"
@@ -4690,7 +4687,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
@@ -4781,7 +4777,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.search.pagetemplates.ResolversConfig$Builder)",
       "public java.util.List component()",
       "public com.yahoo.search.pagetemplates.ResolversConfig$Component component(int)"
@@ -4790,7 +4785,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
@@ -7105,7 +7099,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.search.query.rewrite.RewritesConfig$Builder)",
       "public java.util.List fsaDict()",
       "public com.yahoo.search.query.rewrite.RewritesConfig$FsaDict fsaDict(int)"
@@ -7114,7 +7107,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json
index eef39802a46..c26ab46d316 100644
--- a/documentapi/abi-spec.json
+++ b/documentapi/abi-spec.json
@@ -2013,7 +2013,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Builder)",
       "public java.util.Map cluster()",
       "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster cluster(java.lang.String)"
@@ -2022,7 +2021,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
@@ -2201,7 +2199,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.documentapi.messagebus.protocol.DocumentrouteselectorpolicyConfig$Builder)",
       "public java.util.List route()",
       "public com.yahoo.documentapi.messagebus.protocol.DocumentrouteselectorpolicyConfig$Route route(int)"
@@ -2210,7 +2207,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml
index 210b4c10570..c9c62316464 100644
--- a/documentgen-test/pom.xml
+++ b/documentgen-test/pom.xml
@@ -104,7 +104,7 @@
         <artifactId>vespa-documentgen-plugin</artifactId>
         <version>${project.version}</version>
         <configuration>
-          <sdDirectory>etc/complex</sdDirectory>
+          <schemasDirectory>etc/complex</schemasDirectory>
           <packageName>com.yahoo.vespa.documentgen.test</packageName>
           <abztract>
             <annotation><type>emptyannotation</type></annotation>
diff --git a/linguistics-components/abi-spec.json b/linguistics-components/abi-spec.json
index 39666fd93a3..0db6fff0765 100644
--- a/linguistics-components/abi-spec.json
+++ b/linguistics-components/abi-spec.json
@@ -134,7 +134,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.language.sentencepiece.SentencePieceConfig$Builder)",
       "public boolean collapseUnknowns()",
       "public com.yahoo.language.sentencepiece.SentencePieceConfig$Scoring$Enum scoring()",
@@ -145,7 +144,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
@@ -273,7 +271,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.language.wordpiece.WordPieceConfig$Builder)",
       "public java.lang.String subwordPrefix()",
       "public java.util.List model()",
@@ -283,7 +280,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
diff --git a/messagebus/abi-spec.json b/messagebus/abi-spec.json
index 83bab8e4734..af298a96d7d 100644
--- a/messagebus/abi-spec.json
+++ b/messagebus/abi-spec.json
@@ -572,7 +572,6 @@
       "public static java.lang.String getDefMd5()",
       "public static java.lang.String getDefName()",
       "public static java.lang.String getDefNamespace()",
-      "public static java.lang.String getDefVersion()",
       "public void <init>(com.yahoo.messagebus.MessagebusConfig$Builder)",
       "public java.util.List routingtable()",
       "public com.yahoo.messagebus.MessagebusConfig$Routingtable routingtable(int)"
@@ -581,7 +580,6 @@
       "public static final java.lang.String CONFIG_DEF_MD5",
       "public static final java.lang.String CONFIG_DEF_NAME",
       "public static final java.lang.String CONFIG_DEF_NAMESPACE",
-      "public static final java.lang.String CONFIG_DEF_VERSION",
       "public static final java.lang.String[] CONFIG_DEF_SCHEMA"
     ]
   },
diff --git a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java
index ed497e8ec1b..0183e2d08a6 100644
--- a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java
+++ b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java
@@ -58,19 +58,9 @@ public class DocumentGenMojo extends AbstractMojo {
     private MavenProject project;
 
     /**
-     * Directory containing the searchdefinition files
-     * @deprecated use {@link #schemasDirectory} instead
-     */
-    // TODO: Remove in Vespa 8
-    @Deprecated
-    @Parameter(defaultValue = ".", required = false)
-    private File sdDirectory;
-
-    /**
      * Directory containing the schema files
      */
-    // TODO: Make this required and with defaultValue "." when sdDirectory is removed in Vespa 8
-    @Parameter
+    @Parameter(defaultValue = ".", required = true)
     private File schemasDirectory;
 
     /**
@@ -982,12 +972,7 @@ public class DocumentGenMojo extends AbstractMojo {
 
     @Override
     public void execute() {
-        File dir = sdDirectory;
-        // Prefer schemasDirectory if set
-        if (this.schemasDirectory != null)
-            dir = this.schemasDirectory;
-
-        execute(dir, this.outputDirectory, packageName);
+        execute(this.schemasDirectory, this.outputDirectory, packageName);
     }
 
     Map<String, Schema> getSearches() {