From cf455f3c11afefd6b7eecbdc71d7e0b2bf2756be Mon Sep 17 00:00:00 2001 From: Konrad `ktoso` Malawski Date: Thu, 11 Jan 2018 12:35:05 +0900 Subject: [PATCH] Fix MiMa for Untangle settings from attributes in materializer #24063 --- .../mima-filters/2.5.7.backwards.excludes | 14 ------------- .../mima-filters/2.5.8.backwards.excludes | 20 ++++++++++++++++++- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/akka-stream/src/main/mima-filters/2.5.7.backwards.excludes b/akka-stream/src/main/mima-filters/2.5.7.backwards.excludes index 00c723a4be..e69de29bb2 100644 --- a/akka-stream/src/main/mima-filters/2.5.7.backwards.excludes +++ b/akka-stream/src/main/mima-filters/2.5.7.backwards.excludes @@ -1,14 +0,0 @@ -# Attributes overhaul -ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.stream.Graph.async") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.ActorMaterializer.effectiveSettings") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.ActorProcessorImpl.this") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.FanoutProcessorImpl.this") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.PhasedFusingActorMaterializer.defaultInitialAttributes") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.PhasedFusingActorMaterializer.effectiveSettings") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.Phase.apply") -ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.stream.impl.Phase.apply") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.stream.impl.TlsModulePhase.this") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.FanoutProcessorImpl.props") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.IslandTracking.this") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.GraphStageIsland.this") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.fusing.GraphInterpreterShell.this") \ No newline at end of file diff --git a/akka-stream/src/main/mima-filters/2.5.8.backwards.excludes b/akka-stream/src/main/mima-filters/2.5.8.backwards.excludes index d84620926d..93fb108a6d 100644 --- a/akka-stream/src/main/mima-filters/2.5.8.backwards.excludes +++ b/akka-stream/src/main/mima-filters/2.5.8.backwards.excludes @@ -45,4 +45,22 @@ ProblemFilters.exclude[MissingClassProblem]("akka.stream.stage.GraphStageLogic$C ProblemFilters.exclude[FinalClassProblem]("akka.stream.stage.GraphStageLogic$ConcurrentAsyncCallback$Pending") ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.scaladsl.RestartWithBackoffLogic.onCompleteOrFailure") ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.scaladsl.RestartWithBackoffLogic.this") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.scaladsl.RestartWithBackoffSource.this") \ No newline at end of file +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.scaladsl.RestartWithBackoffSource.this") + +# Untangle settings from attributes in materializer #24063 +ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.stream.impl.io.TLSActor.props") +ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.stream.impl.io.TLSActor.this") +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.stream.Graph.async") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.ActorMaterializer.effectiveSettings") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.ActorProcessorImpl.this") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.FanoutProcessorImpl.this") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.PhasedFusingActorMaterializer.defaultInitialAttributes") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.PhasedFusingActorMaterializer.effectiveSettings") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.Phase.apply") +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.stream.impl.Phase.apply") +ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.stream.impl.TlsModulePhase.this") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.FanoutProcessorImpl.props") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.IslandTracking.this") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.GraphStageIsland.this") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.stream.impl.fusing.GraphInterpreterShell.this") +