From 3e5c8f28c8f89681b7c7e71415ee30e1515fea72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0est=C3=A1k=20V=C3=ADt?= Date: Mon, 12 Feb 2018 18:01:53 +0100 Subject: [PATCH] Added support for Java update version parsing. --- .../owasp/dependencycheck/utils/DependencyVersionUtil.java | 2 +- .../dependencycheck/utils/DependencyVersionUtilTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java b/core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java index a0ca0aafc..e481211bb 100644 --- a/core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java +++ b/core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java @@ -36,7 +36,7 @@ public final class DependencyVersionUtil { /** * Regular expression to extract version numbers from file names. */ - private static final Pattern RX_VERSION = Pattern.compile("\\d+(\\.\\d{1,6})+(\\.?([_-](release|beta|alpha|\\d+)|[a-zA-Z_-]{1,3}\\d{0,8}))?"); + private static final Pattern RX_VERSION = Pattern.compile("\\d+(\\.\\d{1,6})+(\\.?([_-](release|beta|alpha|\\d+)|update_[0-9]{1,3}|[a-zA-Z_-]{1,3}\\d{0,8}))?"); // /** * Regular expression to extract a single version number without periods. * This is a last ditch effort just to check in case we are missing a diff --git a/core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java b/core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java index efda25535..60876faf1 100644 --- a/core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java +++ b/core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java @@ -88,4 +88,10 @@ public class DependencyVersionUtilTest extends BaseTest { assertEquals(expResult, result); } + + @Test + public void testParseJavaVersion() { + assertEquals(DependencyVersionUtil.parseVersion("1.8.0.45"), DependencyVersionUtil.parseVersion("1.8.0.update_45")); + assertEquals(DependencyVersionUtil.parseVersion("1.8.0.145"), DependencyVersionUtil.parseVersion("1.8.0.update_145")); + } }