diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index 43b744f036..582157f405 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -61,14 +61,14 @@ object ActorSystem { * then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader * associated with the ActorSystem class. * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def create(name: String, config: Config): ActorSystem = apply(name, config) /** * Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def create(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, config, classLoader) @@ -85,7 +85,7 @@ object ActorSystem { * executor = "default-executor", including those that have not defined the executor setting and thereby fallback * to the default of "default-dispatcher.executor". * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def create(name: String, config: Config, classLoader: ClassLoader, defaultExecutionContext: ExecutionContext): ActorSystem = apply(name, Option(config), Option(classLoader), Option(defaultExecutionContext)) @@ -113,14 +113,14 @@ object ActorSystem { * then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader * associated with the ActorSystem class. * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def apply(name: String, config: Config): ActorSystem = apply(name, Option(config), None, None) /** * Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def apply(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, Option(config), Option(classLoader), None) @@ -133,7 +133,7 @@ object ActorSystem { * If no ExecutionContext is given, the system will fallback to the executor configured under "akka.actor.default-dispatcher.default-executor.fallback". * The system will use the passed in config, or falls back to the deafult reference configuration using the ClassLoader. * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ def apply(name: String, config: Option[Config] = None, classLoader: Option[ClassLoader] = None, defaultExecutionContext: Option[ExecutionContext] = None): ActorSystem = { val cl = classLoader.getOrElse(findClassLoader()) @@ -146,14 +146,14 @@ object ActorSystem { * * For more detailed information about the different possible configuration options, look in the Akka Documentation under "Configuration" * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ class Settings(classLoader: ClassLoader, cfg: Config, final val name: String) { /** * The backing Config of this ActorSystem's Settings * - * @see The Typesafe Config Library API Documentation + * @see The Typesafe Config Library API Documentation */ final val config: Config = { val config = cfg.withFallback(ConfigFactory.defaultReference(classLoader)) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 06c1d08b34..768f0bf877 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -22,6 +22,7 @@ object Dependencies { // Compile val camelCore = "org.apache.camel" % "camel-core" % "2.13.0" exclude("org.slf4j", "slf4j-api") // ApacheV2 + // when updating config version, update links ActorSystem ScalaDoc to link to the updated version val config = "com.typesafe" % "config" % "1.2.1" // ApacheV2 // mirrored in OSGi sample val netty = "io.netty" % "netty" % "3.8.0.Final" // ApacheV2