Skip to content

Commit

Permalink
chore(deps): use new maven coordinates and upgrade spinnaker gradle v…
Browse files Browse the repository at this point in the history
…ersion (#852) (#871)

* chore(deps): use new maven coordinates (#852)

* fix(gradle): upgrade spinnaker gradle version

* fix(build): use correct kork version

Co-authored-by: Daniel Peach <daniel.peach@armory.io>
Co-authored-by: Cameron Motevasselani <cameron@armory.io>
  • Loading branch information
3 people committed Aug 13, 2021
1 parent a96dbf1 commit 67f3e83
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ subprojects {
}

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"
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")
testAnnotationProcessor "org.projectlombok:lombok"

testImplementation "org.springframework.boot:spring-boot-starter-test"
Expand Down
10 changes: 5 additions & 5 deletions fiat-api/fiat-api.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

dependencies {
api "com.netflix.spinnaker.kork:kork-api"
api "io.spinnaker.kork:kork-api"

implementation project(":fiat-core")

Expand All @@ -24,10 +24,10 @@ dependencies {
implementation "org.springframework.security:spring-security-core"
implementation "org.springframework.security:spring-security-web"
implementation "com.netflix.spectator:spectator-api"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "com.netflix.spinnaker.kork:kork-telemetry"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-telemetry"
implementation "io.spinnaker.kork:kork-web"
implementation "com.squareup.retrofit:retrofit"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
Expand Down
2 changes: 1 addition & 1 deletion fiat-bom/fiat-bom.gradle
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 {
rootProject
Expand Down
2 changes: 1 addition & 1 deletion fiat-github/fiat-github.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ dependencies {
implementation "com.squareup.retrofit:retrofit"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-web"
}
8 changes: 4 additions & 4 deletions fiat-roles/fiat-roles.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-aop"
implementation "org.springframework.boot:spring-boot-starter-web"

implementation "com.netflix.spinnaker.kork:kork-jedis"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "com.netflix.spinnaker.kork:kork-telemetry"
implementation "io.spinnaker.kork:kork-jedis"
implementation "io.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-telemetry"
implementation "redis.clients:jedis"
implementation "com.google.api-client:google-api-client"

testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
testImplementation "io.spinnaker.kork:kork-jedis-test"
testImplementation "org.apache.commons:commons-collections4:4.1"
}
10 changes: 5 additions & 5 deletions fiat-web/fiat-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ dependencies {
implementation "org.springframework.boot:spring-boot-properties-migrator"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "com.netflix.spinnaker.kork:kork-plugins"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-plugins"
implementation "io.spinnaker.kork:kork-web"
implementation "io.swagger:swagger-annotations"
implementation "net.logstash.logback:logstash-logback-encoder"

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

implementation project(':fiat-core')
implementation project(':fiat-roles')
Expand All @@ -43,8 +43,8 @@ dependencies {
implementation project(it)
}

testImplementation "com.netflix.spinnaker.kork:kork-jedis"
testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
testImplementation "io.spinnaker.kork:kork-jedis"
testImplementation "io.spinnaker.kork:kork-jedis-test"
}

applicationName = 'fiat'
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
includeProviders=file,github,google-groups,ldap
korkVersion=7.92.0
korkVersion=7.92.4
org.gradle.parallel=true
spinnakerGradleVersion=8.10.0
spinnakerGradleVersion=8.11.0
targetJava11=true
# To enable a composite reference to a project, set the
# project property `'<projectName>Composite=true'`.
Expand Down

0 comments on commit 67f3e83

Please sign in to comment.