From 1eb1c03918fa98d870f56e5d292dedcdedf12b44 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 21 Nov 2019 11:18:18 +0100 Subject: [PATCH] move mima filter to 2.6.0 (#28214) --- CONTRIBUTING.md | 2 +- .../issue-27729-consistent-hashing.excludes | 15 ++++++++ .../issue-27729-consistent-hashing.excludes | 34 ------------------- 3 files changed, 16 insertions(+), 35 deletions(-) create mode 100644 akka-actor-typed/src/main/mima-filters/2.6.0.backwards.excludes/issue-27729-consistent-hashing.excludes delete mode 100644 akka-actor-typed/src/main/mima-filters/2.6.x.backwards.excludes/issue-27729-consistent-hashing.excludes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2bd8302bc..ef0ba654f6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -230,7 +230,7 @@ an error like this: In such situations it's good to consult with a core team member whether the violation can be safely ignored or if it would indeed break binary compatibility. If the violation can be ignored add exclude statements from the mima output to a new file named `/src/main/mima-filters/.backwards.excludes/--.excludes`, -e.g. `akka-actor/src/main/mima-filters/2.5.x.backwards.excludes/pr-12345-rename-internal-classes.excludes`. Make sure to add a comment +e.g. `akka-actor/src/main/mima-filters/2.6.0.backwards.excludes/pr-12345-rename-internal-classes.excludes`. Make sure to add a comment in the file that describes briefly why the incompatibility can be ignored. Situations when it may be fine to ignore a MiMa issued warning include: diff --git a/akka-actor-typed/src/main/mima-filters/2.6.0.backwards.excludes/issue-27729-consistent-hashing.excludes b/akka-actor-typed/src/main/mima-filters/2.6.0.backwards.excludes/issue-27729-consistent-hashing.excludes new file mode 100644 index 0000000000..795de9935e --- /dev/null +++ b/akka-actor-typed/src/main/mima-filters/2.6.0.backwards.excludes/issue-27729-consistent-hashing.excludes @@ -0,0 +1,15 @@ +# Those are new methods required for consistent hashing +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.javadsl.PoolRouter.withConsistentHashingRouting") +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.javadsl.GroupRouter.withConsistentHashingRouting") +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.scaladsl.PoolRouter.withConsistentHashingRouting") +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.scaladsl.GroupRouter.withConsistentHashingRouting") + +# Routee method has been updated to accept the message, but it's still an internal API. +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.actor.typed.internal.routing.RoutingLogic.selectRoutee") +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.internal.routing.RoutingLogic.selectRoutee") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.actor.typed.internal.routing.RoutingLogics#RoundRobinLogic.selectRoutee") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.actor.typed.internal.routing.RoutingLogics#RandomLogic.selectRoutee") + +# Internal changes due to of ActorSystem introduction +ProblemFilters.exclude[Problem]("akka.actor.typed.internal.routing.GroupRouterBuilder.*") +ProblemFilters.exclude[Problem]("akka.actor.typed.internal.routing.PoolRouterBuilder.*") diff --git a/akka-actor-typed/src/main/mima-filters/2.6.x.backwards.excludes/issue-27729-consistent-hashing.excludes b/akka-actor-typed/src/main/mima-filters/2.6.x.backwards.excludes/issue-27729-consistent-hashing.excludes deleted file mode 100644 index c9a4247145..0000000000 --- a/akka-actor-typed/src/main/mima-filters/2.6.x.backwards.excludes/issue-27729-consistent-hashing.excludes +++ /dev/null @@ -1,34 +0,0 @@ -# Those are new methods required for consistent hashing -ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.javadsl.PoolRouter.withConsistentHashingRouting") -ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.javadsl.GroupRouter.withConsistentHashingRouting") -ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.scaladsl.PoolRouter.withConsistentHashingRouting") -ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.scaladsl.GroupRouter.withConsistentHashingRouting") - -# Routee method has been updated to accept the message, but it's still an internal API. -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.actor.typed.internal.routing.RoutingLogic.selectRoutee") -ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.typed.internal.routing.RoutingLogic.selectRoutee") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.actor.typed.internal.routing.RoutingLogics#RoundRobinLogic.selectRoutee") -ProblemFilters.exclude[DirectMissingMethodProblem]("akka.actor.typed.internal.routing.RoutingLogics#RandomLogic.selectRoutee") - -# Internal changes due to of ActorSystem introduction -ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.unapply") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.apply$default$2") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.logicFactory") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.copy") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.copy$default$2") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.this") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.$default$3") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.apply") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.apply$default$3") -ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.unapply") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.$default$2") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.apply") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.apply$default$2") -ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.actor.typed.internal.routing.GroupRouterBuilder.unapply") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.$default$3") -ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.unapply") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.apply$default$3") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.logicFactory") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.copy") -ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.copy$default$3") -ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.actor.typed.internal.routing.PoolRouterBuilder.this")