refactor(apps): Merge emqx_libs back to emqx

And move emqx app back to root level

After realising the challenges of developing plugins in standalone
rebar projects. it is perhaps more smooth to keep using emqx as
a rebar dependency

apps/emqx/rebar.config

@@ -1 +0,0 @@
-{deps, []}.

apps/emqx_auth_http/src/emqx_acl_http.erl

@@ -18,8 +18,8 @@
 
 -include("emqx_auth_http.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[ACL http]").
 

apps/emqx_auth_http/src/emqx_auth_http.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_http_sup]},
-  {applications, [kernel,stdlib,emqx_libs]},
+  {applications, [kernel,stdlib,emqx]},
   {mod, {emqx_auth_http_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_auth_http/src/emqx_auth_http.erl

@@ -18,9 +18,9 @@
 
 -include("emqx_auth_http.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
--include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
+-include_lib("emqx/include/types.hrl").
 
 -logger_header("[Auth http]").
 

apps/emqx_auth_http/test/emqx_auth_http_SUITE.erl

@@ -17,7 +17,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 

apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_jwt_sup]},
-  {applications, [kernel,stdlib,jwerl,emqx_libs]},
+  {applications, [kernel,stdlib,jwerl,emqx]},
   {mod, {emqx_auth_jwt_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_auth_jwt/src/emqx_auth_jwt.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_auth_jwt).
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[JWT]").
 

apps/emqx_auth_jwt/test/emqx_auth_jwt_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(nowarn_export_all).
 -compile(export_all).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx_auth_ldap/src/emqx_acl_ldap.erl

@@ -18,9 +18,9 @@
 
 -include("emqx_auth_ldap.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 -include_lib("eldap/include/eldap.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -export([ register_metrics/0
         , check_acl/5

apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src

@@ -2,8 +2,8 @@
  [{description, "EMQ X Authentication/ACL with LDAP"},
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
-  {registered, [emqx_auth_ldap_sup,emqx_libs]},
-  {applications, [kernel,stdlib,eldap2,ecpool,emqx_passwd,emqx_libs]},
+  {registered, [emqx_auth_ldap_sup]},
+  {applications, [kernel,stdlib,eldap2,ecpool,emqx_passwd]},
   {mod, {emqx_auth_ldap_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_auth_ldap/src/emqx_auth_ldap.erl

@@ -18,9 +18,9 @@
 
 -include("emqx_auth_ldap.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 -include_lib("eldap/include/eldap.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -import(proplists, [get_value/2]).
 

apps/emqx_auth_ldap/src/emqx_auth_ldap_cli.erl

@@ -20,8 +20,8 @@
 
 -include("emqx_auth_ldap.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 %% ecpool callback
 -export([connect/1]).

apps/emqx_auth_ldap/test/emqx_auth_ldap_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx_auth_ldap/test/emqx_auth_ldap_bind_as_user_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(no_warning_export).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx_auth_mnesia/src/emqx_acl_mnesia_cli.erl

@@ -17,7 +17,7 @@
 -module(emqx_acl_mnesia_cli).
 
 -include("emqx_auth_mnesia.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 -define(TABLE, emqx_acl).
 

apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually
   {modules, []},
   {registered, []},
-  {applications, [kernel,stdlib,mnesia]},
+  {applications, [kernel,stdlib,mnesia,emqx]},
   {mod, {emqx_auth_mnesia_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_auth_mnesia/src/emqx_auth_mnesia.erl

@@ -18,9 +18,9 @@
 
 -include("emqx_auth_mnesia.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
--include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
+-include_lib("emqx/include/types.hrl").
 
 -include_lib("stdlib/include/ms_transform.hrl").
 

apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl

@@ -17,7 +17,7 @@
 -module(emqx_auth_mnesia_cli).
 
 -include("emqx_auth_mnesia.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 -define(TABLE, emqx_user).
 %% Auth APIs

apps/emqx_auth_mongo/src/emqx_acl_mongo.erl

@@ -17,8 +17,8 @@
 -module(emqx_acl_mongo).
 
 -include("emqx_auth_mongo.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 %% ACL callbacks
 -export([ register_metrics/0

apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_mongo_sup]},
-  {applications, [kernel,stdlib,mongodb,ecpool,emqx_passwd,emqx_libs]},
+  {applications, [kernel,stdlib,mongodb,ecpool,emqx_passwd]},
   {mod, {emqx_auth_mongo_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_auth_mongo/src/emqx_auth_mongo.erl

@@ -19,9 +19,9 @@
 -behaviour(ecpool_worker).
 
 -include("emqx_auth_mongo.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
--include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
+-include_lib("emqx/include/types.hrl").
 
 -export([ register_metrics/0
         , check/3

apps/emqx_auth_mongo/test/emqx_auth_mongo_SUITE.erl

@@ -19,7 +19,7 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
 

apps/emqx_auth_mysql/src/emqx_acl_mysql.erl

@@ -18,8 +18,8 @@
 
 -include("emqx_auth_mysql.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 %% ACL Callbacks
 -export([ register_metrics/0

apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_mysql_sup]},
-  {applications, [kernel,stdlib,mysql,ecpool,emqx_passwd,emqx_libs]},
+  {applications, [kernel,stdlib,mysql,ecpool,emqx_passwd]},
   {mod, {emqx_auth_mysql_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_auth_mysql/src/emqx_auth_mysql.erl

@@ -18,9 +18,9 @@
 
 -include("emqx_auth_mysql.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
--include_lib("emqx_libs/include/types.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
+-include_lib("emqx/include/types.hrl").
 
 -export([ register_metrics/0
         , check/3

apps/emqx_auth_mysql/src/emqx_auth_mysql_cli.erl

@@ -19,8 +19,8 @@
 -behaviour(ecpool_worker).
 
 -include("emqx_auth_mysql.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -export([ parse_query/1
         , connect/1

apps/emqx_auth_mysql/test/emqx_auth_mysql_SUITE.erl

@@ -21,7 +21,7 @@
 
 -define(APP, emqx_auth_mysql).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx_auth_pgsql/src/emqx_acl_pgsql.erl

@@ -17,8 +17,8 @@
 -module(emqx_acl_pgsql).
 
 -include("emqx_auth_pgsql.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 %% ACL callbacks
 -export([ register_metrics/0

apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_pgsql_sup]},
-  {applications, [kernel,stdlib,epgsql,ecpool,emqx_passwd,emqx_libs]},
+  {applications, [kernel,stdlib,epgsql,ecpool,emqx_passwd]},
   {mod, {emqx_auth_pgsql_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_auth_pgsql/src/emqx_auth_pgsql.erl

@@ -18,8 +18,8 @@
 
 -include("emqx_auth_pgsql.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -export([ register_metrics/0
         , check/3

apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl

@@ -20,8 +20,8 @@
 
 -include("emqx_auth_pgsql.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -export([connect/1]).
 -export([parse_query/2]).

apps/emqx_auth_pgsql/test/emqx_auth_pgsql_SUITE.erl

@@ -22,7 +22,7 @@
 
 -define(APP, emqx_auth_pgsql).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -include_lib("eunit/include/eunit.hrl").
 

apps/emqx_auth_redis/src/emqx_acl_redis.erl

@@ -18,8 +18,8 @@
 
 -include("emqx_auth_redis.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -export([ register_metrics/0
         , check_acl/5

apps/emqx_auth_redis/src/emqx_auth_redis.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_redis_sup]},
-  {applications, [kernel,stdlib,eredis,eredis_cluster,ecpool,emqx_passwd,emqx_libs]},
+  {applications, [kernel,stdlib,eredis,eredis_cluster,ecpool,emqx_passwd]},
   {mod, {emqx_auth_redis_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_auth_redis/src/emqx_auth_redis.erl

@@ -18,8 +18,8 @@
 
 -include("emqx_auth_redis.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -export([ register_metrics/0
         , check/3

apps/emqx_auth_redis/src/emqx_auth_redis_cli.erl

@@ -20,8 +20,8 @@
 
 -include("emqx_auth_redis.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -import(proplists, [get_value/2, get_value/3]).
 

apps/emqx_auth_redis/test/emqx_auth_redis_SUITE.erl

@@ -18,7 +18,7 @@
 
 -compile(export_all).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx_bridge_mqtt/src/emqx_bridge_connect.erl

@@ -30,7 +30,7 @@
 -type(topic() :: emqx_topic:topic()).
 -type(qos() :: emqx_mqtt_types:qos()).
 
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[Bridge Connect]").
 

apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
-  {applications, [kernel,stdlib,replayq,emqtt,emqx_libs]},
+  {applications, [kernel,stdlib,replayq,emqtt,emqx]},
   {mod, {emqx_bridge_mqtt_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.erl

@@ -31,8 +31,8 @@
         , ensure_unsubscribed/2
         ]).
 
--include_lib("emqx_libs/include/logger.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/logger.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -define(ACK_REF(ClientPid, PktId), {ClientPid, PktId}).
 

apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl

@@ -18,8 +18,8 @@
 
 -module(emqx_bridge_mqtt_actions).
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -import(emqx_rule_utils, [str/1]).
 

apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_sup.erl

@@ -18,7 +18,7 @@
 -behaviour(supervisor).
 
 -include("emqx_bridge_mqtt.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[Bridge]").
 

apps/emqx_bridge_mqtt/src/emqx_bridge_msg.erl

@@ -27,7 +27,7 @@
 
 -export_type([msg/0]).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -include_lib("emqx_bridge_mqtt/include/emqx_bridge_mqtt.hrl").
 -include_lib("emqtt/include/emqtt.hrl").

apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl

@@ -110,8 +110,8 @@
 -type ack_ref() :: term().
 -type topic() :: emqx_topic:topic().
 
--include_lib("emqx_libs/include/logger.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/logger.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -logger_header("[Bridge]").
 

apps/emqx_bridge_mqtt/test/emqx_bridge_mqtt_tests.erl

@@ -17,7 +17,7 @@
 -module(emqx_bridge_mqtt_tests).
 
 -include_lib("eunit/include/eunit.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 send_and_ack_test() ->
     %% delegate from gen_rpc to rpc for unit test

apps/emqx_bridge_mqtt/test/emqx_bridge_worker_SUITE.erl

@@ -25,8 +25,8 @@
 
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -define(wait(For, Timeout), emqx_ct_helpers:wait_for(?FUNCTION_NAME, ?LINE, fun() -> For end, Timeout)).
 

apps/emqx_bridge_mqtt/test/emqx_bridge_worker_tests.erl

@@ -18,8 +18,8 @@
 -behaviour(emqx_bridge_connect).
 
 -include_lib("eunit/include/eunit.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -define(BRIDGE_NAME, test).
 -define(BRIDGE_REG_NAME, emqx_bridge_worker_test).

apps/emqx_coap/src/emqx_coap.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
-  {applications, [kernel,stdlib,gen_coap,emqx_libs]},
+  {applications, [kernel,stdlib,gen_coap,emqx]},
   {mod, {emqx_coap_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl

@@ -20,10 +20,10 @@
 
 -include("emqx_coap.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
--include_lib("emqx_libs/include/logger.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/logger.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -logger_header("[CoAP-Adpter]").
 

apps/emqx_coap/src/emqx_coap_ps_resource.erl

@@ -20,9 +20,9 @@
 
 -include("emqx_coap.hrl").
 -include_lib("gen_coap/include/coap.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[CoAP-PS-RES]").
 

apps/emqx_coap/src/emqx_coap_ps_topics.erl

@@ -19,9 +19,9 @@
 -behaviour(gen_server).
 
 -include("emqx_coap.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[CoAP-PS-TOPICS]").
 

apps/emqx_coap/src/emqx_coap_registry.erl

@@ -19,7 +19,7 @@
 -author("Feng Lee <feng@emqx.io>").
 
 -include("emqx_coap.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[CoAP-Registry]").
 

apps/emqx_coap/src/emqx_coap_resource.erl

@@ -19,9 +19,9 @@
 -behaviour(coap_resource).
 
 -include("emqx_coap.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 -include_lib("gen_coap/include/coap.hrl").
 
 -logger_header("[CoAP-RES]").

apps/emqx_coap/test/emqx_coap_SUITE.erl

@@ -21,7 +21,7 @@
 
 -include_lib("gen_coap/include/coap.hrl").
 -include_lib("eunit/include/eunit.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -define(LOGT(Format, Args), ct:pal(Format, Args)).
 

apps/emqx_coap/test/emqx_coap_ps_SUITE.erl

@@ -21,7 +21,7 @@
 
 -include_lib("gen_coap/include/coap.hrl").
 -include_lib("eunit/include/eunit.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -define(LOGT(Format, Args), ct:pal(Format, Args)).
 

apps/emqx_dashboard/src/emqx_dashboard.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_dashboard_sup]},
-  {applications, [kernel,stdlib,mnesia,minirest,emqx_libs]},
+  {applications, [kernel,stdlib,mnesia,minirest,emqx]},
   {mod, {emqx_dashboard_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_dashboard/src/emqx_dashboard.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_dashboard).
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -import(proplists, [get_value/3]).
 

apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl

@@ -26,7 +26,7 @@
 
 -include_lib("eunit/include/eunit.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -define(CONTENT_TYPE, "application/x-www-form-urlencoded").
 

apps/emqx_exhook/src/emqx_exhook.app.src

@@ -4,7 +4,7 @@
   {modules, []},
   {registered, []},
   {mod, {emqx_exhook_app, []}},
-  {applications, [kernel,stdlib,emqx_libs,grpcbox]},
+  {applications, [kernel,stdlib,emqx]},
   {env,[]},
   {licenses, ["Apache-2.0"]},
   {maintainers, ["EMQ X Team <contact@emqx.io>"]},

apps/emqx_exhook/src/emqx_exhook.erl

@@ -17,7 +17,7 @@
 -module(emqx_exhook).
 
 -include("emqx_exhook.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[ExHook]").
 

apps/emqx_exhook/src/emqx_exhook_handler.erl

@@ -17,8 +17,8 @@
 -module(emqx_exhook_handler).
 
 -include("emqx_exhook.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[ExHook]").
 

apps/emqx_exhook/src/emqx_exhook_server.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_exhook_server).
 
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[ExHook Svr]").
 

apps/emqx_exproto/src/emqx_exproto.app.src

@@ -4,7 +4,7 @@
   {modules, []},
   {registered, []},
   {mod, {emqx_exproto_app, []}},
-  {applications, [kernel,stdlib,grpcbox]},
+  {applications, [kernel,stdlib]},
   {env,[]},
   {licenses, ["Apache-2.0"]},
   {maintainers, ["EMQ X Team <contact@emqx.io>"]},

apps/emqx_exproto/src/emqx_exproto_channel.erl

@@ -17,10 +17,10 @@
 -module(emqx_exproto_channel).
 
 -include("emqx_exproto.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
--include_lib("emqx_libs/include/types.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/types.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[ExProto Channel]").
 

apps/emqx_exproto/src/emqx_exproto_conn.erl

@@ -17,8 +17,8 @@
 %% TCP/TLS/UDP/DTLS Connection
 -module(emqx_exproto_conn).
 
--include_lib("emqx_libs/include/types.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/types.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[ExProto Conn]").
 

apps/emqx_exproto/src/emqx_exproto_gcli.erl

@@ -19,7 +19,7 @@
 
 -behaviour(gen_server).
 
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[ExProto gClient]").
 

apps/emqx_exproto/src/emqx_exproto_gsvr.erl

@@ -20,7 +20,7 @@
 -behavior(emqx_exproto_v_1_connection_adapter_bhvr).
 
 -include("emqx_exproto.hrl").
--include_lib("emqx_libs/include/logger.hrl").
+-include_lib("emqx/include/logger.hrl").
 
 -logger_header("[ExProto gServer]").
 

apps/emqx_exproto/test/emqx_exproto_SUITE.erl

@@ -31,8 +31,8 @@
         , frame_disconnect/0
         ]).
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -define(TCPOPTS, [binary, {active, false}]).
 -define(DTLSOPTS, [binary, {active, false}, {protocol, dtls}]).

apps/emqx_libs/.gitignore

@@ -1,19 +0,0 @@
-.rebar3
-_*
-.eunit
-*.o
-*.beam
-*.plt
-*.swp
-*.swo
-.erlang.cookie
-ebin
-log
-erl_crash.dump
-.rebar
-logs
-_build
-.idea
-*.iml
-rebar3.crashdump
-*~

apps/emqx_libs/README.md

@@ -1,9 +0,0 @@
-emqx_libs
-=====
-
-Common libs for emqx
-
-Build
------
-
-    $ rebar3 compile

apps/emqx_libs/rebar.config

@@ -1,2 +0,0 @@
-{erl_opts, [debug_info]}.
-{deps, []}.

apps/emqx_libs/src/emqx_libs.app.src

@@ -1,14 +0,0 @@
-{application, emqx_libs,
- [{description, "EMQ X library"},
-  {vsn, "5.0"},
-  {registered, []},
-  {applications,
-   [kernel,
-    stdlib
-   ]},
-  {env,[]},
-  {modules, []},
-  {licenses, ["Apache 2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
-  {links, []}
- ]}.

apps/emqx_libs/src/emqx_libs.erl

@@ -1,3 +0,0 @@
--module(emqx_libs).
-
--export([]).

apps/emqx_lua_hook/src/emqx_lua_hook.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
-  {applications, [kernel,stdlib,emqx_libs]},
+  {applications, [kernel,stdlib,emqx]},
   {mod, {emqx_lua_hook_app,[]}},
   {env,[]},
   {licenses, ["Apache-2.0"]},

apps/emqx_lua_hook/src/emqx_lua_script.erl

@@ -17,8 +17,8 @@
 -module(emqx_lua_script).
 
 -include("emqx_lua_hook.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -export([ register_on_message_publish/2
         , register_on_client_connected/2

apps/emqx_lua_hook/test/emqx_lua_hook_SUITE.erl

@@ -19,8 +19,8 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 

apps/emqx_lwm2m/src/emqx_lwm2m.app.src

@@ -3,5 +3,5 @@
               {vsn, "4.3.0"}, % strict semver, bump manually!
               {modules,[]},
               {registered,[emqx_lwm2m_sup]},
-              {applications,[kernel,stdlib,lwm2m_coap,emqx_libs]},
+              {applications,[kernel,stdlib,lwm2m_coap,emqx]},
               {mod,{emqx_lwm2m_app,[]}}]}.

apps/emqx_lwm2m/src/emqx_lwm2m_coap_resource.erl

@@ -16,9 +16,9 @@
 
 -module(emqx_lwm2m_coap_resource).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -include_lib("lwm2m_coap/include/coap.hrl").
 

apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl

@@ -18,9 +18,9 @@
 
 -include("emqx_lwm2m.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 %% API.
 -export([ send_ul_data/3

apps/emqx_lwm2m/test/test_mqtt_broker.erl

@@ -22,9 +22,9 @@
 
 -record(state, {subscriber}).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -include_lib("eunit/include/eunit.hrl").
 

apps/emqx_management/src/emqx_management.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_management_sup]},
-  {applications, [kernel,stdlib,minirest,emqx_libs]},
+  {applications, [kernel,stdlib,minirest,emqx]},
   {mod, {emqx_mgmt_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_management/src/emqx_mgmt.erl

@@ -19,8 +19,8 @@
 -include("emqx_mgmt.hrl").
 
 -include_lib("stdlib/include/qlc.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -import(proplists, [get_value/2]).
 

apps/emqx_management/src/emqx_mgmt_api_alarms.erl

@@ -18,7 +18,7 @@
 
 -include("emqx_mgmt.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -rest_api(#{name   => list_all_alarms,
             method => 'GET',

apps/emqx_management/src/emqx_mgmt_api_banned.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_mgmt_api_banned).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -include("emqx_mgmt.hrl").
 

apps/emqx_management/src/emqx_mgmt_api_clients.erl

@@ -18,8 +18,8 @@
 
 -include("emqx_mgmt.hrl").
 
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -import(minirest, [ return/0
                   , return/1

apps/emqx_management/src/emqx_mgmt_api_data.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_mgmt_api_data).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -include_lib("kernel/include/file.hrl").
 

apps/emqx_management/src/emqx_mgmt_api_plugins.erl

@@ -18,7 +18,7 @@
 
 -include("emqx_mgmt.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -import(minirest, [return/1]).
 

apps/emqx_management/src/emqx_mgmt_api_pubsub.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_mgmt_api_pubsub).
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 -include("emqx_mgmt.hrl").
 
 -import(proplists, [ get_value/2

apps/emqx_management/src/emqx_mgmt_api_routes.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_mgmt_api_routes).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -import(minirest, [return/1]).
 

apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_mgmt_api_subscriptions).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -import(minirest, [return/1]).
 

apps/emqx_management/src/emqx_mgmt_cli.erl

@@ -16,8 +16,8 @@
 
 -module(emqx_mgmt_cli).
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -include("emqx_mgmt.hrl").
 

apps/emqx_management/src/emqx_mgmt_http.erl

@@ -25,7 +25,7 @@
 
 -export([init/2]).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -define(APP, emqx_management).
 -define(EXCEPT_PLUGIN, [emqx_dashboard]).

apps/emqx_management/test/emqx_mgmt_SUITE.erl

@@ -19,8 +19,8 @@
 -compile(export_all).
 -compile(nowarn_export_all).
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 -include_lib("common_test/include/ct.hrl").

apps/emqx_management/test/emqx_mgmt_api_SUITE.erl

@@ -21,8 +21,8 @@
 
 -include_lib("eunit/include/eunit.hrl").
 
--include_lib("emqx_libs/include/emqx.hrl").
--include_lib("emqx_libs/include/emqx_mqtt.hrl").
+-include_lib("emqx/include/emqx.hrl").
+-include_lib("emqx/include/emqx_mqtt.hrl").
 
 -include("emqx_mgmt.hrl").
 

apps/emqx_passwd/src/emqx_passwd.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, ['emqx_passwd']},
   {registered, []},
-  {applications, [kernel,stdlib,ssl,pbkdf2,bcrypt]},
+  {applications, [kernel,stdlib,ssl,pbkdf2,bcrypt,emqx]},
   {env, []},
   {licenses, ["Apache-2.0"]},
   {maintainers, ["EMQ X Team <contact@emqx.io>"]},

apps/emqx_plugin_template/src/emqx_plugin_template.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_plugin_template_sup]},
-  {applications, [kernel,stdlib,emqx_libs]},
+  {applications, [kernel,stdlib,emqx]},
   {mod, {emqx_plugin_template_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_plugin_template/src/emqx_plugin_template.erl

@@ -16,7 +16,7 @@
 
 -module(emqx_plugin_template).
 
--include_lib("emqx_libs/include/emqx.hrl").
+-include_lib("emqx/include/emqx.hrl").
 
 -export([ load/1
         , unload/0

apps/emqx_prometheus/src/emqx_prometheus.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_prometheus_sup]},
-  {applications, [kernel,stdlib,prometheus,emqx_libs]},
+  {applications, [kernel,stdlib,prometheus,emqx]},
   {mod, {emqx_prometheus_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

apps/emqx_psk_file/src/emqx_psk_file.app.src

@@ -3,7 +3,7 @@
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules,[]},
   {registered,[emqx_psk_file_sup]},
-  {applications,[kernel,stdlib,emqx_libs]},
+  {applications,[kernel,stdlib,emqx]},
   {mod,{emqx_psk_file_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},