From a13c9617445423cffc5375d63bb362bbef332256 Mon Sep 17 00:00:00 2001
From: Serge Tupchii <serge.tupchii@protonmail.com>
Date: Fri, 7 Jun 2024 16:32:54 +0300
Subject: [PATCH 1/3] fix(emqx_authn_jwks): add a user-agent header to jwks
 HTTP request

---
 apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src      | 2 +-
 apps/emqx_auth_jwt/src/emqx_authn_jwks_client.erl | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src b/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
index 7e313881e..eb9c9b9bb 100644
--- a/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
+++ b/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_auth_jwt, [
     {description, "EMQX JWT Authentication and Authorization"},
-    {vsn, "0.2.0"},
+    {vsn, "0.2.1"},
     {registered, []},
     {mod, {emqx_auth_jwt_app, []}},
     {applications, [
diff --git a/apps/emqx_auth_jwt/src/emqx_authn_jwks_client.erl b/apps/emqx_auth_jwt/src/emqx_authn_jwks_client.erl
index dc03cafef..578d7198a 100644
--- a/apps/emqx_auth_jwt/src/emqx_authn_jwks_client.erl
+++ b/apps/emqx_auth_jwt/src/emqx_authn_jwks_client.erl
@@ -159,7 +159,10 @@ refresh_jwks(
         case
             httpc:request(
                 get,
-                {Endpoint, [{"Accept", "application/json"}]},
+                {Endpoint, [
+                    {"Accept", "application/json"},
+                    {"User-Agent", "EMQX/" ++ emqx_release:version_with_prefix()}
+                ]},
                 HTTPOpts,
                 [{body_format, binary}, {sync, false}, {receiver, self()}]
             )

From 9ede0d7916659dc0b0aec9cc973d6664b1a9cbf4 Mon Sep 17 00:00:00 2001
From: Serge Tupchii <serge.tupchii@protonmail.com>
Date: Fri, 7 Jun 2024 17:39:24 +0300
Subject: [PATCH 2/3] chore: bump EMQX_RELEASE_EE amd emqx app vsn

---
 apps/emqx/include/emqx_release.hrl | 2 +-
 apps/emqx/src/emqx.app.src         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl
index 270acf07a..3b54033ba 100644
--- a/apps/emqx/include/emqx_release.hrl
+++ b/apps/emqx/include/emqx_release.hrl
@@ -35,4 +35,4 @@
 -define(EMQX_RELEASE_CE, "5.6.1").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.6.1").
+-define(EMQX_RELEASE_EE, "5.6.1-patch.2").
diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src
index 462b7e74b..ae3bb2f4e 100644
--- a/apps/emqx/src/emqx.app.src
+++ b/apps/emqx/src/emqx.app.src
@@ -2,7 +2,7 @@
 {application, emqx, [
     {id, "emqx"},
     {description, "EMQX Core"},
-    {vsn, "5.2.1"},
+    {vsn, "5.2.2"},
     {modules, []},
     {registered, []},
     {applications, [

From b6d7d8b5cd4ea5f1b201ad77aaaf9fe6fd9cb4d3 Mon Sep 17 00:00:00 2001
From: Serge Tupchii <serge.tupchii@protonmail.com>
Date: Fri, 7 Jun 2024 18:15:08 +0300
Subject: [PATCH 3/3] fix(mix.exs): fix rebar/mix mimerl conflict

---
 mix.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index 87fd4d62e..7c8ec6f4a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -100,7 +100,8 @@ defmodule EMQXUmbrella.MixProject do
       {:rfc3339, github: "emqx/rfc3339", tag: "0.2.3", override: true},
       {:bcrypt, github: "emqx/erlang-bcrypt", tag: "0.6.2", override: true},
       {:uuid, github: "okeuday/uuid", tag: "v2.0.6", override: true},
-      {:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true}
+      {:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true},
+      {:mimerl, "1.2.0", override: true}
     ] ++
       emqx_apps(profile_info, version) ++
       enterprise_deps(profile_info) ++ jq_dep() ++ quicer_dep()