From 8293e55c03ac95045dfb0322cd72ff8f3d22b3b8 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Mon, 12 Aug 2024 14:59:48 -0400 Subject: [PATCH] AsteriskVersion.java: Correct certified Asterisk version matching. Between the 18.9-cert4 and 18.9-cert5 versions of certified Asterisk, the version string format was switched from using a `/` separator to using a `-`, so we need to take that in to account. Certified Asterisk 20+ has always used the hyphen separator. Fixes #597 --- src/main/java/org/asteriskjava/AsteriskVersion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/asteriskjava/AsteriskVersion.java b/src/main/java/org/asteriskjava/AsteriskVersion.java index 18880b1f..0396eb94 100644 --- a/src/main/java/org/asteriskjava/AsteriskVersion.java +++ b/src/main/java/org/asteriskjava/AsteriskVersion.java @@ -40,8 +40,8 @@ public class AsteriskVersion implements Comparable, Serializabl private final String versionString; private final Pattern patterns[]; - private static final String VERSION_PATTERN_CERTIFIED_20 = "^\\s*Asterisk certified/(GIT-)?20[-. ].*"; - private static final String VERSION_PATTERN_CERTIFIED_18 = "^\\s*Asterisk certified/(GIT-)?18[-. ].*"; + private static final String VERSION_PATTERN_CERTIFIED_20 = "^\\s*Asterisk certified-(GIT-)?20[-. ].*"; + private static final String VERSION_PATTERN_CERTIFIED_18 = "^\\s*Asterisk certified[-/](GIT-)?18[-. ].*"; private static final String VERSION_PATTERN_CERTIFIED_16 = "^\\s*Asterisk certified/(GIT-)?16[-. ].*"; private static final String VERSION_PATTERN_CERTIFIED_13 = "^\\s*Asterisk certified/((SVN-branch|GIT)-)?13[-. ].*";