You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2019/06/05 11:08:08 UTC
[ignite] 05/31: GG-12665 Use UTC timezone in build date.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch gg-19225
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 629c37acc6f9ee250d6c02708405859c40129b5a
Author: ibessonov <be...@gmail.com>
AuthorDate: Thu May 30 10:06:11 2019 +0300
GG-12665 Use UTC timezone in build date.
(cherry picked from commit 519dfd3142f6e7667ec33c53000da57744054eec)
---
.../java/org/apache/ignite/internal/IgniteVersionUtils.java | 10 +++++++++-
.../main/java/org/apache/ignite/lang/IgniteProductVersion.java | 4 ++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
index c950eac..e015686 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteVersionUtils.java
@@ -18,6 +18,7 @@ package org.apache.ignite.internal;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.TimeZone;
import org.apache.ignite.lang.IgniteProductVersion;
/**
@@ -30,6 +31,9 @@ public class IgniteVersionUtils {
/** Ignite version. */
public static final IgniteProductVersion VER;
+ /** UTC build date formatter. */
+ public static final SimpleDateFormat BUILD_TSTAMP_DATE_FORMATTER;
+
/** Formatted build date. */
public static final String BUILD_TSTAMP_STR;
@@ -66,7 +70,11 @@ public class IgniteVersionUtils {
BUILD_TSTAMP = !BUILD_TSTAMP_FROM_PROPERTY.isEmpty() && Long.parseLong(BUILD_TSTAMP_FROM_PROPERTY) != 0
? Long.parseLong(BUILD_TSTAMP_FROM_PROPERTY) : System.currentTimeMillis() / 1000;
- BUILD_TSTAMP_STR = new SimpleDateFormat("yyyyMMdd").format(new Date(BUILD_TSTAMP * 1000));
+ BUILD_TSTAMP_DATE_FORMATTER = new SimpleDateFormat("yyyyMMdd");
+
+ BUILD_TSTAMP_DATE_FORMATTER.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+ BUILD_TSTAMP_STR = BUILD_TSTAMP_DATE_FORMATTER.format(new Date(BUILD_TSTAMP * 1000));
COPYRIGHT = BUILD_TSTAMP_STR.substring(0, 4) + " Copyright(C) Apache Software Foundation";
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
index f50647a..cc27550 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
@@ -20,11 +20,11 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.IgniteVersionUtils;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.NotNull;
@@ -258,7 +258,7 @@ public class IgniteProductVersion implements Comparable<IgniteProductVersion>, E
/** {@inheritDoc} */
@Override public String toString() {
- String revTsStr = new SimpleDateFormat("yyyyMMdd").format(new Date(revTs * 1000));
+ String revTsStr = IgniteVersionUtils.BUILD_TSTAMP_DATE_FORMATTER.format(new Date(revTs * 1000));
String hash = U.byteArray2HexString(revHash).toLowerCase();