From 325f31fe72a3c0895a7333e351bf63a32bb488ed Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 27 Sep 2019 11:46:17 +0200
Subject: [PATCH] Deprecate akka.Main

---
 akka-actor/src/main/scala/akka/Main.scala                    | 1 +
 akka-docs/src/main/paradox/additional/packaging.md           | 2 +-
 .../src/main/paradox/project/migration-guide-2.5.x-2.6.x.md  | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/akka-actor/src/main/scala/akka/Main.scala b/akka-actor/src/main/scala/akka/Main.scala
index b3bc4b8086..de22ed4726 100644
--- a/akka-actor/src/main/scala/akka/Main.scala
+++ b/akka-actor/src/main/scala/akka/Main.scala
@@ -18,6 +18,7 @@ import scala.util.control.NonFatal
  * top level application supervisor actor. It will shutdown
  * the actor system when the top level actor is terminated.
  */
+@deprecated("Implement your own main class instead, from which you start the ActorSystem and actors.", "2.6.0")
 object Main {
 
   /**
diff --git a/akka-docs/src/main/paradox/additional/packaging.md b/akka-docs/src/main/paradox/additional/packaging.md
index 9cfaee5ce4..c3ea961b1b 100644
--- a/akka-docs/src/main/paradox/additional/packaging.md
+++ b/akka-docs/src/main/paradox/additional/packaging.md
@@ -68,7 +68,7 @@ The plugin configuration might look like this:
       <transformer
        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
        <manifestEntries>
-        <Main-Class>akka.Main</Main-Class>
+        <Main-Class>myapp.Main</Main-Class>
        </manifestEntries>
       </transformer>
     </transformers>
diff --git a/akka-docs/src/main/paradox/project/migration-guide-2.5.x-2.6.x.md b/akka-docs/src/main/paradox/project/migration-guide-2.5.x-2.6.x.md
index 0d1d94ebbf..cf2633c025 100644
--- a/akka-docs/src/main/paradox/project/migration-guide-2.5.x-2.6.x.md
+++ b/akka-docs/src/main/paradox/project/migration-guide-2.5.x-2.6.x.md
@@ -92,6 +92,11 @@ Warnings about `TypedActor` have been [mentioned in documentation](https://doc.a
 for many years.
 
 
+### akka.Main
+
+`akka.Main` is deprecated in favour of starting the `ActorSystem` from a custom main class instead. `akka.Main` was not
+adding much value and typically a custom main class is needed anyway.
+
 @@ Remoting
 
 ### Default remoting is now Artery TCP