Skip to content

Commit

Permalink
chore(dependencies): add compileOnly and testCompileOnly dependency o…
Browse files Browse the repository at this point in the history
…n lombok

to all submodules except clouddriver-api and clouddriver-bom in build.gradle, to reduce duplication.  As well, declare dependencies on kork-bom for compileOnly and testCompileOnly to remove failures from ./gradlew dependencies output.  No other changes to dependencies output except removing these failures.

before:

compileOnly - Compile only dependencies for compilation 'main' (target  (jvm)).
\--- org.projectlombok:lombok FAILED

compileOnlyDependenciesMetadata
\--- org.projectlombok:lombok FAILED

after:

compileOnly - Compile only dependencies for compilation 'main' (target  (jvm)).
+--- io.spinnaker.kork:kork-bom:7.209.0
|    \--- org.projectlombok:lombok:1.18.26 (c)
\--- org.projectlombok:lombok -> 1.18.26

compileOnlyDependenciesMetadata
+--- io.spinnaker.kork:kork-bom:7.209.0
|    \--- org.projectlombok:lombok:1.18.26 (c)
\--- org.projectlombok:lombok -> 1.18.26
  • Loading branch information
dbyron-sf committed Jan 8, 2024
1 parent f53abf8 commit 9f4a468
Show file tree
Hide file tree
Showing 20 changed files with 8 additions and 43 deletions.
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,19 @@ subprojects {
dependencies {
api enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion")

compileOnly enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion")
compileOnly "org.projectlombok:lombok"

annotationProcessor enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion")
annotationProcessor "org.projectlombok:lombok"
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")

testAnnotationProcessor enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion")
testAnnotationProcessor "org.projectlombok:lombok"

testCompileOnly enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion")
testCompileOnly "org.projectlombok:lombok"

testRuntimeOnly enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion")
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
}
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-alicloud/clouddriver-alicloud.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ dependencies {
implementation project(":clouddriver-eureka")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"

implementation "io.spinnaker.kork:kork-core"
implementation "io.spinnaker.kork:kork-exceptions"
implementation "io.spinnaker.kork:kork-security"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-appengine/clouddriver-appengine.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ dependencies {
implementation project(":clouddriver-google-common")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"

implementation "com.google.apis:google-api-services-appengine:v1-rev92-1.25.0"
implementation "com.google.apis:google-api-services-storage"
implementation 'com.google.auth:google-auth-library-oauth2-http'
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-artifacts/clouddriver-artifacts.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ dependencies {
implementation project(":clouddriver-api")
implementation project(":clouddriver-core")

compileOnly "org.projectlombok:lombok"

implementation "com.amazonaws:aws-java-sdk-s3"
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-aws/clouddriver-aws.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ dependencies {
implementation project(":clouddriver-security")
implementation project(":clouddriver-saga")

compileOnly "org.projectlombok:lombok"

implementation "javax.inject:javax.inject:1"
implementation "com.amazonaws:aws-java-sdk"
implementation "com.github.ben-manes.caffeine:guava"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-cloudfoundry/clouddriver-cloudfoundry.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ dependencies {
implementation project(":cats:cats-core")
implementation project(":clouddriver-docker")

compileOnly "org.projectlombok:lombok"

implementation "org.codehaus.groovy:groovy"

implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-cloudrun/clouddriver-cloudrun.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ dependencies {
implementation project(":clouddriver-google-common")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"

implementation "com.google.apis:google-api-services-run:v1-rev49-1.25.0"
implementation "com.google.apis:google-api-services-storage"
implementation 'com.google.auth:google-auth-library-oauth2-http'
Expand Down
3 changes: 0 additions & 3 deletions clouddriver-core/clouddriver-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ dependencies {
implementation project(":clouddriver-security")
implementation project(":clouddriver-saga")

compileOnly "org.projectlombok:lombok"
testCompileOnly "org.projectlombok:lombok"

// Because a JobRequest constructor takes a org.apache.commons.exec.CommandLine argument
api "org.apache.commons:commons-exec"

Expand Down
3 changes: 0 additions & 3 deletions clouddriver-docker/clouddriver-docker.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ dependencies {
implementation project(":clouddriver-security")
implementation project(":cats:cats-core")

compileOnly "org.projectlombok:lombok"
testCompileOnly "org.projectlombok:lombok"

implementation "org.springframework.boot:spring-boot-actuator"
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.springframework.cloud:spring-cloud-context"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-ecs/clouddriver-ecs.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ dependencies {
implementation project(":clouddriver-core")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"

implementation "com.amazonaws:aws-java-sdk"
implementation "com.github.ben-manes.caffeine:guava"
implementation "com.netflix.awsobjectmapper:awsobjectmapper"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-google-common/clouddriver-google-common.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
dependencies {
compileOnly "org.projectlombok:lombok"

implementation "com.google.api-client:google-api-client"
implementation 'com.google.auth:google-auth-library-oauth2-http'
implementation "io.spinnaker.kork:kork-annotations"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-google/clouddriver-google.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ dependencies {
implementation project(":clouddriver-google-common")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"

implementation "org.codehaus.groovy:groovy"
implementation "org.codehaus.groovy:groovy-json"
implementation "org.apache.commons:commons-lang3"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-huaweicloud/clouddriver-huaweicloud.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ dependencies {
implementation project(":clouddriver-core")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"

implementation "io.spinnaker.kork:kork-exceptions"
implementation "com.netflix.frigga:frigga"
implementation "com.netflix.spectator:spectator-api"
Expand Down
3 changes: 0 additions & 3 deletions clouddriver-kubernetes/clouddriver-kubernetes.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ dependencies {
implementation project(":cats:cats-core")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"
testCompileOnly "org.projectlombok:lombok"

implementation "org.codehaus.groovy:groovy"

implementation "com.google.code.findbugs:jsr305"
Expand Down
3 changes: 0 additions & 3 deletions clouddriver-lambda/clouddriver-lambda.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ dependencies {
implementation project(":clouddriver-core")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"
testCompileOnly "org.projectlombok:lombok"

implementation "commons-io:commons-io"
implementation "com.amazonaws:aws-java-sdk"
implementation "com.github.ben-manes.caffeine:guava"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-oracle/clouddriver-oracle.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ dependencies {
implementation project(":clouddriver-core")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"

implementation "com.github.ben-manes.caffeine:guava"
implementation "com.netflix.frigga:frigga"
implementation "com.netflix.spectator:spectator-api"
Expand Down
3 changes: 0 additions & 3 deletions clouddriver-tencentcloud/clouddriver-tencentcloud.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ dependencies {
implementation project(":clouddriver-eureka")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"
testCompileOnly "org.projectlombok:lombok"

implementation "com.netflix.frigga:frigga"
implementation "com.netflix.spectator:spectator-api"
implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-titus/clouddriver-titus.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ dependencies {
implementation project(":clouddriver-saga")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"

implementation "javax.inject:javax.inject:1"
implementation "com.amazonaws:aws-java-sdk"
implementation "com.google.protobuf:protobuf-java"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-web/clouddriver-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ dependencies {
runtimeOnly(project(":clouddriver-sql-postgres"))
}

compileOnly "org.projectlombok:lombok"

implementation "com.netflix.frigga:frigga"
implementation "io.spinnaker.fiat:fiat-api:$fiatVersion"
implementation "io.spinnaker.fiat:fiat-core:$fiatVersion"
Expand Down
2 changes: 0 additions & 2 deletions clouddriver-yandex/clouddriver-yandex.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ dependencies {
implementation project(":clouddriver-core")
implementation project(":clouddriver-security")

compileOnly "org.projectlombok:lombok"

implementation 'com.yandex.cloud:java-sdk-services:2.1.1'
compileOnly "io.opencensus:opencensus-api"
compileOnly "io.opencensus:opencensus-contrib-grpc-metrics"
Expand Down

0 comments on commit 9f4a468

Please sign in to comment.