From 14dfe034265fb8bc13d2c2b9935f4cf15394ded4 Mon Sep 17 00:00:00 2001
From: spring2maz <spring2maz@gmail.com>
Date: Fri, 30 Nov 2018 10:22:18 +0100
Subject: [PATCH] Use git tag for app vsn

---
 Makefile         | 1 -
 erlang.mk        | 2 +-
 src/emqx.app.src | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e815e0756..695cc6871 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 
 PROJECT = emqx
 PROJECT_DESCRIPTION = EMQ X Broker
-PROJECT_VERSION = 3.0.0
 
 DEPS = jsx gproc gen_rpc ekka esockd cowboy clique
 
diff --git a/erlang.mk b/erlang.mk
index f38d22653..c5d4b4f7f 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -1186,7 +1186,7 @@ else
 	fi
 	$(appsrc_verbose) cat src/$(PROJECT).app.src \
 		| sed "s/{[[:space:]]*modules[[:space:]]*,[[:space:]]*\[\]}/{modules, \[$(call comma_list,$(MODULES))\]}/" \
-		| sed "s/{id,[[:space:]]*\"git\"}/{id, \"$(subst /,\/,$(GITDESCRIBE))\"}/" \
+		| sed "s/{vsn,[[:space:]]*\"git\"}/{vsn, \"$(subst /,\/,$(GITDESCRIBE))\"}/" \
 		> ebin/$(PROJECT).app
 endif
 
diff --git a/src/emqx.app.src b/src/emqx.app.src
index 1bca0118b..ce643634e 100644
--- a/src/emqx.app.src
+++ b/src/emqx.app.src
@@ -1,6 +1,6 @@
 {application,emqx,
              [{description,"EMQ X Broker"},
-              {vsn,"3.0.0"},
+              {vsn,"git"},
               {modules,[]},
               {registered,[emqx_sup]},
               {applications,[kernel,stdlib,jsx,gproc,gen_rpc,esockd,