Switch a few version to hex.pm version

3 files changed, 41 insertions, 24 deletions

diff --git a/mix.exs b/mix.exs
index cfe78d204..52d40d73e 100644
--- a/mix.exs
+++ b/mix.exs
@@ -38,25 +38,25 @@ defmodule Ejabberd.Mixfile do
   end
 
   defp deps do
-    [{:lager, git: "https://github.com/basho/lager", tag: "3.0.2"},
-     {:p1_utils, git: "https://github.com/processone/p1_utils", tag: "1.0.3", override: true},
-     {:cache_tab, git: "https://github.com/processone/cache_tab", tag: "1.0.2"},
+    [{:lager, "~> 3.0"},
+     {:p1_utils, "~> 1.0", override: true},
+     {:cache_tab, "~> 1.0"},
+     {:stringprep, "~> 1.0"},
+     {:fast_yaml, "~> 1.0"},
      {:p1_tls, git: "https://github.com/processone/tls", tag: "1.0.0"},
-     {:stringprep, git: "https://github.com/processone/stringprep", tag: "1.0.2"},
      {:p1_xml, git: "https://github.com/processone/xml", tag: "1.1.2"},
      {:p1_stun, git: "https://github.com/processone/stun", tag: "0.9.1"},
      {:esip, git: "https://github.com/processone/p1_sip", tag: "1.0.1"},
-     {:p1_yaml, git: "https://github.com/processone/p1_yaml", tag: "1.0.1"},
-     {:jiffy, git: "https://github.com/davisp/jiffy", tag: "0.14.5"},
-     {:oauth2, git: "https://github.com/kivra/oauth2", ref: "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"},
-     {:xmlrpc, git: "https://github.com/rds13/xmlrpc.git", tag: "1.15"},
+     {:jiffy, "~> 0.14.7"},
+     {:p1_oauth2, "~> 0.6.1"},
+     {:p1_xmlrpc, "~> 1.15"},
      {:p1_mysql, git: "https://github.com/processone/mysql", tag: "1.0.0"},
      {:p1_pgsql, git: "https://github.com/processone/pgsql", tag: "1.0.0"},
-     {:sqlite3, git: "https://github.com/alexeyr/erlang-sqlite3", ref: "cbc3505f7a131254265d3ef56191b2581b8cc172"},
+     {:sqlite3, "~> 1.1"},
      {:p1_zlib, git: "https://github.com/processone/zlib", tag: "1.0.0"},
      {:p1_iconv, git: "https://github.com/processone/eiconv", tag: "0.9.0"},
-     {:eredis, git: "https://github.com/wooga/eredis", tag: "v1.0.8"},
-     {:exrm, "0.19.9"}]
+     {:eredis, "~> 1.0"},
+     {:exrm, "~> 1.0.0-rc7", only: :dev}]
   end
 
   defp package do
diff --git a/mix.lock b/mix.lock
index 5f4955115..4f88c5f22 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,8 +1,25 @@
-%{"bbmustache": {:hex, :bbmustache, "1.0.4"},
-  "erlware_commons": {:hex, :erlware_commons, "0.18.0"},
+%{"bbmustache": {:hex, :bbmustache, "1.0.3"},
+  "cache_tab": {:hex, :cache_tab, "1.0.2"},
+  "eredis": {:hex, :eredis, "1.0.8"},
+  "erlware_commons": {:hex, :erlware_commons, "0.15.0"},
+  "esip": {:git, "https://github.com/processone/p1_sip", "3bcccd4dfe705cb90f205887f749b1c5195fcad1", [tag: "1.0.1"]},
+  "exrm": {:hex, :exrm, "1.0.0-rc7"},
+  "fast_yaml": {:hex, :fast_yaml, "1.0.2"},
   "getopt": {:hex, :getopt, "0.8.2"},
-  "providers": {:hex, :providers, "1.6.0"},
-  "cf": {:hex, :cf, "0.2.1"},
-  "relx": {:hex, :relx, "3.11.0"},
-  "conform": {:hex, :conform, "0.17.0"},
-  "neotoma": {:hex, :neotoma, "1.7.3"}}
+  "goldrush": {:hex, :goldrush, "0.1.7"},
+  "jiffy": {:hex, :jiffy, "0.14.7"},
+  "lager": {:hex, :lager, "3.0.2"},
+  "p1_iconv": {:git, "https://github.com/processone/eiconv", "9751f86baa5a60ed1420490793e7514a0757462a", [tag: "0.9.0"]},
+  "p1_mysql": {:git, "https://github.com/processone/mysql", "064948ad3c77e582d85cbc09ccd11016ae97de0e", [tag: "1.0.0"]},
+  "p1_oauth2": {:hex, :p1_oauth2, "0.6.1"},
+  "p1_pgsql": {:git, "https://github.com/processone/pgsql", "248b6903cad82c748dc7f5be75e014dd8d47a3d1", [tag: "1.0.0"]},
+  "p1_stun": {:git, "https://github.com/processone/stun", "c3dc4d9ae6dbab311cc3ed1c116be71d17c6c771", [tag: "0.9.1"]},
+  "p1_tls": {:git, "https://github.com/processone/tls", "f19e1f701e0a3980ffc70b3917c4aa85e68d8520", [tag: "1.0.0"]},
+  "p1_utils": {:hex, :p1_utils, "1.0.3"},
+  "p1_xml": {:git, "https://github.com/processone/xml", "79c6d54e56bf991f1ec70ceb5e255afcb8dbf53f", [tag: "1.1.2"]},
+  "p1_xmlrpc": {:hex, :p1_xmlrpc, "1.15.1"},
+  "p1_zlib": {:git, "https://github.com/processone/zlib", "e1f928e61553cf85638eaac7d024c8f68ce0ff36", [tag: "1.0.0"]},
+  "providers": {:hex, :providers, "1.4.1"},
+  "relx": {:hex, :relx, "3.5.0"},
+  "sqlite3": {:hex, :sqlite3, "1.1.5"},
+  "stringprep": {:hex, :stringprep, "1.0.2"}}
diff --git a/rebar.config b/rebar.config
index ffc4885eb..b0220d19e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -15,10 +15,10 @@
         {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.2"}}},
         {p1_stun, ".*", {git, "https://github.com/processone/stun", {tag, "0.9.1"}}},
         {esip, ".*", {git, "https://github.com/processone/p1_sip", "1.0.1"}},
-        {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", {tag, "1.0.1"}}},
-        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.5"}}},
-        {oauth2, ".*", {git, "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"}},
-        {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc", {tag, "1.15"}}},
+        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.2"}}},
+        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}},
+        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2.git", {tag, "0.6.1"}}},
+        {p1_xmlrpc, ".*", {git, "https://github.com/processone/p1_xmlrpc", {tag, "1.15.1"}}},
 	{luerl, ".*", {git, "https://github.com/rvirding/luerl", "9524d0309a88b7c62ae93da0b632b185de3ba9db"}},
         {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/mysql", {tag, "1.0.0"}}}},
         {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", {tag, "1.0.0"}}}},
@@ -42,7 +42,7 @@
                   esip,
 		  luerl,
                   p1_stun,
-                  p1_yaml,
+                  fast_yaml,
                   p1_utils,
                   p1_mysql,
                   p1_pgsql,
@@ -95,7 +95,7 @@
 
 {post_hook_configure, [{"p1_tls", []},
                        {"stringprep", []},
-                       {"p1_yaml", []},
+                       {"fast_yaml", []},
                        {"esip", []},
                        {"p1_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
                        {if_var_true, pam, {"p1_pam", []}},