Enable Jackson for 2.13 (#27136)

* Enable jackson for 2.13

* Fix 2.13 warnings in jackson module
This commit is contained in:
Christopher Batey 2019-06-13 16:17:04 +01:00 committed by GitHub
parent 893bd8b74b
commit 6e93bef605
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 30 deletions

View file

@ -42,6 +42,8 @@ lazy val aggregatedProjects: Seq[ProjectReference] = List[ProjectReference](
actorTestkitTyped,
actorTyped,
actorTypedTests,
benchJmh,
benchJmhTyped,
cluster,
clusterMetrics,
clusterSharding,
@ -52,6 +54,7 @@ lazy val aggregatedProjects: Seq[ProjectReference] = List[ProjectReference](
discovery,
distributedData,
docs,
jackson,
multiNodeTestkit,
osgi,
persistence,
@ -68,10 +71,7 @@ lazy val aggregatedProjects: Seq[ProjectReference] = List[ProjectReference](
streamTests,
streamTestsTck,
streamTyped,
testkit) ++
(if (isScala213) List.empty[ProjectReference]
else
List[ProjectReference](jackson, benchJmh, benchJmhTyped)) // FIXME #27019 remove 2.13 condition when Jackson ScalaModule has been released for Scala 2.13
testkit)
lazy val root = Project(id = "akka", base = file("."))
.aggregate(aggregatedProjects: _*)
@ -247,8 +247,6 @@ lazy val jackson = akkaModule("akka-serialization-jackson")
.settings(AutomaticModuleName.settings("akka.serialization.jackson"))
.settings(OSGi.jackson)
.settings(javacOptions += "-parameters")
// FIXME #27019 remove when Jackson ScalaModule has been released for Scala 2.13
.settings(crossScalaVersions -= Dependencies.scala213Version)
.enablePlugins(ScaladocNoVerificationOfDiagrams)
.disablePlugins(MimaPlugin)