From f6bea845caaf602129439f8a46e0d574f7e1520a Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 4 Feb 2020 15:43:13 +0100 Subject: [PATCH] update MiMa latestPatch (#28534) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update MiMa latestPatch * Even later latest * exclude jdk9 classes in 2.6.x excludes * mima exclude for SystemMaterializer.materializer type Co-authored-by: Johan Andrén --- .../jdk11-specific-classes.backwards.excludes | 2 ++ akka-stream/src/main/mima-filters/2.5.29.backwards.excludes | 5 +++++ .../28324-jdk9-specific-classes.backwards.excludes | 0 project/MiMa.scala | 4 ++-- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 akka-remote/src/main/mima-filters/2.6.x.backwards.excludes/jdk11-specific-classes.backwards.excludes create mode 100644 akka-stream/src/main/mima-filters/2.5.29.backwards.excludes rename akka-stream/src/main/mima-filters/{2.6.1.backwards.excludes => 2.6.x.backwards.excludes}/28324-jdk9-specific-classes.backwards.excludes (100%) diff --git a/akka-remote/src/main/mima-filters/2.6.x.backwards.excludes/jdk11-specific-classes.backwards.excludes b/akka-remote/src/main/mima-filters/2.6.x.backwards.excludes/jdk11-specific-classes.backwards.excludes new file mode 100644 index 0000000000..4db6ba5314 --- /dev/null +++ b/akka-remote/src/main/mima-filters/2.6.x.backwards.excludes/jdk11-specific-classes.backwards.excludes @@ -0,0 +1,2 @@ +# Java11+ API's will have to be always filtered until we have these classes in our normal build flow +ProblemFilters.exclude[MissingClassProblem]("akka.remote.artery.jfr.*") diff --git a/akka-stream/src/main/mima-filters/2.5.29.backwards.excludes b/akka-stream/src/main/mima-filters/2.5.29.backwards.excludes new file mode 100644 index 0000000000..5efffaf0dc --- /dev/null +++ b/akka-stream/src/main/mima-filters/2.5.29.backwards.excludes @@ -0,0 +1,5 @@ +# SystemMaterializer was backported from 2.6 to 2.5.29, but unfortunately a +# binary incompatibility slipped in: it should return Materializer, not +# ActorMaterializer for 2.5.x to be binary compatible with the feature in +# 2.6.x. +ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.stream.SystemMaterializer.materializer") diff --git a/akka-stream/src/main/mima-filters/2.6.1.backwards.excludes/28324-jdk9-specific-classes.backwards.excludes b/akka-stream/src/main/mima-filters/2.6.x.backwards.excludes/28324-jdk9-specific-classes.backwards.excludes similarity index 100% rename from akka-stream/src/main/mima-filters/2.6.1.backwards.excludes/28324-jdk9-specific-classes.backwards.excludes rename to akka-stream/src/main/mima-filters/2.6.x.backwards.excludes/28324-jdk9-specific-classes.backwards.excludes diff --git a/project/MiMa.scala b/project/MiMa.scala index 304a2015bb..27954d8c85 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -12,8 +12,8 @@ import com.typesafe.tools.mima.plugin.MimaPlugin.autoImport._ object MiMa extends AutoPlugin { - private val latestPatchOf25 = 26 - private val latestPatchOf26 = 1 + private val latestPatchOf25 = 29 + private val latestPatchOf26 = 3 override def requires = MimaPlugin override def trigger = allRequirements