From 9cf1f28868963812697bb31103a4602f6ad3d07a Mon Sep 17 00:00:00 2001 From: Daniel Peach Date: Fri, 19 Mar 2021 12:55:18 -0400 Subject: [PATCH] chore(deps): update kork to 7.107.0, use new maven coordinates (#935) --- build.gradle | 6 ++--- gradle.properties | 2 +- igor-bom/igor-bom.gradle | 2 +- igor-core/igor-core.gradle | 6 ++--- .../igor-monitor-artifactory.gradle | 8 +++--- .../igor-monitor-plugins.gradle | 8 +++--- .../igor-monitor-travis.gradle | 10 +++---- igor-web/igor-web.gradle | 26 +++++++++---------- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/build.gradle b/build.gradle index 91d593dfd..c01973677 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/gradle.properties b/gradle.properties index fd0dcc0fd..765998439 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/igor-bom/igor-bom.gradle b/igor-bom/igor-bom.gradle index 0a3029cc3..f77b33d95 100644 --- a/igor-bom/igor-bom.gradle +++ b/igor-bom/igor-bom.gradle @@ -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") diff --git a/igor-core/igor-core.gradle b/igor-core/igor-core.gradle index 3e24a29eb..26e3397c6 100644 --- a/igor-core/igor-core.gradle +++ b/igor-core/igor-core.gradle @@ -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! diff --git a/igor-monitor-artifactory/igor-monitor-artifactory.gradle b/igor-monitor-artifactory/igor-monitor-artifactory.gradle index 55e3dc415..e50ed0867 100644 --- a/igor-monitor-artifactory/igor-monitor-artifactory.gradle +++ b/igor-monitor-artifactory/igor-monitor-artifactory.gradle @@ -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" diff --git a/igor-monitor-plugins/igor-monitor-plugins.gradle b/igor-monitor-plugins/igor-monitor-plugins.gradle index 455124c65..891fcb570 100644 --- a/igor-monitor-plugins/igor-monitor-plugins.gradle +++ b/igor-monitor-plugins/igor-monitor-plugins.gradle @@ -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" diff --git a/igor-monitor-travis/igor-monitor-travis.gradle b/igor-monitor-travis/igor-monitor-travis.gradle index f33f22f6d..0c7defdeb 100644 --- a/igor-monitor-travis/igor-monitor-travis.gradle +++ b/igor-monitor-travis/igor-monitor-travis.gradle @@ -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" diff --git a/igor-web/igor-web.gradle b/igor-web/igor-web.gradle index 414d72310..8ead911a2 100644 --- a/igor-web/igor-web.gradle +++ b/igor-web/igor-web.gradle @@ -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" @@ -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" @@ -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"