summaryrefslogtreecommitdiffstats
path: root/configgen/src/main
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-06-07 13:21:48 +0200
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:31 +0200
commite337a30ca89055a6aa3f7aa9267d2f1e523e7bdd (patch)
tree18c2684712c4d19f8ae81a23a58d3e514ec7ba64 /configgen/src/main
parentb1f35a16a9e34e0973b8db7a58a607bcbfe31924 (diff)
Add back support for version in config definition
Add warning message, add TODO to remove in Vespa 9
Diffstat (limited to 'configgen/src/main')
-rw-r--r--configgen/src/main/java/com/yahoo/config/codegen/DefParser.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java
index 63cd1deb1f7..2ed0bc62d0b 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java
@@ -18,6 +18,8 @@ public class DefParser {
public static final String DEFAULT_PACKAGE_PREFIX = "com.yahoo.";
static final Pattern commentPattern = Pattern.compile("^\\s*#+\\s*(.*?)\\s*$");
+ // TODO: Version is ignored, remove in Vespa 9
+ public static final Pattern versionPattern = Pattern.compile("^(version\\s*=\\s*)([0-9][0-9-]*)$");
// Namespace/package must start with a letter, since Java (Java language Spec, section 3.8) and C++ identifiers cannot start with a digit
public static final Pattern namespacePattern = getNamespacePattern("namespace");
public static final Pattern packagePattern = getNamespacePattern("package");
@@ -123,6 +125,11 @@ public class DefParser {
parseCommentLine(commentMatch);
return;
}
+ Matcher versionMatch = versionPattern.matcher(line);
+ if (versionMatch.matches()) {
+ System.err.println("Warning: In config definition '" + name + "': version is deprecated and ignored, please remove, support will be removed in Vespa 9");
+ return;
+ }
Matcher namespaceMatcher = namespacePattern.matcher(line);
if (namespaceMatcher.matches()) {
parseNamespaceLine(namespaceMatcher.group(2));