Skip to content

Commit

Permalink
chore(deps): update kork to 7.107.0, use new maven coordinates (spinn…
Browse files Browse the repository at this point in the history
  • Loading branch information
danielpeach authored Mar 19, 2021
1 parent 36f5b7b commit 49091ba
Show file tree
Hide file tree
Showing 28 changed files with 59 additions and 59 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ subprojects {
apply plugin: "java-library"

dependencies {
implementation(platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion"))
annotationProcessor(platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion"))
testAnnotationProcessor(platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion"))
implementation(platform("io.spinnaker.kork:kork-bom:$korkVersion"))
annotationProcessor(platform("io.spinnaker.kork:kork-bom:$korkVersion"))
testAnnotationProcessor(platform("io.spinnaker.kork:kork-bom:$korkVersion"))
implementation("org.slf4j:slf4j-api")
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fiatVersion=1.26.0
korkVersion=7.106.0
korkVersion=7.107.0
kotlinVersion=1.4.0
org.gradle.parallel=true
spinnakerGradleVersion=8.11.0
Expand Down
2 changes: 1 addition & 1 deletion keiko-redis/keiko-redis.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ dependencies {
api "com.github.ben-manes.caffeine:guava"

testImplementation project(":keiko-tck")
testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
testImplementation "io.spinnaker.kork:kork-jedis-test"
}
2 changes: 1 addition & 1 deletion keiko-spring/keiko-spring.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply from: "$rootDir/gradle/spek.gradle"
dependencies {
api project(":keiko-core")
api "org.springframework.boot:spring-boot-autoconfigure"
api("com.netflix.spinnaker.kork:kork-core") {
api("io.spinnaker.kork:kork-core") {
exclude(module: "logback-classic")
}

Expand Down
8 changes: 4 additions & 4 deletions keiko-sql/keiko-sql.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ dependencies {
api "org.funktionale:funktionale-partials"
api "com.github.ben-manes.caffeine:guava"

implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-sql"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-sql"
implementation "de.huxhorn.sulky:de.huxhorn.sulky.ulid"
implementation "io.github.resilience4j:resilience4j-retry"
implementation "javax.validation:validation-api"
implementation "org.jooq:jooq"

testImplementation project(":keiko-tck")
testImplementation "com.netflix.spinnaker.kork:kork-sql-test"
testImplementation "io.spinnaker.kork:kork-sql-test"
testImplementation "org.testcontainers:mysql"
testImplementation "mysql:mysql-connector-java"
}
8 changes: 4 additions & 4 deletions orca-api/orca-api.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ sourceSets {
dependencies {
errorprone("com.google.errorprone:error_prone_core:2.4.0")

implementation platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
annotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
implementation platform("io.spinnaker.kork:kork-bom:$korkVersion")
annotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion")

api("com.netflix.spinnaker.kork:kork-plugins-api")
api("io.spinnaker.kork:kork-plugins-api")

//TODO(jonsie): Remove this dependency
api("com.netflix.spinnaker.kork:kork-artifacts")
api("io.spinnaker.kork:kork-artifacts")

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
Expand Down
2 changes: 1 addition & 1 deletion orca-bakery/orca-bakery.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
implementation("com.fasterxml.jackson.datatype:jackson-datatype-guava")
implementation("com.netflix.spinnaker.fiat:fiat-core:$fiatVersion")

api("com.netflix.spinnaker.kork:kork-web")
api("io.spinnaker.kork:kork-web")

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
Expand Down
2 changes: 1 addition & 1 deletion orca-bom/orca-bom.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ javaPlatform {
}

dependencies {
api(platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion"))
api(platform("io.spinnaker.kork:kork-bom:$korkVersion"))

constraints {
api("com.netflix.spinnaker.fiat:fiat-api:$fiatVersion")
Expand Down
4 changes: 2 additions & 2 deletions orca-clouddriver/orca-clouddriver.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ dependencies {
implementation(project(":orca-api"))
implementation(project(":orca-bakery"))
implementation(project(":orca-deploymentmonitor"))
implementation("com.netflix.spinnaker.kork:kork-moniker")
implementation("io.spinnaker.kork:kork-moniker")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
implementation("io.kubernetes:client-java:5.0.0")
implementation("javax.validation:validation-api")
implementation("org.jetbrains:annotations")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-guava")

api("com.netflix.spinnaker.kork:kork-web")
api("io.spinnaker.kork:kork-web")

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
Expand Down
18 changes: 9 additions & 9 deletions orca-core/orca-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ apply from: "$rootDir/gradle/spek.gradle"

dependencies {
api("de.huxhorn.sulky:de.huxhorn.sulky.ulid")
api("com.netflix.spinnaker.kork:kork-artifacts")
api("com.netflix.spinnaker.kork:kork-core")
api("com.netflix.spinnaker.kork:kork-exceptions")
api("com.netflix.spinnaker.kork:kork-expressions")
api("com.netflix.spinnaker.kork:kork-moniker")
api("com.netflix.spinnaker.kork:kork-plugins")
api("com.netflix.spinnaker.kork:kork-security")
api("com.netflix.spinnaker.kork:kork-telemetry")
api("io.spinnaker.kork:kork-artifacts")
api("io.spinnaker.kork:kork-core")
api("io.spinnaker.kork:kork-exceptions")
api("io.spinnaker.kork:kork-expressions")
api("io.spinnaker.kork:kork-moniker")
api("io.spinnaker.kork:kork-plugins")
api("io.spinnaker.kork:kork-security")
api("io.spinnaker.kork:kork-telemetry")
api("io.reactivex:rxjava")

api(project(":orca-api"))
Expand All @@ -41,7 +41,7 @@ dependencies {
implementation("com.fasterxml.jackson.datatype:jackson-datatype-guava")
implementation("com.netflix.frigga:frigga")
implementation("com.netflix.spectator:spectator-api")
implementation("com.netflix.spinnaker.kork:kork-core")
implementation("io.spinnaker.kork:kork-core")
implementation("net.logstash.logback:logstash-logback-encoder")
implementation("org.springframework.security:spring-security-web")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
Expand Down
2 changes: 1 addition & 1 deletion orca-echo/orca-echo.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
implementation(project(":orca-igor"))
implementation(project(":orca-front50"))
implementation(project(":orca-dry-run"))
implementation("com.netflix.spinnaker.kork:kork-core")
implementation("io.spinnaker.kork:kork-core")
implementation("org.springframework.boot:spring-boot-autoconfigure")
implementation("javax.validation:validation-api")
implementation("com.netflix.spinnaker.fiat:fiat-core:$fiatVersion")
Expand Down
4 changes: 2 additions & 2 deletions orca-flex/orca-flex.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ dependencies {
implementation("org.springframework:spring-context")
implementation("org.springframework.boot:spring-boot-autoconfigure")
implementation("com.netflix.frigga:frigga")
implementation("com.netflix.spinnaker.kork:kork-core")
implementation("com.netflix.spinnaker.kork:kork-moniker")
implementation("io.spinnaker.kork:kork-core")
implementation("io.spinnaker.kork:kork-moniker")
}
2 changes: 1 addition & 1 deletion orca-igor/orca-igor.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
implementation(project(":orca-retrofit"))
implementation(project(":orca-clouddriver"))
implementation(project(":orca-front50"))
implementation("com.netflix.spinnaker.kork:kork-core")
implementation("io.spinnaker.kork:kork-core")
implementation("org.springframework.boot:spring-boot-autoconfigure")
implementation("org.yaml:snakeyaml")

Expand Down
4 changes: 2 additions & 2 deletions orca-interlink/orca-interlink.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ apply from: "$rootDir/gradle/spock.gradle"
apply plugin: "java"

dependencies {
api("com.netflix.spinnaker.kork:kork-pubsub")
api("com.netflix.spinnaker.kork:kork-pubsub-aws")
api("io.spinnaker.kork:kork-pubsub")
api("io.spinnaker.kork:kork-pubsub-aws")

implementation(project(":orca-core"))
implementation("com.amazonaws:aws-java-sdk-sqs")
Expand Down
2 changes: 1 addition & 1 deletion orca-kayenta/orca-kayenta.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
implementation("org.springframework:spring-context")
implementation("org.springframework.boot:spring-boot-autoconfigure")
implementation("com.netflix.frigga:frigga")
implementation("com.netflix.spinnaker.kork:kork-moniker")
implementation("io.spinnaker.kork:kork-moniker")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

testImplementation(project(":orca-test-kotlin"))
Expand Down
2 changes: 1 addition & 1 deletion orca-peering/orca-peering.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ apply from: "$rootDir/gradle/spock.gradle"
dependencies {
implementation(project(":orca-core"))

implementation("com.netflix.spinnaker.kork:kork-sql")
implementation("io.spinnaker.kork:kork-sql")
implementation("org.jooq:jooq")
implementation("org.springframework.boot:spring-boot-autoconfigure")

Expand Down
2 changes: 1 addition & 1 deletion orca-pipelinetemplate/orca-pipelinetemplate.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.netflix.spectator:spectator-api")
implementation("com.netflix.frigga:frigga")
implementation("com.netflix.spinnaker.kork:kork-exceptions")
implementation("io.spinnaker.kork:kork-exceptions")
implementation("com.squareup.okhttp3:okhttp")
implementation("commons-codec:commons-codec")
implementation("javax.validation:validation-api")
Expand Down
2 changes: 1 addition & 1 deletion orca-plugins-test/orca-plugins-test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
testImplementation(project(":orca-clouddriver"))

testImplementation(project(":keiko-mem"))
testImplementation("com.netflix.spinnaker.kork:kork-plugins-tck")
testImplementation("io.spinnaker.kork:kork-plugins-tck")

testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-properties")
Expand Down
2 changes: 1 addition & 1 deletion orca-qos/orca-qos.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
implementation(project(":orca-core"))
implementation(project(":orca-front50"))
implementation(project(":orca-queue"))
implementation("com.netflix.spinnaker.kork:kork-core")
implementation("io.spinnaker.kork:kork-core")
implementation("com.netflix.spectator:spectator-api")
implementation("net.logstash.logback:logstash-logback-encoder")

Expand Down
4 changes: 2 additions & 2 deletions orca-queue-redis/orca-queue-redis.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
testImplementation(project(":orca-test-redis"))
testImplementation("org.springframework:spring-test")
testImplementation("org.springframework.boot:spring-boot-test")
testImplementation("com.netflix.spinnaker.kork:kork-jedis-test")
testImplementation("io.spinnaker.kork:kork-jedis-test")

testImplementation("com.netflix.spinnaker.kork:kork-core")
testImplementation("io.spinnaker.kork:kork-core")
}
6 changes: 3 additions & 3 deletions orca-queue-sql/orca-queue-sql.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ apply from: "$rootDir/gradle/spek.gradle"
dependencies {
implementation(project(":orca-core"))
implementation(project(":orca-queue"))
api("com.netflix.spinnaker.kork:kork-sql")
api("com.netflix.spinnaker.kork:kork-jedis")
api("io.spinnaker.kork:kork-sql")
api("io.spinnaker.kork:kork-jedis")
api(project(":keiko-sql"))
implementation(project(":orca-sql"))
implementation(project(":keiko-redis-spring"))
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

implementation("org.jooq:jooq")

testImplementation("com.netflix.spinnaker.kork:kork-sql-test")
testImplementation("io.spinnaker.kork:kork-sql-test")
testImplementation(project(":orca-redis"))
testImplementation(project(":orca-test-redis"))
testImplementation(project(":orca-queue-tck"))
Expand Down
2 changes: 1 addition & 1 deletion orca-queue/orca-queue.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
implementation("com.github.ben-manes.caffeine:guava")

testImplementation("com.netflix.spinnaker.kork:kork-jedis-test")
testImplementation("io.spinnaker.kork:kork-jedis-test")
testImplementation(project(":orca-api-tck"))
testImplementation(project(":orca-test-kotlin"))
testImplementation(project(":orca-queue-tck"))
Expand Down
4 changes: 2 additions & 2 deletions orca-redis/orca-redis.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply from: "$rootDir/gradle/kotlin.gradle"
apply from: "$rootDir/gradle/spock.gradle"

dependencies {
api("com.netflix.spinnaker.kork:kork-jedis")
api("io.spinnaker.kork:kork-jedis")

implementation(project(":orca-core"))
implementation(project(":orca-front50"))
Expand All @@ -12,5 +12,5 @@ dependencies {
testImplementation(project(":orca-core-tck"))
testImplementation(project(":orca-test-redis"))
testImplementation(project(":orca-test-groovy"))
testImplementation("com.netflix.spinnaker.kork:kork-jedis-test")
testImplementation("io.spinnaker.kork:kork-jedis-test")
}
2 changes: 1 addition & 1 deletion orca-retrofit/orca-retrofit.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
api("com.squareup.retrofit:retrofit")
api("com.squareup.retrofit:converter-jackson")
api("org.codehaus.groovy:groovy")
api("com.netflix.spinnaker.kork:kork-web")
api("io.spinnaker.kork:kork-web")
api("com.jakewharton.retrofit:retrofit1-okhttp3-client")

implementation(project(":orca-core"))
Expand Down
8 changes: 4 additions & 4 deletions orca-sql/orca-sql.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ dependencies {
implementation(project(":orca-interlink"))
implementation(project(":orca-queue"))

implementation("com.netflix.spinnaker.kork:kork-sql")
implementation("com.netflix.spinnaker.kork:kork-telemetry")
implementation("io.spinnaker.kork:kork-sql")
implementation("io.spinnaker.kork:kork-telemetry")
implementation("com.netflix.spectator:spectator-api")
implementation("com.netflix.spinnaker.kork:kork-core")
implementation("io.spinnaker.kork:kork-core")
implementation("org.springframework:spring-jdbc")
implementation("org.springframework:spring-tx")
implementation("org.springframework.boot:spring-boot-autoconfigure")
Expand All @@ -39,7 +39,7 @@ dependencies {

testImplementation(project(":orca-core-tck"))
testImplementation(project(":orca-test-groovy"))
testImplementation("com.netflix.spinnaker.kork:kork-sql-test")
testImplementation("io.spinnaker.kork:kork-sql-test")
testImplementation("io.strikt:strikt-core")
testImplementation("org.assertj:assertj-core")
testImplementation("org.junit.jupiter:junit-jupiter-api")
Expand Down
4 changes: 2 additions & 2 deletions orca-test-redis/orca-test-redis.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
implementation("redis.clients:jedis")
implementation("com.netflix.spinnaker.kork:kork-jedis")
implementation("io.spinnaker.kork:kork-jedis")
implementation(project(":orca-test"))
implementation("com.netflix.spinnaker.kork:kork-jedis-test")
implementation("io.spinnaker.kork:kork-jedis-test")
}
8 changes: 4 additions & 4 deletions orca-web/orca-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ dependencies {
implementation(project(":orca-remote-stage"))
implementation(project(":orca-sql"))
implementation(project(":orca-webhook"))
implementation("com.netflix.spinnaker.kork:kork-exceptions")
implementation("com.netflix.spinnaker.kork:kork-web")
implementation("com.netflix.spinnaker.kork:kork-plugins")
implementation("io.spinnaker.kork:kork-exceptions")
implementation("io.spinnaker.kork:kork-web")
implementation("io.spinnaker.kork:kork-plugins")
implementation("net.logstash.logback:logstash-logback-encoder")
implementation("com.netflix.spinnaker.fiat:fiat-api:$fiatVersion")
implementation("com.netflix.spinnaker.fiat:fiat-core:$fiatVersion")

runtimeOnly("com.netflix.spinnaker.kork:kork-runtime")
runtimeOnly("io.spinnaker.kork:kork-runtime")

if (!rootProject.hasProperty("excludeSqlDrivers")) {
runtimeOnly(project(":orca-sql-mysql"))
Expand Down
4 changes: 2 additions & 2 deletions orca-webhook/orca-webhook.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ apply from: "$rootDir/gradle/groovy.gradle"
dependencies {
implementation(project(":orca-core"))
implementation(project(":orca-api"))
implementation("com.netflix.spinnaker.kork:kork-core")
implementation("com.netflix.spinnaker.kork:kork-web")
implementation("io.spinnaker.kork:kork-core")
implementation("io.spinnaker.kork:kork-web")
implementation("org.springframework.boot:spring-boot-autoconfigure")
compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
Expand Down

0 comments on commit 49091ba

Please sign in to comment.