diff --git a/akka-distributed-data/build.sbt b/akka-distributed-data/build.sbt index 973f3ad9e4..6eafa20bc2 100644 --- a/akka-distributed-data/build.sbt +++ b/akka-distributed-data/build.sbt @@ -1,7 +1,6 @@ import akka.{ AkkaBuild, Dependencies, Formatting, MultiNode, Unidoc, OSGi } AkkaBuild.defaultSettings -AkkaBuild.experimentalSettings Formatting.formatSettings OSGi.distributedData Dependencies.distributedData diff --git a/akka-docs/rst/java/cluster-sharding.rst b/akka-docs/rst/java/cluster-sharding.rst index ca932fa34d..89fc53b44d 100644 --- a/akka-docs/rst/java/cluster-sharding.rst +++ b/akka-docs/rst/java/cluster-sharding.rst @@ -208,7 +208,7 @@ The settings for Distributed Data is configured in the the section ``akka.cluster.sharding.distributed-data``. It's not possible to have different ``distributed-data`` settings for different sharding entity types. -You must explicitly add the ``akka-distributed-data-experimental`` dependency to your build if +You must explicitly add the ``akka-distributed-data`` dependency to your build if you use this mode. It is possible to remove ``akka-persistence`` dependency from a project if it is not used in user code. diff --git a/akka-docs/rst/java/distributed-data.rst b/akka-docs/rst/java/distributed-data.rst index 777c0605cc..59f8717e1f 100644 --- a/akka-docs/rst/java/distributed-data.rst +++ b/akka-docs/rst/java/distributed-data.rst @@ -24,13 +24,6 @@ It is eventually consistent and geared toward providing high read and write avai (partition tolerance), with low latency. Note that in an eventually consistent system a read may return an out-of-date value. -.. warning:: - - This module is marked as **“experimental”** as of its introduction in Akka 2.4.0. We will continue to - improve this API based on our users’ feedback, which implies that while we try to keep incompatible - changes to a minimum the binary compatibility guarantee for maintenance releases does not apply to the - contents of the ``akka.persistence`` package. - Using the Replicator ==================== @@ -588,13 +581,13 @@ To use Distributed Data you must add the following dependency in your project. sbt:: - "com.typesafe.akka" %% "akka-distributed-data-experimental" % "@version@" @crossString@ + "com.typesafe.akka" %% "akka-distributed-data" % "@version@" @crossString@ maven:: com.typesafe.akka - akka-distributed-data-experimental_@binVersion@ + akka-distributed-data_@binVersion@ @version@ diff --git a/akka-docs/rst/scala/cluster-sharding.rst b/akka-docs/rst/scala/cluster-sharding.rst index 14a71c1c0e..4ab89deaf9 100644 --- a/akka-docs/rst/scala/cluster-sharding.rst +++ b/akka-docs/rst/scala/cluster-sharding.rst @@ -211,7 +211,7 @@ The settings for Distributed Data is configured in the the section ``akka.cluster.sharding.distributed-data``. It's not possible to have different ``distributed-data`` settings for different sharding entity types. -You must explicitly add the ``akka-distributed-data-experimental`` dependency to your build if +You must explicitly add the ``akka-distributed-data`` dependency to your build if you use this mode. It is possible to remove ``akka-persistence`` dependency from a project if it is not used in user code. diff --git a/akka-docs/rst/scala/distributed-data.rst b/akka-docs/rst/scala/distributed-data.rst index 4033e17e51..89e8293bf7 100644 --- a/akka-docs/rst/scala/distributed-data.rst +++ b/akka-docs/rst/scala/distributed-data.rst @@ -24,12 +24,6 @@ It is eventually consistent and geared toward providing high read and write avai (partition tolerance), with low latency. Note that in an eventually consistent system a read may return an out-of-date value. -.. warning:: - - This module is marked as **“experimental”** as of its introduction in Akka 2.4.0. We will continue to - improve this API based on our users’ feedback, which implies that while we try to keep incompatible - changes to a minimum the binary compatibility guarantee for maintenance releases does not apply to the - contents of the ``akka.persistence`` package. Using the Replicator ==================== @@ -600,13 +594,13 @@ To use Distributed Data you must add the following dependency in your project. sbt:: - "com.typesafe.akka" %% "akka-distributed-data-experimental" % "@version@" @crossString@ + "com.typesafe.akka" %% "akka-distributed-data" % "@version@" @crossString@ maven:: com.typesafe.akka - akka-distributed-data-experimental_@binVersion@ + akka-distributed-data_@binVersion@ @version@ diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 7d0e446531..93505af7e2 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -184,7 +184,7 @@ object AkkaBuild extends Build { ).configs(MultiJvm) lazy val distributedData = Project( - id = "akka-distributed-data-experimental", + id = "akka-distributed-data", base = file("akka-distributed-data"), dependencies = Seq(cluster % "compile->compile;test->test;multi-jvm->multi-jvm") ).configs(MultiJvm) diff --git a/project/MiMa.scala b/project/MiMa.scala index 3cf1ab73d6..0d9e706b97 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -57,9 +57,20 @@ object MiMa extends AutoPlugin { akka24WithScala212 } } + + val akka25PromotedArtifacts = Set( + "akka-distributed-data" + ) // check against all binary compatible artifacts - versions.map(organization %% projectName % _).toSet + versions.map { v => + val adjustedProjectName = + if (akka25PromotedArtifacts(projectName) && v.startsWith("2.4")) + projectName + "-experimental" + else + projectName + organization %% adjustedProjectName % v + }.toSet } case class FilterAnyProblem(name: String) extends com.typesafe.tools.mima.core.ProblemFilter {