Skip to content

Commit

Permalink
chore(deps): update kork to 7.107.0, use new maven coordinates (#1095)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielpeach authored Mar 19, 2021
1 parent b42e547 commit 65109f5
Show file tree
Hide file tree
Showing 19 changed files with 55 additions and 55 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ subprojects {
}

dependencies {
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")
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
testAnnotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
testAnnotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion")
compileOnly "org.projectlombok:lombok"
annotationProcessor "org.projectlombok:lombok"
testAnnotationProcessor "org.projectlombok:lombok"
Expand Down
6 changes: 3 additions & 3 deletions echo-api/echo-api.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
apply from: "${project.rootDir}/gradle/kotlin.gradle"

dependencies {
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"

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
Expand Down
4 changes: 2 additions & 2 deletions echo-artifacts/echo-artifacts.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation "com.squareup.retrofit:retrofit"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "org.springframework.boot:spring-boot-starter-web"
}
2 changes: 1 addition & 1 deletion echo-bom/echo-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
12 changes: 6 additions & 6 deletions echo-core/echo-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ dependencies {
api project(":echo-api")
implementation project(":echo-model")

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

implementation "com.squareup.retrofit:retrofit"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "com.squareup.okhttp:okhttp"
implementation "com.squareup.okhttp:okhttp-urlconnection"
implementation "com.squareup.okhttp:okhttp-apache"

implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-security"

implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.apache.commons:commons-lang3"
Expand Down
4 changes: 2 additions & 2 deletions echo-model/echo-model.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

dependencies {
api project (":echo-api")
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "org.springframework:spring-web"

testImplementation project(":echo-core")
Expand Down
6 changes: 3 additions & 3 deletions echo-notifications/echo-notifications.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ dependencies {
implementation "com.squareup.okhttp:okhttp-urlconnection"
implementation "com.squareup.okhttp:okhttp-apache"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-web"
implementation "commons-codec:commons-codec"
implementation "org.springframework.boot:spring-boot-starter-mail"
implementation "org.springframework.boot:spring-boot-starter-freemarker"
Expand Down
12 changes: 6 additions & 6 deletions echo-pipelinetriggers/echo-pipelinetriggers.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@ test {

dependencies {
implementation project(':echo-model')
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "com.squareup.retrofit:retrofit"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-web"
implementation "com.squareup.okhttp:okhttp"
implementation "com.squareup.okhttp:okhttp-urlconnection"
implementation "com.squareup.okhttp:okhttp-apache"

implementation project(':echo-core')
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "com.netflix.spinnaker.kork:kork-expressions"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-expressions"

implementation "org.springframework.boot:spring-boot-starter-web"
implementation "com.fasterxml.jackson.core:jackson-databind"
Expand Down
6 changes: 3 additions & 3 deletions echo-plugins-test/echo-plugins-test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ apply from: "${project.rootDir}/gradle/kotlin.gradle"

dependencies {
implementation(project(":echo-api"))
implementation("com.netflix.spinnaker.kork:kork-exceptions")
implementation("io.spinnaker.kork:kork-exceptions")

testImplementation(project(":echo-web"))
testImplementation(project(":echo-core"))

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

testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
Expand Down
6 changes: 3 additions & 3 deletions echo-pubsub-aws/echo-pubsub-aws.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ dependencies {
implementation project(':echo-model')
implementation project(':echo-pubsub-core')
implementation "com.amazonaws:aws-java-sdk-sqs"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-aws"
implementation "com.netflix.spinnaker.kork:kork-pubsub-aws"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-aws"
implementation "io.spinnaker.kork:kork-pubsub-aws"
implementation "com.netflix.spectator:spectator-api"
implementation "javax.validation:validation-api"
}
8 changes: 4 additions & 4 deletions echo-pubsub-core/echo-pubsub-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ dependencies {
implementation "redis.clients:jedis"
implementation "io.reactivex:rxjava"
implementation "com.hubspot.jinjava:jinjava"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-jedis"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-jedis"
implementation "io.spinnaker.kork:kork-artifacts"
testImplementation "io.spinnaker.kork:kork-jedis-test"
}
6 changes: 3 additions & 3 deletions echo-pubsub-google/echo-pubsub-google.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ dependencies {
implementation project(':echo-notifications')
implementation "com.squareup.retrofit:retrofit"
implementation 'com.google.cloud:google-cloud-pubsub:1.101.0'
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-security"
implementation 'org.apache.commons:commons-lang3'
implementation 'org.springframework.boot:spring-boot-autoconfigure'
implementation "javax.validation:validation-api"
Expand Down
2 changes: 1 addition & 1 deletion echo-rest/echo-rest.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {

implementation "commons-codec:commons-codec"

implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-web"
implementation "com.fasterxml.jackson.core:jackson-databind"
testImplementation "org.spockframework:spock-spring"
testImplementation "org.springframework.boot:spring-boot-starter-test"
Expand Down
4 changes: 2 additions & 2 deletions echo-scheduler/echo-scheduler.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies {
implementation "com.squareup.okhttp:okhttp-apache"

implementation "com.netflix.spectator:spectator-api"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-sql"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-sql"

if (!rootProject.hasProperty("excludeSqlDrivers")) {
runtimeOnly "mysql:mysql-connector-java"
Expand Down
10 changes: 5 additions & 5 deletions echo-telemetry/echo-telemetry.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ dependencies {
api project(':echo-api')
implementation project(':echo-model')
implementation project(':echo-core')
implementation "com.netflix.spinnaker.kork:kork-jedis"
implementation "io.spinnaker.kork:kork-jedis"
implementation 'com.google.protobuf:protobuf-java-util'
implementation "com.netflix.spinnaker.kork:kork-proto"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation 'com.netflix.spinnaker.kork:kork-web'
implementation "io.spinnaker.kork:kork-proto"
implementation "io.spinnaker.kork:kork-security"
implementation 'io.spinnaker.kork:kork-web'
implementation 'com.squareup.retrofit:retrofit'
implementation 'com.squareup.retrofit:converter-jackson'
implementation 'de.huxhorn.sulky:de.huxhorn.sulky.ulid'
implementation "org.apache.commons:commons-lang3"
testImplementation 'io.mockk:mockk'
testImplementation 'io.strikt:strikt-core'
testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
testImplementation "io.spinnaker.kork:kork-jedis-test"
}

test {
Expand Down
2 changes: 1 addition & 1 deletion echo-test/echo-test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
implementation project(':echo-core')
implementation project(':echo-model')
implementation project(':echo-pipelinetriggers')
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "com.squareup.retrofit:retrofit"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.squareup.okhttp:okhttp"
Expand Down
10 changes: 5 additions & 5 deletions echo-web/echo-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ dependencies {
implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-config"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-config"
implementation "io.spinnaker.kork:kork-web"
implementation "com.squareup.retrofit:retrofit"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
Expand All @@ -56,7 +56,7 @@ dependencies {
exclude group: 'com.zaxxer', module: 'HikariCP-java7'
}

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

testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "org.spockframework:spock-spring"
Expand Down
2 changes: 1 addition & 1 deletion echo-webhooks/echo-webhooks.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
implementation project(':echo-core')
implementation project(':echo-model')
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-artifacts"

testImplementation "org.junit.jupiter:junit-jupiter-api"
testImplementation "org.assertj:assertj-core"
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

0 comments on commit 65109f5

Please sign in to comment.