chore(dependencies): Add keiko-spring to orca-web and fixup some depe…

…ndency implementations (#3898)
spinnaker · Sep 8, 2020 · df8cd2b · df8cd2b
1 parent a79f134
commit df8cd2b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/orca-api-tck/orca-api-tck.gradle b/orca-api-tck/orca-api-tck.gradle
@@ -21,7 +21,7 @@ dependencies {
   implementation(project(":orca-api"))
   implementation(project(":orca-queue"))
   implementation(project(":orca-web"))
-  implementation("com.netflix.spinnaker.keiko:keiko-mem:$keikoVersion")
+  implementation(project(":keiko-mem"))
 
   // Test framework dependencies
   api("org.junit.jupiter:junit-jupiter-api")

diff --git a/orca-plugins-test/orca-plugins-test.gradle b/orca-plugins-test/orca-plugins-test.gradle
@@ -23,7 +23,7 @@ dependencies {
   testImplementation(project(":orca-queue"))
   testImplementation(project(":orca-clouddriver"))
 
-  testImplementation("com.netflix.spinnaker.keiko:keiko-mem:$keikoVersion")
+  testImplementation(project(":keiko-mem"))
   testImplementation("com.netflix.spinnaker.kork:kork-plugins-tck")
 
   testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")

diff --git a/orca-queue-tck/orca-queue-tck.gradle b/orca-queue-tck/orca-queue-tck.gradle
@@ -29,7 +29,6 @@ dependencies {
   implementation("org.springframework.boot:spring-boot-test")
   implementation(project(":keiko-mem"))
   implementation(project(":keiko-spring"))
-  implementation("com.netflix.spinnaker.keiko:keiko-spring:$keikoVersion")
   implementation("junit:junit")
   implementation("org.springframework:spring-test")
 

diff --git a/orca-sql/orca-sql.gradle b/orca-sql/orca-sql.gradle
@@ -19,14 +19,15 @@ apply from: "$rootDir/gradle/spock.gradle"
 apply plugin: "java"
 
 dependencies {
+  implementation(project(":keiko-core"))
+
   implementation(project(":orca-core"))
   implementation(project(":orca-interlink"))
   implementation(project(":orca-queue"))
 
   implementation("com.netflix.spinnaker.kork:kork-sql")
   implementation("com.netflix.spinnaker.kork:kork-telemetry")
   implementation("com.netflix.spectator:spectator-api")
-  implementation("com.netflix.spinnaker.keiko:keiko-core:$keikoVersion")
   implementation("com.netflix.spinnaker.kork:kork-core")
   implementation("org.springframework:spring-jdbc")
   implementation("org.springframework:spring-tx")

diff --git a/orca-web/orca-web.gradle b/orca-web/orca-web.gradle
@@ -33,6 +33,8 @@ dependencies {
   implementation("org.springframework.boot:spring-boot-starter-actuator")
   implementation("net.logstash.logback:logstash-logback-encoder")
 
+  implementation(project(":keiko-spring"))
+
   implementation(project(":orca-api"))
   implementation(project(":orca-applications"))
   implementation(project(":orca-bakery"))
@@ -91,7 +93,7 @@ dependencies {
   testImplementation("cglib:cglib-nodep")
   testImplementation("org.objenesis:objenesis")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
-  testImplementation("com.netflix.spinnaker.keiko:keiko-mem:$keikoVersion")
+  testImplementation(project(":keiko-mem"))
 
   testImplementation(project(":orca-api-tck"))
   testImplementation("dev.minutest:minutest")