Skip to content

Commit

Permalink
chore(build): upgrade kork & fiat version, use new groupId (#1491)
Browse files Browse the repository at this point in the history
  • Loading branch information
edgarulg authored Nov 20, 2021
1 parent 99362e3 commit 8cee7c7
Show file tree
Hide file tree
Showing 16 changed files with 51 additions and 51 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
allprojects {
apply plugin: 'io.spinnaker.project'

group = "com.netflix.spinnaker.gate"
group = "io.spinnaker.gate"

if ([korkVersion, fiatVersion].find { it.endsWith('-SNAPSHOT') }) {
repositories {
Expand All @@ -26,10 +26,10 @@ allprojects {
}

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")
compileOnly "org.projectlombok:lombok"
annotationProcessor "org.projectlombok:lombok"
testAnnotationProcessor "org.projectlombok:lombok"
Expand Down
8 changes: 4 additions & 4 deletions gate-api/gate-api.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
apply plugin: 'java-library'

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

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

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
Expand Down
2 changes: 1 addition & 1 deletion gate-basic/gate-basic.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
implementation project(":gate-core")
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-security"
implementation "org.springframework.session:spring-session-core"
}
6 changes: 3 additions & 3 deletions gate-bom/gate-bom.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ 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")
api("com.netflix.spinnaker.fiat:fiat-core:$fiatVersion")
api("io.spinnaker.fiat:fiat-api:$fiatVersion")
api("io.spinnaker.fiat:fiat-core:$fiatVersion")

rootProject
.subprojects
Expand Down
12 changes: 6 additions & 6 deletions gate-core/gate-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ dependencies {

api "com.squareup.retrofit:retrofit"

implementation "com.netflix.spinnaker.kork:kork-plugins"
implementation "io.spinnaker.kork:kork-plugins"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.squareup.okhttp:okhttp"
implementation "com.squareup.okhttp:okhttp-urlconnection"
implementation "com.squareup.okhttp:okhttp-apache"

implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"

implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-security"
implementation "com.netflix.spectator:spectator-api"
implementation "com.github.ben-manes.caffeine:guava"
implementation "org.apache.commons:commons-lang3"
Expand Down
6 changes: 3 additions & 3 deletions gate-iap/gate-iap.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dependencies {
implementation project(":gate-core")
implementation 'com.nimbusds:nimbus-jose-jwt:5.2'
implementation "com.github.ben-manes.caffeine:guava"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "io.spinnaker.kork:kork-security"
implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
}
4 changes: 2 additions & 2 deletions gate-integrations-gremlin/gate-integrations-gremlin.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
implementation project(":gate-core")
implementation "com.netflix.spinnaker.kork:kork-swagger"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-swagger"
implementation "io.spinnaker.kork:kork-web"
implementation "com.netflix.spectator:spectator-api"
implementation "com.squareup.okhttp3:okhttp"
implementation "com.squareup.retrofit:retrofit"
Expand Down
2 changes: 1 addition & 1 deletion gate-ldap/gate-ldap.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
implementation project(":gate-core")
implementation "org.springframework.security:spring-security-ldap"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-security"
implementation "org.apache.commons:commons-lang3"
implementation "org.springframework.session:spring-session-core"

Expand Down
6 changes: 3 additions & 3 deletions gate-oauth2/gate-oauth2.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies {
implementation project(":gate-core")
implementation "com.netflix.spectator:spectator-api"
implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-security"
implementation "org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure"
implementation "org.springframework.session:spring-session-core"
}
4 changes: 2 additions & 2 deletions gate-plugins-test/gate-plugins-test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ dependencies {
testImplementation(project(":gate-web"))
testImplementation(project(":gate-core"))

testImplementation("com.netflix.spinnaker.kork:kork-plugins")
testImplementation("com.netflix.spinnaker.kork:kork-plugins-tck")
testImplementation("io.spinnaker.kork:kork-plugins")
testImplementation("io.spinnaker.kork:kork-plugins-tck")

testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
Expand Down
8 changes: 4 additions & 4 deletions gate-plugins/gate-plugins.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ dependencies {
implementation project(":gate-core")

implementation "com.google.guava:guava"
implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "com.netflix.spinnaker.kork:kork-plugins"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "io.spinnaker.kork:kork-plugins"
implementation "io.spinnaker.kork:kork-web"

implementation "io.swagger:swagger-annotations"

Expand Down
4 changes: 2 additions & 2 deletions gate-proxy/gate-proxy.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ dependencies {
implementation project(":gate-api")
implementation project(":gate-core")

implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-web"
implementation "com.squareup.retrofit:retrofit"
implementation "com.squareup.okhttp:okhttp"
implementation "com.netflix.spectator:spectator-api"
Expand Down
6 changes: 3 additions & 3 deletions gate-saml/gate-saml.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies{
implementation project(':gate-core')
// RetrySupport is in kork-exceptions and not kork-core!
implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-security"
implementation "com.netflix.spectator:spectator-api"
implementation 'org.springframework:spring-context'
implementation 'org.springframework.session:spring-session-core'
Expand Down
14 changes: 7 additions & 7 deletions gate-web/gate-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ dependencies {
implementation "com.squareup.okhttp:okhttp-urlconnection"
implementation "com.squareup.okhttp:okhttp-apache"

implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"

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 "com.netflix.frigga:frigga"
implementation "redis.clients:jedis"

Expand All @@ -57,7 +57,7 @@ dependencies {

implementation "io.springfox:springfox-swagger2"

runtimeOnly "com.netflix.spinnaker.kork:kork-runtime"
runtimeOnly "io.spinnaker.kork:kork-runtime"
runtimeOnly "org.springframework.boot:spring-boot-properties-migrator"

testImplementation "com.graphql-java-kickstart:graphql-spring-boot-starter-test:7.0.1"
Expand All @@ -71,8 +71,8 @@ dependencies {
testImplementation "org.springframework.security:spring-security-ldap"
testImplementation "org.springframework.security:spring-security-oauth2-jose"
testImplementation "com.unboundid:unboundid-ldapsdk"
testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
testRuntimeOnly "com.netflix.spinnaker.kork:kork-retrofit"
testImplementation "io.spinnaker.kork:kork-jedis-test"
testRuntimeOnly "io.spinnaker.kork:kork-retrofit"

// Add each included authz provider as a runtime dependency
gradle.includedProviderProjects.each {
Expand Down
8 changes: 4 additions & 4 deletions gate-x509/gate-x509.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dependencies {
implementation project(':gate-core')
implementation "org.bouncycastle:bcprov-jdk15on"
implementation "com.netflix.spinnaker.kork:kork-core"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-security"
implementation "com.netflix.spectator:spectator-api"
implementation "com.github.ben-manes.caffeine:caffeine"
implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
enablePublishing=false
fiatVersion=1.26.0
fiatVersion=1.27.0
includeProviders=basic,iap,ldap,oauth2,saml,x509
korkVersion=7.99.1
korkVersion=7.110.0
kotlinVersion=1.4.0
org.gradle.parallel=true
spinnakerGradleVersion=8.10.1
Expand Down

0 comments on commit 8cee7c7

Please sign in to comment.