From bae811c71a0bd4484c6b69ad0db9afdbeca373bd Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Wed, 22 Nov 2023 15:40:44 +0000 Subject: Allow semantic versioning in all templates in models Issue-ID: POLICY-4885 Change-Id: I036c4ddc41bb817dc28a4b28a842d3139991bd10 Signed-off-by: FrancescoFioraEst --- models-base/src/main/java/org/onap/policy/models/base/PfKey.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'models-base/src/main/java/org/onap') diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfKey.java b/models-base/src/main/java/org/onap/policy/models/base/PfKey.java index 8ff171ee3..1ce5102b8 100644 --- a/models-base/src/main/java/org/onap/policy/models/base/PfKey.java +++ b/models-base/src/main/java/org/onap/policy/models/base/PfKey.java @@ -39,7 +39,9 @@ public abstract class PfKey extends PfConcept { public static final String NAME_REGEXP = "^[A-Za-z0-9\\-_\\.]+$"; /** Regular expression to specify the structure of key versions. */ - public static final String VERSION_REGEXP = "^(\\d+.){2}\\d+$"; + public static final String VERSION_REGEXP + = "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)" + + "(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"; /** Regular expression to specify the structure of key IDs. */ public static final String KEY_ID_REGEXP = "^[A-Za-z0-9\\-_\\.]+:(\\d+.){2}\\d+$"; -- cgit 1.2.3-korg