Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix override of akka-pki. #827

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Fix override of akka-pki. #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ lazy val core = project
.settings(commonSettings)
.settings(
name := "backbone-core",
libraryDependencies ++= Dependencies.core
libraryDependencies ++= Dependencies.core,
dependencyOverrides ++= Dependencies.dependencyOverrides
)
.dependsOn(consumer, publisher, testutils % Test)

Expand All @@ -80,7 +81,8 @@ lazy val consumer = project
.settings(commonSettings)
.settings(
name := "backbone-consumer",
libraryDependencies ++= Dependencies.consumer
libraryDependencies ++= Dependencies.consumer,
dependencyOverrides ++= Dependencies.dependencyOverrides
)
.dependsOn(testutils % Test)

Expand All @@ -89,7 +91,8 @@ lazy val publisher = project
.settings(commonSettings)
.settings(
name := "backbone-publisher",
libraryDependencies ++= Dependencies.publisher
libraryDependencies ++= Dependencies.publisher,
dependencyOverrides ++= Dependencies.dependencyOverrides
)
.dependsOn(testutils % Test)

Expand All @@ -98,7 +101,8 @@ lazy val playJson = project
.settings(commonSettings)
.settings(
name := "backbone-play-json",
libraryDependencies ++= Dependencies.jsonPlay
libraryDependencies ++= Dependencies.jsonPlay,
dependencyOverrides ++= Dependencies.dependencyOverrides
)
.dependsOn(consumer)

Expand All @@ -107,7 +111,8 @@ lazy val circe = project
.settings(commonSettings)
.settings(
name := "backbone-circe",
libraryDependencies ++= Dependencies.jsonCirce
libraryDependencies ++= Dependencies.jsonCirce,
dependencyOverrides ++= Dependencies.dependencyOverrides
)
.dependsOn(consumer)

Expand All @@ -116,7 +121,8 @@ lazy val gson = project
.settings(commonSettings)
.settings(
name := "backbone-gson",
libraryDependencies ++= Dependencies.jsonGson
libraryDependencies ++= Dependencies.jsonGson,
dependencyOverrides ++= Dependencies.dependencyOverrides
)
.dependsOn(consumer)

Expand All @@ -126,6 +132,7 @@ lazy val testutils = project
.settings(
name := "backbone-testutils",
libraryDependencies ++= Dependencies.testutils,
dependencyOverrides ++= Dependencies.dependencyOverrides,
publish / skip := true
)

Expand All @@ -135,6 +142,7 @@ lazy val integrationtest = project
.settings(
name := "backbone-integration-test",
libraryDependencies ++= Dependencies.integrationtest,
dependencyOverrides ++= Dependencies.dependencyOverrides,
run / fork := true,
publish / skip := true
)
Expand Down
5 changes: 4 additions & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ object Dependencies {

val testutils: Seq[ModuleID] = Seq(
"com.github.matsluni" %% "aws-spi-akka-http" % "1.0.1",
"com.typesafe.akka" %% "akka-pki" % akkaVersion, // Override version pulled in by aws-spi-akka-http
"com.github.sbt" % "junit-interface" % "0.13.3",
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
"com.typesafe.akka" %% "akka-testkit" % akkaVersion,
Expand All @@ -69,4 +68,8 @@ object Dependencies {
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
"ch.qos.logback" % "logback-classic" % logbackClassicVersion
)

val dependencyOverrides = Seq(
"com.typesafe.akka" %% "akka-pki" % akkaVersion
)
}
Loading