From 6f7a545e2a1b0ff3e00b249f4b60a18ebded8912 Mon Sep 17 00:00:00 2001 From: Luis Pollo Date: Thu, 7 Oct 2021 01:50:59 +0000 Subject: [PATCH] chore(build): Align kork/fiat coordinates on com.spinnaker.netflix.{}.internal Squashed commit of the following: commit b59e5329982e47c151004efc0f492774d7db5bfd Author: Adam Jordens Date: Wed Oct 6 17:28:04 2021 -0700 chore(build): Align kork/fiat coordinates on com.spinnaker.netflix.{}.internal commit 000d61d09c3d57b08468712cb48326393cafc3f9 Author: Adam Jordens Date: Wed Oct 6 17:27:58 2021 -0700 Update dependency lock (cherry picked from commit 524b762e51596694a77edfa338af8caa87d9d8d8) --- build.gradle | 4 ++-- keel-api/keel-api.gradle | 4 ++-- keel-artifact/keel-artifact.gradle | 2 +- keel-bakery-plugin/keel-bakery-plugin.gradle | 4 ++-- keel-bom/keel-bom.gradle | 2 +- keel-clouddriver/keel-clouddriver.gradle | 2 +- keel-core/keel-core.gradle | 10 +++++----- keel-ec2-plugin/keel-ec2-plugin.gradle | 6 +++--- keel-retrofit/keel-retrofit.gradle | 8 ++++---- keel-sql/keel-sql.gradle | 8 ++++---- keel-titus-plugin/keel-titus-plugin.gradle | 4 ++-- keel-web/keel-web.gradle | 18 +++++++++--------- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index 388a268f91..fe1276a180 100644 --- a/build.gradle +++ b/build.gradle @@ -37,10 +37,10 @@ allprojects { } dependencies { - annotationProcessor(platform("io.spinnaker.kork:kork-bom:${korkVersion}")) + annotationProcessor(platform("com.netflix.spinnaker.kork.internal:kork-bom")) annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") - implementation(platform("io.spinnaker.kork:kork-bom:${korkVersion}")) + implementation(platform("com.netflix.spinnaker.kork.internal:kork-bom")) implementation("org.slf4j:slf4j-api") testImplementation("org.junit.platform:junit-platform-runner") diff --git a/keel-api/keel-api.gradle b/keel-api/keel-api.gradle index 21814879bd..33c01fe382 100644 --- a/keel-api/keel-api.gradle +++ b/keel-api/keel-api.gradle @@ -6,8 +6,8 @@ * dependencies along for the ride -- ideally nothing at all. */ dependencies { - api("io.spinnaker.kork:kork-plugins-api") - api("io.spinnaker.kork:kork-exceptions") + api("com.netflix.spinnaker.kork.internal:kork-plugins-api") + api("com.netflix.spinnaker.kork.internal:kork-exceptions") api("de.huxhorn.sulky:de.huxhorn.sulky.ulid") testImplementation("io.strikt:strikt-core") testImplementation("dev.minutest:minutest") diff --git a/keel-artifact/keel-artifact.gradle b/keel-artifact/keel-artifact.gradle index 83de10d942..8e32a3d3b8 100644 --- a/keel-artifact/keel-artifact.gradle +++ b/keel-artifact/keel-artifact.gradle @@ -3,7 +3,7 @@ dependencies { implementation(project(":keel-igor")) implementation(project(":keel-clouddriver")) implementation("org.springframework:spring-context") - implementation("io.spinnaker.kork:kork-artifacts") + implementation("com.netflix.spinnaker.kork.internal:kork-artifacts") testImplementation("dev.minutest:minutest") testImplementation("io.strikt:strikt-core") testImplementation(project(":keel-test")) diff --git a/keel-bakery-plugin/keel-bakery-plugin.gradle b/keel-bakery-plugin/keel-bakery-plugin.gradle index 6d599b0623..53eb18d2ce 100644 --- a/keel-bakery-plugin/keel-bakery-plugin.gradle +++ b/keel-bakery-plugin/keel-bakery-plugin.gradle @@ -5,8 +5,8 @@ dependencies { implementation(project(":keel-igor")) implementation(project(":keel-orca")) implementation(project(":keel-artifact")) - implementation("io.spinnaker.kork:kork-exceptions") - implementation("io.spinnaker.kork:kork-security") + implementation("com.netflix.spinnaker.kork.internal:kork-exceptions") + implementation("com.netflix.spinnaker.kork.internal:kork-security") implementation("com.netflix.frigga:frigga") testImplementation(project(":keel-test")) diff --git a/keel-bom/keel-bom.gradle b/keel-bom/keel-bom.gradle index cd2ab5fce5..58dad3be7a 100644 --- a/keel-bom/keel-bom.gradle +++ b/keel-bom/keel-bom.gradle @@ -7,7 +7,7 @@ javaPlatform { } dependencies { - api(platform("io.spinnaker.kork:kork-bom:${korkVersion}")) + api(platform("com.netflix.spinnaker.kork.internal:kork-bom")) constraints { rootProject .subprojects diff --git a/keel-clouddriver/keel-clouddriver.gradle b/keel-clouddriver/keel-clouddriver.gradle index 0ff385e264..514ac5e112 100644 --- a/keel-clouddriver/keel-clouddriver.gradle +++ b/keel-clouddriver/keel-clouddriver.gradle @@ -1,7 +1,7 @@ dependencies { implementation(project(":keel-retrofit")) implementation(project(":keel-core")) - implementation("io.spinnaker.kork:kork-moniker") + implementation("com.netflix.spinnaker.kork.internal:kork-moniker") implementation("com.fasterxml.jackson.core:jackson-databind") implementation("com.fasterxml.jackson.core:jackson-annotations") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") diff --git a/keel-core/keel-core.gradle b/keel-core/keel-core.gradle index d2c10407e8..d710cf05b1 100644 --- a/keel-core/keel-core.gradle +++ b/keel-core/keel-core.gradle @@ -8,7 +8,7 @@ dependencies { api("org.springframework:spring-context") api("org.springframework.boot:spring-boot-autoconfigure") api("com.netflix.frigga:frigga") - api("io.spinnaker.kork:kork-core") + api("com.netflix.spinnaker.kork.internal:kork-core") api("net.swiftzer.semver:semver:1.1.0") api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8") api("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j") @@ -20,11 +20,11 @@ dependencies { implementation("io.github.resilience4j:resilience4j-kotlin") implementation("io.github.resilience4j:resilience4j-retry") implementation("com.newrelic.agent.java:newrelic-api:6.1.0") - implementation("io.spinnaker.kork:kork-plugins") + implementation("com.netflix.spinnaker.kork.internal:kork-plugins") implementation("org.jgrapht:jgrapht-core:1.5.1") - implementation("io.spinnaker.kork:kork-web") - implementation("io.spinnaker.fiat:fiat-api:${fiatVersion}") - implementation("io.spinnaker.fiat:fiat-core:${fiatVersion}") + implementation("com.netflix.spinnaker.kork.internal:kork-web") + implementation("com.netflix.spinnaker.fiat.internal:fiat-api") + implementation("com.netflix.spinnaker.fiat.internal:fiat-core") implementation(project(":keel-ec2-api")) // needed for resource dependency logic testImplementation(project(":keel-test")) diff --git a/keel-ec2-plugin/keel-ec2-plugin.gradle b/keel-ec2-plugin/keel-ec2-plugin.gradle index a468ba6fa6..6b0ae9a76d 100644 --- a/keel-ec2-plugin/keel-ec2-plugin.gradle +++ b/keel-ec2-plugin/keel-ec2-plugin.gradle @@ -8,8 +8,8 @@ dependencies { implementation(project(":keel-retrofit")) implementation(project(":keel-artifact")) implementation(project(":keel-igor")) - implementation("io.spinnaker.kork:kork-core") - implementation("io.spinnaker.kork:kork-web") + implementation("com.netflix.spinnaker.kork.internal:kork-core") + implementation("com.netflix.spinnaker.kork.internal:kork-web") implementation("org.springframework:spring-context") implementation("org.springframework.boot:spring-boot-autoconfigure") implementation("com.netflix.frigga:frigga") @@ -19,7 +19,7 @@ dependencies { testImplementation(project(":keel-test")) testImplementation(project(":keel-retrofit-test-support")) testImplementation(project(":keel-spring-test-support")) - testImplementation("io.spinnaker.kork:kork-plugins") + testImplementation("com.netflix.spinnaker.kork.internal:kork-plugins") testImplementation("io.strikt:strikt-jackson") testImplementation("io.strikt:strikt-jvm") testImplementation("dev.minutest:minutest") diff --git a/keel-retrofit/keel-retrofit.gradle b/keel-retrofit/keel-retrofit.gradle index eb7220ba41..5e9629afc5 100644 --- a/keel-retrofit/keel-retrofit.gradle +++ b/keel-retrofit/keel-retrofit.gradle @@ -3,11 +3,11 @@ dependencies { api("com.squareup.retrofit2:converter-jackson") api("org.jetbrains.kotlinx:kotlinx-coroutines-core") - api("io.spinnaker.kork:kork-web") - implementation("io.spinnaker.kork:kork-security") + api("com.netflix.spinnaker.kork.internal:kork-web") + implementation("com.netflix.spinnaker.kork.internal:kork-security") implementation("com.squareup.okhttp3:logging-interceptor") - implementation("io.spinnaker.fiat:fiat-api:${fiatVersion}") - implementation("io.spinnaker.fiat:fiat-core:${fiatVersion}") + implementation("com.netflix.spinnaker.fiat.internal:fiat-api") + implementation("com.netflix.spinnaker.fiat.internal:fiat-core") testImplementation("com.squareup.okhttp3:mockwebserver") testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin") diff --git a/keel-sql/keel-sql.gradle b/keel-sql/keel-sql.gradle index f646c09821..627ffe5c49 100644 --- a/keel-sql/keel-sql.gradle +++ b/keel-sql/keel-sql.gradle @@ -20,7 +20,7 @@ clean { dependencies { implementation(project(":keel-core")) implementation(project(":keel-artifact")) - implementation("io.spinnaker.kork:kork-sql") + implementation("com.netflix.spinnaker.kork.internal:kork-sql") implementation("org.springframework:spring-jdbc") implementation("org.springframework:spring-tx") implementation("org.jooq:jooq") @@ -29,7 +29,7 @@ dependencies { runtimeOnly("mysql:mysql-connector-java") - testImplementation("io.spinnaker.kork:kork-sql-test") + testImplementation("com.netflix.spinnaker.kork.internal:kork-sql-test") testImplementation("io.strikt:strikt-core") testImplementation(project(":keel-spring-test-support")) testImplementation(project(":keel-test")) @@ -40,12 +40,12 @@ dependencies { } testImplementation("org.testcontainers:mysql:${testContainersVersion}") - jooqGenerator(platform("io.spinnaker.kork:kork-bom:${korkVersion}")) + jooqGenerator(platform("com.netflix.spinnaker.netflixplatform:netflixplatform-bom:${netflixplatformVersion}")) jooqGenerator("mysql:mysql-connector-java") jooqGenerator("org.jooq:jooq-meta-extensions") jooqGenerator("ch.qos.logback:logback-classic:1.2.3") - liquibaseRuntime(platform("io.spinnaker.kork:kork-bom:${korkVersion}")) + liquibaseRuntime(platform("com.netflix.spinnaker.netflixplatform:netflixplatform-bom:${netflixplatformVersion}")) liquibaseRuntime("org.liquibase:liquibase-core:3.8.9") liquibaseRuntime("ch.qos.logback:logback-classic:1.2.3") liquibaseRuntime("org.yaml:snakeyaml:1.28") diff --git a/keel-titus-plugin/keel-titus-plugin.gradle b/keel-titus-plugin/keel-titus-plugin.gradle index 9cb1b36276..031e1faf90 100644 --- a/keel-titus-plugin/keel-titus-plugin.gradle +++ b/keel-titus-plugin/keel-titus-plugin.gradle @@ -9,8 +9,8 @@ dependencies { implementation(project(":keel-docker")) implementation(project(":keel-artifact")) implementation(project(":keel-network")) - implementation("io.spinnaker.kork:kork-core") - implementation("io.spinnaker.kork:kork-web") + implementation("com.netflix.spinnaker.kork.internal:kork-core") + implementation("com.netflix.spinnaker.kork.internal:kork-web") implementation("org.springframework:spring-context") implementation("org.springframework.boot:spring-boot-autoconfigure") implementation("com.netflix.frigga:frigga") diff --git a/keel-web/keel-web.gradle b/keel-web/keel-web.gradle index cd0db46634..e4f4a9f448 100644 --- a/keel-web/keel-web.gradle +++ b/keel-web/keel-web.gradle @@ -36,24 +36,24 @@ dependencies { implementation(project(":keel-scm")) implementation(project(":keel-retrofit")) - implementation("io.spinnaker.kork:kork-web") - implementation("io.spinnaker.kork:kork-artifacts") - implementation("io.spinnaker.kork:kork-encryption") + implementation("com.netflix.spinnaker.kork.internal:kork-web") + implementation("com.netflix.spinnaker.kork.internal:kork-artifacts") + implementation("com.netflix.spinnaker.kork.internal:kork-encryption") implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.security:spring-security-config") - implementation("io.spinnaker.fiat:fiat-api:${fiatVersion}") - implementation("io.spinnaker.fiat:fiat-core:${fiatVersion}") + implementation("com.netflix.spinnaker.fiat.internal:fiat-api") + implementation("com.netflix.spinnaker.fiat.internal:fiat-core") implementation("net.logstash.logback:logstash-logback-encoder") implementation("io.swagger.core.v3:swagger-annotations:2.1.2") implementation("org.apache.maven:maven-artifact:3.6.3") - implementation("io.spinnaker.kork:kork-plugins") + implementation("com.netflix.spinnaker.kork.internal:kork-plugins") implementation("com.slack.api:bolt-servlet:${slackSdkVersion}") implementation("com.graphql-java:graphql-java-extended-scalars:16.0.1") implementation(platform('com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:4.3.2')) implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter") - runtimeOnly("io.spinnaker.kork:kork-runtime") + runtimeOnly("com.netflix.spinnaker.kork.internal:kork-runtime") runtimeOnly("io.springfox:springfox-boot-starter:3.0.0") testImplementation(project(":keel-test")) @@ -63,11 +63,11 @@ dependencies { testImplementation(project(":keel-clouddriver")) testImplementation("io.strikt:strikt-jackson") testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin") - testImplementation("io.spinnaker.kork:kork-security") + testImplementation("com.netflix.spinnaker.kork.internal:kork-security") testImplementation("com.squareup.okhttp3:mockwebserver") testImplementation("org.testcontainers:mysql:${testContainersVersion}") testImplementation("com.networknt:json-schema-validator:1.0.43") - testImplementation("io.spinnaker.kork:kork-plugins") + testImplementation("com.netflix.spinnaker.kork.internal:kork-plugins") testImplementation("com.graphql-java:graphql-java-extended-scalars:16.0.0") testRuntimeOnly(project(":keel-ec2-plugin")) }