From 6cd935dfecb807648c0f86dd628ba5fbd5075a20 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 6 Nov 2019 21:40:56 +0100
Subject: [PATCH] update mima latestPatch 2.6.0 (#28135)

---
 build.sbt          | 1 -
 project/MiMa.scala | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index 3dc897bfe3..373d22feeb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -217,7 +217,6 @@ lazy val jackson = akkaModule("akka-serialization-jackson")
   .settings(OSGi.jackson)
   .settings(javacOptions += "-parameters")
   .enablePlugins(ScaladocNoVerificationOfDiagrams)
-  .disablePlugins(MimaPlugin)
 
 lazy val multiNodeTestkit = akkaModule("akka-multi-node-testkit")
   .dependsOn(remote, testkit)
diff --git a/project/MiMa.scala b/project/MiMa.scala
index 6b2f869003..3e0b9eba00 100644
--- a/project/MiMa.scala
+++ b/project/MiMa.scala
@@ -13,8 +13,7 @@ import com.typesafe.tools.mima.plugin.MimaPlugin.autoImport._
 object MiMa extends AutoPlugin {
 
   private val latestPatchOf25 = 26
-  // No 2.6 has been released yet. Update to '0' after releasing 2.6.0
-  private val latestPatchOf26 = -1
+  private val latestPatchOf26 = 0
 
   override def requires = MimaPlugin
   override def trigger = allRequirements
@@ -33,8 +32,8 @@ object MiMa extends AutoPlugin {
         else if (projectName.contains("discovery")) 19
         else if (projectName.contains("coordination")) 22
         else 0
-    
-      if (!projectName.contains("typed")) {
+
+      if (!(projectName.contains("typed") || projectName.contains("jackson"))) {
         // 2.5.18 is the only release built with Scala 2.12.7, which due to
         // https://github.com/scala/bug/issues/11207 produced many more
         // static methods than expected. These are hard to filter out, so
@@ -46,7 +45,6 @@ object MiMa extends AutoPlugin {
     }
 
     val akka25PromotedArtifacts = Set("akka-distributed-data")
-    val akkaTypedModules = Set("akka-actor-typed")
 
     // check against all binary compatible artifacts
     versions.map { v =>