Skip to content

Commit

Permalink
fix(build): bump kork to 7.110.0 & change groupId for dependencies (#825
Browse files Browse the repository at this point in the history
)
  • Loading branch information
edgarulg committed Dec 7, 2021
1 parent 7be0362 commit 7ef652b
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ plugins {

subprojects {
apply plugin: 'io.spinnaker.project'
group = "com.netflix.spinnaker.rosco"
group = "io.spinnaker.rosco"

if (name != "rosco-bom") {
apply plugin: 'java-library'
apply plugin: "groovy"

dependencies {
implementation platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
implementation platform("io.spinnaker.kork:kork-bom:$korkVersion")

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

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
korkVersion=7.99.1
korkVersion=7.110.0
org.gradle.parallel=true
spinnakerGradleVersion=8.10.1
targetJava11=true
Expand Down
2 changes: 1 addition & 1 deletion rosco-bom/rosco-bom.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ javaPlatform {


dependencies {
api(platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion"))
api(platform("io.spinnaker.kork:kork-bom:$korkVersion"))

constraints {
rootProject
Expand Down
12 changes: 6 additions & 6 deletions rosco-core/rosco-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ dependencies {
compileOnly "org.projectlombok:lombok"
annotationProcessor "org.projectlombok:lombok"

api "com.netflix.spinnaker.kork:kork-artifacts"
api "com.netflix.spinnaker.kork:kork-plugins"
api "io.spinnaker.kork:kork-artifacts"
api "io.spinnaker.kork:kork-plugins"
api "org.codehaus.groovy:groovy"

implementation "com.netflix.frigga:frigga"
implementation "com.netflix.spinnaker.kork:kork-jedis"
implementation "com.netflix.spinnaker.kork:kork-retrofit"
implementation "com.netflix.spinnaker.kork:kork-swagger"
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-jedis"
implementation "io.spinnaker.kork:kork-retrofit"
implementation "io.spinnaker.kork:kork-swagger"
implementation "io.spinnaker.kork:kork-web"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.squareup.retrofit:retrofit"
implementation "io.reactivex:rxjava"
Expand Down
6 changes: 3 additions & 3 deletions rosco-manifests/rosco-manifests.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ dependencies {
annotationProcessor "org.projectlombok:lombok"

implementation "org.springframework.boot:spring-boot-starter-web"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "com.netflix.spinnaker.kork:kork-exceptions"
implementation "com.netflix.spinnaker.kork:kork-security"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-security"
implementation "commons-io:commons-io"
implementation "org.apache.commons:commons-compress:1.14"
implementation "org.yaml:snakeyaml:1.25"
Expand Down
6 changes: 3 additions & 3 deletions rosco-web/rosco-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ configurations.all {
dependencies {
compile project(":rosco-core")
compile project(":rosco-manifests")
implementation "com.netflix.spinnaker.kork:kork-web"
implementation "io.spinnaker.kork:kork-web"
implementation "io.swagger:swagger-annotations"

implementation "org.codehaus.groovy:groovy-all"
implementation "com.netflix.spinnaker.kork:kork-artifacts"
implementation "io.spinnaker.kork:kork-artifacts"
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "net.logstash.logback:logstash-logback-encoder"

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

testImplementation "org.spockframework:spock-core"
testImplementation "org.objenesis:objenesis"
Expand Down

0 comments on commit 7ef652b

Please sign in to comment.