diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java index a69181d51..419cbd891 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java @@ -105,7 +105,7 @@ public class ReportGenerator { velocityEngine.init(); final EscapeTool enc = new EscapeTool(); - final DateTime dt = DateTime.now(); + final DateTime dt = new DateTime();//.now(); final DateTimeFormatter dateFormat = DateTimeFormat.forPattern("MMM d, yyyy 'at' HH:mm:ss z"); final DateTimeFormatter dateFormatXML = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java index 95b2a8dae..79775fbd0 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java @@ -47,12 +47,20 @@ public class EngineVersionCheckTest extends BaseTest { // } /** * Converts a date in the form of yyyy-MM-dd into the epoch milliseconds. + * * @param date a date in the format of yyyy-MM-dd * @return milliseconds */ private long dateToMilliseconds(String date) { - DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyy-MM-dd"); - return DateTime.parse(date, dtf).toInstant().getMillis(); + //removed for compatability with joda-time 1.6 + //DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyy-MM-dd"); + //return DateTime.parse(date, dtf).toInstant().getMillis(); + String[] dp = date.split("-"); + int y = Integer.parseInt(dp[0]); + int m = Integer.parseInt(dp[1]); + int d = Integer.parseInt(dp[2]); + DateTime dt = new DateTime(y, m, d, 0, 0, 0, 0); + return dt.toInstant().getMillis(); } /** diff --git a/pom.xml b/pom.xml index 703d0f88b..548d9c13b 100644 --- a/pom.xml +++ b/pom.xml @@ -586,10 +586,11 @@ Copyright (c) 2012 - Jeremy Long + joda-time joda-time - 2.9.7 + 1.6 com.google.code.findbugs