Skip to content

Commit

Permalink
chore(deps): update kork to 7.107.0, use new maven coordinates (#1028)
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielpeach
danielpeach committed Mar 19, 2021
1 parent e7d96ba commit 3a4c23f
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 32 deletions.
6 changes: 3 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ subprojects { project ->
}

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"))

implementation("net.logstash.logback:logstash-logback-encoder")

Expand Down
4 changes: 2 additions & 2 deletions front50-azure/front50-azure.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-security"

testImplementation project(":front50-test")
}
2 changes: 1 addition & 1 deletion front50-bom/front50-bom.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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
16 changes: 8 additions & 8 deletions front50-core/front50-core.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ dependencies {
implementation "org.springframework.security:spring-security-config"
implementation "org.springframework.security:spring-security-core"
implementation "org.springframework.security:spring-security-web"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-web"
implementation "io.reactivex:rxjava"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
implementation "com.squareup.retrofit:converter-jackson"
api "com.github.ben-manes.caffeine:guava"

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

implementation "com.netflix.spinnaker.kork:kork-api"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-moniker"
implementation "io.spinnaker.kork:kork-api"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-moniker"
}
2 changes: 1 addition & 1 deletion front50-gcs/front50-gcs.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
implementation "com.google.cloud:google-cloud-storage:1.108.0"
implementation "com.google.guava:guava"
implementation "com.netflix.spectator:spectator-api"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.github.resilience4j:resilience4j-circuitbreaker"
implementation "io.reactivex:rxjava"
implementation "net.logstash.logback:logstash-logback-encoder"
Expand Down
2 changes: 1 addition & 1 deletion front50-migrations/front50-migrations.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
implementation project(":front50-core")

implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-core"
implementation "org.apache.commons:commons-lang3"
implementation "org.springframework.boot:spring-boot-autoconfigure"

Expand Down
2 changes: 1 addition & 1 deletion front50-oracle/front50-oracle.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dependencies {
implementation project(":front50-core")

implementation "com.github.ben-manes.caffeine:guava"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-core"
implementation "com.oracle.oci.sdk:oci-java-sdk-objectstorage:1.19.1"
implementation "com.sun.jersey:jersey-client:1.19.4"
implementation "org.springframework.boot:spring-boot-autoconfigure"
Expand Down
4 changes: 2 additions & 2 deletions front50-redis/front50-redis.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ configurations.all {

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

implementation("org.codehaus.groovy:groovy-all")

Expand All @@ -32,7 +32,7 @@ dependencies {
implementation "com.github.ben-manes.caffeine:guava"

testImplementation project(":front50-test")
testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
testImplementation "io.spinnaker.kork:kork-jedis-test"
}

tasks.compileGroovy.enabled = true
6 changes: 3 additions & 3 deletions front50-s3/front50-s3.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-aws"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-aws"
implementation "io.spinnaker.kork:kork-security"
implementation "com.amazonaws:aws-java-sdk-s3"
implementation "com.amazonaws:aws-java-sdk-sts"
implementation "com.netflix.eureka:eureka-client"
Expand Down
6 changes: 3 additions & 3 deletions front50-sql/front50-sql.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ dependencies {
runtimeOnly project(":front50-sql-postgres")
}

implementation "com.netflix.spinnaker.kork:kork-sql"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-sql"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-web"

implementation "io.strikt:strikt-core"
implementation "io.github.resilience4j:resilience4j-retry"
Expand Down
2 changes: 1 addition & 1 deletion front50-swift/front50-swift.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-core"
implementation "org.springframework:spring-web"
implementation 'org.pacesys:openstack4j:3.2.0'

Expand Down
10 changes: 5 additions & 5 deletions front50-web/front50-web.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "com.squareup.retrofit:converter-jackson"
implementation "io.swagger:swagger-annotations"
implementation "commons-codec:commons-codec"

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

testImplementation project(":front50-test")
testImplementation project(":front50-sql")
testImplementation "com.netflix.spinnaker.kork:kork-sql-test"
testImplementation "io.spinnaker.kork:kork-sql-test"
testImplementation "io.reactivex:rxjava"

// Add each included cloud provider project as a runtime dependency
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
fiatVersion=1.26.0
includeProviders=azure,gcs,oracle,redis,s3,swift,sql
korkVersion=7.106.0
korkVersion=7.107.0
org.gradle.parallel=true
spinnakerGradleVersion=8.11.0
targetJava11=true
Expand Down

0 comments on commit 3a4c23f

Please sign in to comment.