From: Paweł Chmielowski <pchmielowski@process-one.net>
Date: Tue, 15 Jan 2019 15:18:10 +0000 (+0100)
Subject: Use tag for xmpp dependency
X-Git-Tag: 19.02~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bd38eff1e2bd91839e5466444ccfce6911d6995;p=ejabberd

Use tag for xmpp dependency
---

diff --git a/mix.exs b/mix.exs
index 12cf49413..005731989 100644
--- a/mix.exs
+++ b/mix.exs
@@ -25,11 +25,12 @@ defmodule Ejabberd.Mixfile do
 
   def application do
     [mod: {:ejabberd_app, []},
-     applications: [:ssl, :os_mon, :lager, :mnesia, :inets, :p1_utils, :cache_tab,
-                    :fast_tls, :stringprep, :fast_xml, :xmpp,
-                    :stun, :fast_yaml, :esip, :jiffy, :p1_oauth2,
-                    :eimp, :base64url, :jose, :pkix]
-     ++ cond_apps()]
+     applications: [:ssl, :os_mon],
+     included_applications: [:lager, :mnesia, :inets, :p1_utils, :cache_tab,
+                             :fast_tls, :stringprep, :fast_xml, :xmpp,
+                             :stun, :fast_yaml, :esip, :jiffy, :p1_oauth2,
+                             :eimp, :base64url, :jose, :pkix]
+                         ++ cond_apps()]
   end
 
   defp if_function_exported(mod, fun, arity, okResult) do
diff --git a/rebar.config b/rebar.config
index 9811e9903..e8a569be1 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,7 +24,7 @@
         {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.26"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.14"}}},
         {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.34"}}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "91f4c40ebfc97cc39bff4d7900dc6fc34adaef6c"}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag: "1.3.0"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.17"}}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}},