github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-14 15:53:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added support for Java update version parsing.

Browse Source
This commit is contained in:
Šesták Vít
2018-02-12 18:01:53 +01:00
parent e854c37605
commit 3e5c8f28c8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java
View File

@@ -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

6
core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java
View File

@@ -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"));
}
}