Skip to content

Commit

Permalink
chore(deps): update kork to 7.107.0, use new maven coordinates (#935)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielpeach authored Mar 19, 2021
1 parent 99fae02 commit 9cf1f28
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 34 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ subprojects {
sourceSets.main.groovy.srcDirs += ["src/main/java"]

dependencies {
implementation platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
implementation platform("io.spinnaker.kork:kork-bom:$korkVersion")
compileOnly "org.projectlombok:lombok"
annotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
annotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion")
annotationProcessor "org.projectlombok:lombok"
testAnnotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
testAnnotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion")
testAnnotationProcessor "org.projectlombok:lombok"

implementation "org.springframework.boot:spring-boot-starter-actuator"
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
org.gradle.parallel=true
spinnakerGradleVersion=8.11.0
targetJava11=true
Expand Down
2 changes: 1 addition & 1 deletion igor-bom/igor-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
6 changes: 3 additions & 3 deletions igor-core/igor-core.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-jedis"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-jedis"
implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"

// TODO(rz): Get rid of this dependency!
Expand Down
8 changes: 4 additions & 4 deletions igor-monitor-artifactory/igor-monitor-artifactory.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
dependencies {
implementation project(":igor-core")

implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-security"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-web"

implementation "org.jfrog.artifactory.client:artifactory-java-client-services:2.8.1"

// TODO(rz): Get rid of this dependency!
implementation "com.netflix.spinnaker.kork:kork-jedis"
implementation "io.spinnaker.kork:kork-jedis"

// TODO(rz): Get rid of this dependency!
implementation "net.logstash.logback:logstash-logback-encoder"
Expand Down
8 changes: 4 additions & 4 deletions igor-monitor-plugins/igor-monitor-plugins.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
dependencies {
implementation project(":igor-core")

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

implementation "org.springframework.boot:spring-boot-starter-actuator"

Expand Down
10 changes: 5 additions & 5 deletions igor-monitor-travis/igor-monitor-travis.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ dependencies {
implementation project(":igor-core")

implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-jedis"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-jedis"
implementation "io.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-web"

implementation "com.fasterxml.jackson.core:jackson-databind"
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
Expand Down
26 changes: 13 additions & 13 deletions igor-web/igor-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ dependencies {
implementation project(":igor-monitor-plugins")
implementation project(":igor-monitor-travis")

implementation platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
implementation platform("io.spinnaker.kork:kork-bom:$korkVersion")
compileOnly "org.projectlombok:lombok"
annotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
annotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion")
annotationProcessor "org.projectlombok:lombok"
testAnnotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
testAnnotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion")
testAnnotationProcessor "org.projectlombok:lombok"

runtimeOnly "org.springframework.boot:spring-boot-properties-migrator"
Expand Down Expand Up @@ -73,14 +73,14 @@ dependencies {
implementation "com.google.apis:google-api-services-cloudbuild"
implementation "com.google.apis:google-api-services-storage"
implementation 'com.google.auth:google-auth-library-oauth2-http'
implementation "com.netflix.spinnaker.kork:kork-config"
implementation "com.netflix.spinnaker.kork:kork-cloud-config-server"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "com.netflix.spinnaker.kork:kork-jedis"
implementation "com.netflix.spinnaker.kork:kork-telemetry"
implementation "com.netflix.spinnaker.kork:kork-plugins"
implementation "io.spinnaker.kork:kork-config"
implementation "io.spinnaker.kork:kork-cloud-config-server"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-jedis"
implementation "io.spinnaker.kork:kork-telemetry"
implementation "io.spinnaker.kork:kork-plugins"

implementation "io.github.resilience4j:resilience4j-retry"

Expand All @@ -89,10 +89,10 @@ dependencies {
implementation "com.google.guava:guava"
implementation "javax.inject:javax.inject:1"

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

testImplementation "com.squareup.okhttp:mockwebserver"
testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
testImplementation "io.spinnaker.kork:kork-jedis-test"
testImplementation "org.junit.jupiter:junit-jupiter-api"
testImplementation "org.assertj:assertj-core"

Expand Down

0 comments on commit 9cf1f28

Please sign in to comment.