Merge pull request #13051 from xuwei-k/version-number-TimeZone

bishabosha · web-flow · commit 6631730b5495 · 2021-07-12T11:24:19.000+02:00
set TimeZone for version number
diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala
@@ -3,7 +3,7 @@ import org.eclipse.jgit.lib.{Constants, ObjectId, Ref, Repository}
 import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}
 
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.{Date, TimeZone}
 
 object VersionUtil {
 
@@ -38,6 +38,7 @@ object VersionUtil {
   def gitHash: String = git.headCommitSha.substring(0, 7)
   def commitDate: String = {
     val format = new SimpleDateFormat("yyyyMMdd")
+    format.setTimeZone(TimeZone.getTimeZone("UTC"))
     format.format(git.headCommitDate)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import org.eclipse.jgit.lib.{Constants, ObjectId, Ref, Repository}`
`3`	`3`	`import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}`
`4`	`4`
`5`	`5`	`import java.text.SimpleDateFormat`
`6`		`-import java.util.Date`
	`6`	`+import java.util.{Date, TimeZone}`
`7`	`7`
`8`	`8`	`object VersionUtil {`
`9`	`9`
`@@ -38,6 +38,7 @@ object VersionUtil {`
`38`	`38`	`def gitHash: String = git.headCommitSha.substring(0, 7)`
`39`	`39`	`def commitDate: String = {`
`40`	`40`	`val format = new SimpleDateFormat("yyyyMMdd")`
	`41`	`+ format.setTimeZone(TimeZone.getTimeZone("UTC"))`
`41`	`42`	`format.format(git.headCommitDate)`
`42`	`43`	`}`
`43`	`44`	`}`