From b603d544b251a0d89ce68ffbb7201b922b42de51 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Sun, 27 Feb 2022 14:42:13 +0100
Subject: [PATCH 1/2] refactor(emqx_gateway_schema): use remote ref instead of
 redefine

the ssl_client_opts struct
---
 apps/emqx_gateway/src/emqx_gateway_schema.erl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/emqx_gateway/src/emqx_gateway_schema.erl b/apps/emqx_gateway/src/emqx_gateway_schema.erl
index 822118e2a..526188c0c 100644
--- a/apps/emqx_gateway/src/emqx_gateway_schema.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_schema.erl
@@ -294,7 +294,7 @@ fields(exproto_grpc_server) ->
 fields(exproto_grpc_handler) ->
     [ {address, sc(binary(), #{required => true})}
     , {ssl,
-       sc(ref(ssl_client_opts),
+       sc(ref(emqx_schema, ssl_client_opts),
           #{ required => {false, recursively}
            })}
     ];
@@ -307,9 +307,6 @@ fields(ssl_server_opts) ->
        , ciphers => tls_all_available
        }, true);
 
-fields(ssl_client_opts) ->
-    emqx_schema:client_ssl_opts_schema(#{});
-
 fields(clientinfo_override) ->
     [ {username, sc(binary())}
     , {password, sc(binary())}

From edb16f902e84c0dc9e9e4d29ff2c2fc000aa3462 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Sun, 27 Feb 2022 14:43:01 +0100
Subject: [PATCH 2/2] chore: pin hocon 0.16.0 for 'mappings' in generated
 config doc

---
 apps/emqx/rebar.config            | 2 +-
 apps/emqx_prometheus/rebar.config | 2 +-
 mix.exs                           | 2 +-
 rebar.config                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index cf6cc7a16..2d62d1043 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -19,7 +19,7 @@
     , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.1"}}}
     , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.1"}}}
     , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.0"}}}
-    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.25.0"}}}
+    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.26.0"}}}
     , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}
     , {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}}
     , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.18.0"}}}
diff --git a/apps/emqx_prometheus/rebar.config b/apps/emqx_prometheus/rebar.config
index 96afa679a..aaee67886 100644
--- a/apps/emqx_prometheus/rebar.config
+++ b/apps/emqx_prometheus/rebar.config
@@ -4,7 +4,7 @@
  [ {emqx, {path, "../emqx"}},
    %% FIXME: tag this as v3.1.3
    {prometheus, {git, "https://github.com/deadtrickster/prometheus.erl", {tag, "v4.8.1"}}},
-   {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.25.0"}}}
+   {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.26.0"}}}
  ]}.
 
 {edoc_opts, [{preprocess, true}]}.
diff --git a/mix.exs b/mix.exs
index aae205eec..16066f3f5 100644
--- a/mix.exs
+++ b/mix.exs
@@ -68,7 +68,7 @@ defmodule EMQXUmbrella.MixProject do
       # in conflict by emqtt and hocon
       {:getopt, "1.0.2", override: true},
       {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "0.18.0", override: true},
-      {:hocon, github: "emqx/hocon", tag: "0.25.0", override: true},
+      {:hocon, github: "emqx/hocon", tag: "0.26.0", override: true},
       {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.4.1", override: true},
       {:esasl, github: "emqx/esasl", tag: "0.2.0"},
       {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"},
diff --git a/rebar.config b/rebar.config
index 109a4b0df..20345311c 100644
--- a/rebar.config
+++ b/rebar.config
@@ -66,7 +66,7 @@
     , {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.2"}}}
     , {getopt, "1.0.2"}
     , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.18.0"}}}
-    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.25.0"}}}
+    , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.26.0"}}}
     , {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.4.1"}}}
     , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}
     , {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}