Repository: incubator-eagle Updated Branches: refs/heads/master 725786cdb -> 3e09327bb
MINOR: change timeZone in Eagle to UTC change timeZone in Eagle to UTC Author: Zhao, Qingwen <qingwz...@apache.org> Closes #605 from qingwen220/minor. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/3e09327b Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/3e09327b Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/3e09327b Branch: refs/heads/master Commit: 3e09327bbd881b0d08d7943490c6f0bc705681c0 Parents: 725786c Author: Zhao, Qingwen <qingwz...@apache.org> Authored: Thu Nov 3 18:46:25 2016 +0800 Committer: Zhao, Qingwen <qingwz...@apache.org> Committed: Thu Nov 3 18:46:25 2016 +0800 ---------------------------------------------------------------------- .../eagle-alert/alert-common/pom.xml | 14 ++++++++++++++ .../java/org/apache/eagle/common/DateTimeUtil.java | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/3e09327b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml index f64e64c..7edd01b 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-common/pom.xml @@ -29,6 +29,20 @@ <groupId>org.apache.eagle</groupId> <artifactId>eagle-common</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.wso2.orbit.com.lmax</groupId> + <artifactId>disruptor</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.typesafe</groupId> http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/3e09327b/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java b/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java index c25a434..bd97aa8 100644 --- a/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java +++ b/eagle-core/eagle-common/src/main/java/org/apache/eagle/common/DateTimeUtil.java @@ -33,8 +33,8 @@ public class DateTimeUtil { public static final long ONEMINUTE = 1L * 60L * 1000L; public static final long ONEHOUR = 1L * 60L * 60L * 1000L; public static final long ONEDAY = 24L * 60L * 60L * 1000L; - //private static TimeZone CURRENT_TIME_ZONE = EagleConfigFactory.load().getTimeZone(); - private static TimeZone CURRENT_TIME_ZONE = TimeZone.getDefault(); + private static TimeZone CURRENT_TIME_ZONE = EagleConfigFactory.load().getTimeZone(); + //private static TimeZone CURRENT_TIME_ZONE = TimeZone.getDefault(); public static Date humanDateToDate(String date) throws ParseException { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
