diff --git a/akka-cluster-metrics/build.sbt b/akka-cluster-metrics/build.sbt index 02b421c41f..1997251d4d 100644 --- a/akka-cluster-metrics/build.sbt +++ b/akka-cluster-metrics/build.sbt @@ -12,7 +12,7 @@ OSGi.clusterMetrics Dependencies.clusterMetrics -//MimaKeys.previousArtifacts := akkaPreviousArtifacts("akka-cluster-metrics").value +MimaKeys.previousArtifacts := akkaPreviousArtifacts("akka-cluster-metrics").value parallelExecution in Test := false diff --git a/akka-osgi/build.sbt b/akka-osgi/build.sbt index e80269b856..785258c953 100644 --- a/akka-osgi/build.sbt +++ b/akka-osgi/build.sbt @@ -10,3 +10,5 @@ OSGi.osgi Dependencies.osgi parallelExecution in Test := false + +MimaKeys.previousArtifacts := akkaPreviousArtifacts("akka-osgi").value diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index bdc1c517e8..f31a126d47 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -521,10 +521,11 @@ object AkkaBuild extends Build { if (enableMiMa) { val versions = { val akka23Versions = Seq("2.3.11", "2.3.12", "2.3.13", "2.3.14") - val akka24Versions = Seq("2.4.0") + val akka24Versions = Seq("2.4.0", "2.4.1") val akka24NewArtifacts = Seq( "akka-cluster-sharding", "akka-cluster-tools", + "akka-cluster-metrics", "akka-persistence", "akka-distributed-data-experimental", "akka-persistence-query-experimental" diff --git a/project/MiMa.scala b/project/MiMa.scala index 8da1aadbfe..c05228fcc5 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -571,29 +571,32 @@ object MiMa extends AutoPlugin { "2.3.14" -> bcIssuesBetween23and24, "2.4.0" -> Seq( FilterAnyProblem("akka.remote.transport.ProtocolStateActor"), - FilterAnyProblem("akka.persistence.journal.inmem.InmemJournal"), - FilterAnyProblem("akka.persistence.journal.inmem.InmemStore"), //#18353 Changes to methods and fields private to remoting actors ProblemFilters.exclude[MissingMethodProblem]("akka.remote.EndpointManager.retryGateEnabled"), ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.remote.EndpointManager.pruneTimerCancellable"), - + // #18722 internal changes to actor FilterAnyProblem("akka.cluster.sharding.DDataShardCoordinator"), // #18328 optimize VersionVector for size 1 - FilterAnyProblem("akka.cluster.ddata.VersionVector"), + FilterAnyProblem("akka.cluster.ddata.VersionVector") + ), + "2.4.1" -> Seq( + // #19008 + FilterAnyProblem("akka.persistence.journal.inmem.InmemJournal"), + FilterAnyProblem("akka.persistence.journal.inmem.InmemStore"), // #19133 change in internal actor ProblemFilters.exclude[MissingMethodProblem]("akka.remote.ReliableDeliverySupervisor.gated"), - // debug logging in ReplayFilter, change of internal actor + // #19200 debug logging in ReplayFilter, change of internal actor ProblemFilters.exclude[MissingMethodProblem]("akka.persistence.journal.ReplayFilter.this"), ProblemFilters.exclude[MissingMethodProblem]("akka.persistence.journal.AsyncWriteJournal.akka$persistence$journal$AsyncWriteJournal$_setter_$akka$persistence$journal$AsyncWriteJournal$$replayDebugEnabled_="), ProblemFilters.exclude[MissingMethodProblem]("akka.persistence.journal.AsyncWriteJournal.akka$persistence$journal$AsyncWriteJournal$$replayDebugEnabled"), ProblemFilters.exclude[MissingMethodProblem]("akka.persistence.journal.ReplayFilter.props"), - // report invalid association events #18758 + // #18758 report invalid association events ProblemFilters.exclude[MissingTypesProblem]("akka.remote.InvalidAssociation$"), ProblemFilters.exclude[MissingMethodProblem]("akka.remote.InvalidAssociation.apply"), ProblemFilters.exclude[MissingMethodProblem]("akka.remote.InvalidAssociation.copy"), @@ -603,9 +606,9 @@ object MiMa extends AutoPlugin { ProblemFilters.exclude[MissingMethodProblem]("akka.pattern.BackoffSupervisor.akka$pattern$BackoffSupervisor$$child_="), ProblemFilters.exclude[MissingMethodProblem]("akka.pattern.BackoffSupervisor.akka$pattern$BackoffSupervisor$$restartCount"), ProblemFilters.exclude[MissingMethodProblem]("akka.pattern.BackoffSupervisor.akka$pattern$BackoffSupervisor$$restartCount_="), - ProblemFilters.exclude[MissingMethodProblem]("akka.pattern.BackoffSupervisor.akka$pattern$BackoffSupervisor$$child") - ), - "2.4.1" -> Seq( + ProblemFilters.exclude[MissingMethodProblem]("akka.pattern.BackoffSupervisor.akka$pattern$BackoffSupervisor$$child"), + + // #19487 FilterAnyProblem("akka.actor.dungeon.Children") ) )