amend build for artery dev
This commit is contained in:
Patrik Nordwall
parent
50ac9134b8
commit
d15cab71bd
2 changed files with 42 additions and 37 deletions
|
|
@ -109,25 +109,25 @@ object AkkaBuild extends Build {
|
|||
lazy val actor = Project(
|
||||
id = "akka-actor",
|
||||
base = file("akka-actor")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val testkit = Project(
|
||||
id = "akka-testkit",
|
||||
base = file("akka-testkit"),
|
||||
dependencies = Seq(actor)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val typed = Project(
|
||||
id = "akka-typed-experimental",
|
||||
base = file("akka-typed"),
|
||||
dependencies = Seq(testkit % "compile;test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val actorTests = Project(
|
||||
id = "akka-actor-tests",
|
||||
base = file("akka-actor-tests"),
|
||||
dependencies = Seq(testkit % "compile;test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val benchJmh = Project(
|
||||
id = "akka-bench-jmh",
|
||||
|
|
@ -135,7 +135,7 @@ object AkkaBuild extends Build {
|
|||
dependencies = Seq(
|
||||
actor,
|
||||
http, stream, streamTests,
|
||||
persistence, distributedData,
|
||||
remote, persistence, distributedData,
|
||||
testkit
|
||||
).map(_ % "compile;compile->test;provided->provided")
|
||||
).disablePlugins(ValidatePullRequest)
|
||||
|
|
@ -143,43 +143,43 @@ object AkkaBuild extends Build {
|
|||
lazy val protobuf = Project(
|
||||
id = "akka-protobuf",
|
||||
base = file("akka-protobuf")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val remote = Project(
|
||||
id = "akka-remote",
|
||||
base = file("akka-remote"),
|
||||
dependencies = Seq(actor, actorTests % "test->test", testkit % "test->test", protobuf)
|
||||
dependencies = Seq(actor, stream, actorTests % "test->test", testkit % "test->test", streamTestkit % "test", protobuf)
|
||||
)
|
||||
|
||||
lazy val multiNodeTestkit = Project(
|
||||
id = "akka-multi-node-testkit",
|
||||
base = file("akka-multi-node-testkit"),
|
||||
dependencies = Seq(remote, testkit)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val remoteTests = Project(
|
||||
id = "akka-remote-tests",
|
||||
base = file("akka-remote-tests"),
|
||||
dependencies = Seq(actorTests % "test->test", multiNodeTestkit)
|
||||
dependencies = Seq(actorTests % "test->test", remote % "test->test", streamTestkit % "test", multiNodeTestkit)
|
||||
).configs(MultiJvm)
|
||||
|
||||
lazy val cluster = Project(
|
||||
id = "akka-cluster",
|
||||
base = file("akka-cluster"),
|
||||
dependencies = Seq(remote, remoteTests % "test->test" , testkit % "test->test")
|
||||
).configs(MultiJvm)
|
||||
).configs(MultiJvm).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val clusterMetrics = Project(
|
||||
id = "akka-cluster-metrics",
|
||||
base = file("akka-cluster-metrics"),
|
||||
dependencies = Seq(cluster % "compile->compile;test->test;multi-jvm->multi-jvm", slf4j % "test->compile")
|
||||
).configs(MultiJvm)
|
||||
).configs(MultiJvm).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val clusterTools = Project(
|
||||
id = "akka-cluster-tools",
|
||||
base = file("akka-cluster-tools"),
|
||||
dependencies = Seq(cluster % "compile->compile;test->test;multi-jvm->multi-jvm")
|
||||
).configs(MultiJvm)
|
||||
).configs(MultiJvm).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val clusterSharding = Project(
|
||||
id = "akka-cluster-sharding",
|
||||
|
|
@ -190,31 +190,31 @@ object AkkaBuild extends Build {
|
|||
// provided.
|
||||
dependencies = Seq(cluster % "compile->compile;test->test;multi-jvm->multi-jvm",
|
||||
persistence % "compile;test->provided", distributedData % "provided;test", clusterTools)
|
||||
).configs(MultiJvm)
|
||||
).configs(MultiJvm).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val distributedData = Project(
|
||||
id = "akka-distributed-data-experimental",
|
||||
base = file("akka-distributed-data"),
|
||||
dependencies = Seq(cluster % "compile->compile;test->test;multi-jvm->multi-jvm")
|
||||
).configs(MultiJvm)
|
||||
).configs(MultiJvm).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val slf4j = Project(
|
||||
id = "akka-slf4j",
|
||||
base = file("akka-slf4j"),
|
||||
dependencies = Seq(actor, testkit % "test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val agent = Project(
|
||||
id = "akka-agent",
|
||||
base = file("akka-agent"),
|
||||
dependencies = Seq(actor, testkit % "test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val persistence = Project(
|
||||
id = "akka-persistence",
|
||||
base = file("akka-persistence"),
|
||||
dependencies = Seq(actor, testkit % "test->test", protobuf)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val persistenceQuery = Project(
|
||||
id = "akka-persistence-query-experimental",
|
||||
|
|
@ -224,48 +224,48 @@ object AkkaBuild extends Build {
|
|||
persistence % "compile;provided->provided;test->test",
|
||||
testkit % "compile;test->test",
|
||||
streamTestkit % "compile;test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val persistenceTck = Project(
|
||||
id = "akka-persistence-tck",
|
||||
base = file("akka-persistence-tck"),
|
||||
dependencies = Seq(persistence % "compile;provided->provided;test->test", testkit % "compile;test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val persistenceShared = Project(
|
||||
id = "akka-persistence-shared",
|
||||
base = file("akka-persistence-shared"),
|
||||
dependencies = Seq(persistence % "test->test", testkit % "test->test", remote % "test", protobuf)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val httpCore = Project(
|
||||
id = "akka-http-core",
|
||||
base = file("akka-http-core"),
|
||||
dependencies = Seq(stream, parsing, streamTestkit % "test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val http = Project(
|
||||
id = "akka-http-experimental",
|
||||
base = file("akka-http"),
|
||||
dependencies = Seq(httpCore)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val httpTestkit = Project(
|
||||
id = "akka-http-testkit",
|
||||
base = file("akka-http-testkit"),
|
||||
dependencies = Seq(http, streamTestkit)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val httpTests = Project(
|
||||
id = "akka-http-tests",
|
||||
base = file("akka-http-tests"),
|
||||
dependencies = Seq(httpTestkit % "test", streamTestkit % "test->test", testkit % "test->test", httpSprayJson, httpXml, httpJackson)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val httpMarshallersScala = Project(
|
||||
id = "akka-http-marshallers-scala-experimental",
|
||||
base = file("akka-http-marshallers-scala")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
.settings(parentSettings: _*)
|
||||
.aggregate(httpSprayJson, httpXml)
|
||||
|
||||
|
|
@ -278,7 +278,7 @@ object AkkaBuild extends Build {
|
|||
lazy val httpMarshallersJava = Project(
|
||||
id = "akka-http-marshallers-java-experimental",
|
||||
base = file("akka-http-marshallers-java")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
.settings(parentSettings: _*)
|
||||
.aggregate(httpJackson)
|
||||
|
||||
|
|
@ -290,61 +290,61 @@ object AkkaBuild extends Build {
|
|||
id = s"akka-http-$name-experimental",
|
||||
base = file(s"akka-http-marshallers-scala/akka-http-$name"),
|
||||
dependencies = Seq(http)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
def httpMarshallersJavaSubproject(name: String) =
|
||||
Project(
|
||||
id = s"akka-http-$name-experimental",
|
||||
base = file(s"akka-http-marshallers-java/akka-http-$name"),
|
||||
dependencies = Seq(http)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val parsing = Project(
|
||||
id = "akka-parsing",
|
||||
base = file("akka-parsing")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val stream = Project(
|
||||
id = "akka-stream",
|
||||
base = file("akka-stream"),
|
||||
dependencies = Seq(actor)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val streamTestkit = Project(
|
||||
id = "akka-stream-testkit",
|
||||
base = file("akka-stream-testkit"),
|
||||
dependencies = Seq(stream, testkit % "compile;test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val streamTests = Project(
|
||||
id = "akka-stream-tests",
|
||||
base = file("akka-stream-tests"),
|
||||
dependencies = Seq(streamTestkit % "test->test", stream)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val streamTestsTck = Project(
|
||||
id = "akka-stream-tests-tck",
|
||||
base = file("akka-stream-tests-tck"),
|
||||
dependencies = Seq(streamTestkit % "test->test", stream)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val kernel = Project(
|
||||
id = "akka-kernel",
|
||||
base = file("akka-kernel"),
|
||||
dependencies = Seq(actor, testkit % "test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val camel = Project(
|
||||
id = "akka-camel",
|
||||
base = file("akka-camel"),
|
||||
dependencies = Seq(actor, slf4j, testkit % "test->test")
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val osgi = Project(
|
||||
id = "akka-osgi",
|
||||
base = file("akka-osgi"),
|
||||
dependencies = Seq(actor)
|
||||
)
|
||||
).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val docs = Project(
|
||||
id = "akka-docs",
|
||||
|
|
@ -365,7 +365,7 @@ object AkkaBuild extends Build {
|
|||
id = "akka-contrib",
|
||||
base = file("akka-contrib"),
|
||||
dependencies = Seq(remote, remoteTests % "test->test", cluster, clusterTools, persistence % "compile;test->provided")
|
||||
).configs(MultiJvm)
|
||||
).configs(MultiJvm).disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
|
||||
lazy val samplesSettings = parentSettings ++ ActivatorDist.settings
|
||||
|
||||
|
|
@ -429,6 +429,7 @@ object AkkaBuild extends Build {
|
|||
executeMvnCommands("Osgi sample Dining hakkers test failed", "clean", "install")
|
||||
}}
|
||||
)
|
||||
.disablePlugins(ValidatePullRequest, MimaPlugin)
|
||||
.settings(dontPublishSettings: _*)
|
||||
|
||||
val dontPublishSettings = Seq(
|
||||
|
|
|
|||
|
|
@ -747,6 +747,10 @@ object MiMa extends AutoPlugin {
|
|||
ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.http.scaladsl.DefaultSSLContextCreation.validateAndWarnAboutLooseSettings")
|
||||
),
|
||||
"2.4.4" -> Seq(
|
||||
// Remove useUntrustedMode which is an internal API and not used anywhere anymore
|
||||
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.remote.Remoting.useUntrustedMode"),
|
||||
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.remote.RemoteTransport.useUntrustedMode"),
|
||||
|
||||
// #20080, #20081 remove race condition on HTTP client
|
||||
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.http.scaladsl.Http#HostConnectionPool.gatewayFuture"),
|
||||
ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.http.scaladsl.Http#HostConnectionPool.copy"),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue