Merge branch 'lukas/otp_mibs/deprecate/OTP-15141'

* lukas/otp_mibs/deprecate/OTP-15141:
  Update primary bootstrap
  Deprecate otp_mibs

12 files changed, 13 insertions, 2 deletions

diff --git a/bootstrap/lib/kernel/ebin/application_controller.beam b/bootstrap/lib/kernel/ebin/application_controller.beam
index 4cc77ec55c..ed876f4d6a 100644
--- a/bootstrap/lib/kernel/ebin/application_controller.beam
+++ b/bootstrap/lib/kernel/ebin/application_controller.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_server.beam b/bootstrap/lib/kernel/ebin/logger_server.beam
index 72a14acce3..4885c0992a 100644
--- a/bootstrap/lib/kernel/ebin/logger_server.beam
+++ b/bootstrap/lib/kernel/ebin/logger_server.beam
diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam
index 03627a3d53..0a565d542d 100644
--- a/bootstrap/lib/kernel/ebin/net_kernel.beam
+++ b/bootstrap/lib/kernel/ebin/net_kernel.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_statem.beam b/bootstrap/lib/stdlib/ebin/gen_statem.beam
index ebdb70b93c..1c1b93a036 100644
--- a/bootstrap/lib/stdlib/ebin/gen_statem.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_statem.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
index de468aacca..dc91c318c5 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
diff --git a/bootstrap/lib/stdlib/ebin/maps.beam b/bootstrap/lib/stdlib/ebin/maps.beam
index 85e997bb1c..ec0ebce58a 100644
--- a/bootstrap/lib/stdlib/ebin/maps.beam
+++ b/bootstrap/lib/stdlib/ebin/maps.beam
diff --git a/bootstrap/lib/stdlib/ebin/otp_internal.beam b/bootstrap/lib/stdlib/ebin/otp_internal.beam
index ab99005d7a..c42b18f6cf 100644
--- a/bootstrap/lib/stdlib/ebin/otp_internal.beam
+++ b/bootstrap/lib/stdlib/ebin/otp_internal.beam
diff --git a/bootstrap/lib/stdlib/ebin/uri_string.beam b/bootstrap/lib/stdlib/ebin/uri_string.beam
index e14164a823..36aec511d8 100644
--- a/bootstrap/lib/stdlib/ebin/uri_string.beam
+++ b/bootstrap/lib/stdlib/ebin/uri_string.beam
diff --git a/lib/os_mon/doc/src/os_mon_mib.xml b/lib/os_mon/doc/src/os_mon_mib.xml
index dcf3649876..217d1e4804 100644
--- a/lib/os_mon/doc/src/os_mon_mib.xml
+++ b/lib/os_mon/doc/src/os_mon_mib.xml
@@ -35,7 +35,10 @@
     <p>Functions for loading and unloading the OTP-OS-MON-MIB into/from
       an SNMP agent. The instrumentation of the OTP-OS-MON-MIB uses
       Mnesia, hence Mnesia must be started prior to loading
-      the OTP-OS-MON-MIB.</p>
+    the OTP-OS-MON-MIB.</p>
+    <warning>
+      <p>This module has been deprecated and will be removed in a furture release.</p>
+    </warning>
   </description>
   <funcs>
     <func>
diff --git a/lib/otp_mibs/doc/src/otp_mib.xml b/lib/otp_mibs/doc/src/otp_mib.xml
index 681ce9fa2d..adf3b00c7b 100644
--- a/lib/otp_mibs/doc/src/otp_mib.xml
+++ b/lib/otp_mibs/doc/src/otp_mib.xml
@@ -34,7 +34,10 @@
     <p>The SNMP application should be used to start an SNMP agent. Then
       the API functions below can be used to load/unload the OTP-MIB
       into/from the agent. The instrumentation of the OTP-MIB uses
-      Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.</p>
+    Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.</p>
+    <warning>
+      <p>This application has been deprecated and will be removed in a furture release.</p>
+    </warning>
   </description>
   <funcs>
     <func>
diff --git a/lib/otp_mibs/src/otp_mib.erl b/lib/otp_mibs/src/otp_mib.erl
index 1431818be4..d18afd9bbd 100644
--- a/lib/otp_mibs/src/otp_mib.erl
+++ b/lib/otp_mibs/src/otp_mib.erl
@@ -36,6 +36,9 @@
 %% Exported for internal use via rpc
 -export([get_erl_node/1, get_appls/1]).
 
+-deprecated([{load,1,eventually},
+	     {unload,1,eventually}]).
+
 %% Shadow tables
 -record(erlNodeTable,
 	{erlNodeId, erlNodeName, erlNodeMachine, erlNodeVersion,
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index ceec3079a1..24d6e384d6 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -620,6 +620,8 @@ obsolete_1(ssl, ssl_accept, 2) ->
     {deprecated, "deprecated; use ssl:handshake/2 instead"};
 obsolete_1(ssl, ssl_accept, 3) ->
     {deprecated, "deprecated; use ssl:handshake/3 instead"};
+obsolete_1(otp_mib, F, _) when F =:= load; F =:= unload ->
+    {deprecated, "deprecated; functionality will be removed in a future release"};
 
 %% not obsolete