Skip to content

Commit

Permalink
@W-11036662: fix(dependency): To enable controlled conflict resolutio…
Browse files Browse the repository at this point in the history
…n of direct and transitive dependencies version using kork-bom for upgrading the spring-boot 2.3.x. (spinnaker#87)

Picked from spinnaker@7abbfc0

While upgrading the spring-boot 2.2.x to 2.3.x, encountered issue of uncontrolled conflict resolution of jackson and kotlin dependencies in gate (spinnaker/gate#1505). In order to avoid any such issue with other components for upgrades to spring-boot 2.3.x as well as for any future spring-boot upgrades, we can introduce strict adherence of imported maven kork-bom by replacing platform to enforcedPlatform closure.
  • Loading branch information
Sandesh Jain authored and GitHub Enterprise committed May 10, 2022
1 parent 4820eb9 commit fb2f30a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ subprojects { project ->
}

dependencies {
implementation(platform("com.salesforce.spinnaker.kork:kork-bom:$korkVersion"))
implementation(enforcedPlatform("com.salesforce.spinnaker.kork:kork-bom:$korkVersion"))
annotationProcessor(platform("com.salesforce.spinnaker.kork:kork-bom:$korkVersion"))
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
testAnnotationProcessor(platform("com.salesforce.spinnaker.kork:kork-bom:$korkVersion"))
Expand Down

0 comments on commit fb2f30a

Please sign in to comment.