Skip to content

Commit

Permalink
Revert dependencies bom manually including modules (#2308)
Browse files Browse the repository at this point in the history
Motivation:
[MNG-6772](https://issues.apache.org/jira/browse/MNG-6772) may impact maven users
but as a work around maven users can include internal boms directly in their projects.
  • Loading branch information
Scottmitch authored Aug 4, 2022
1 parent ccf01ca commit 943d7d5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 27 deletions.
18 changes: 0 additions & 18 deletions gradle/bomUtils.gradle

This file was deleted.

5 changes: 3 additions & 2 deletions servicetalk-bom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@

apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-core"
apply plugin: "java-platform"
apply from: "../gradle/bomUtils.gradle"

description="ServiceTalk BOM that includes all modules"

rootProject.subprojects.findAll { it -> bomInclusionClosure(it) }.each {
rootProject.subprojects.findAll { !it.name.endsWith("-bom") && !it.name.endsWith("-dependencies") &&
!it.name.contains("examples") && !it.name.equals("grpc") &&
!it.name.equals("http")}.each {
dependencies.constraints.add("api", it)
}

Expand Down
8 changes: 1 addition & 7 deletions servicetalk-dependencies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,15 @@

apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-core"
apply plugin: "java-platform"
apply from: "../gradle/bomUtils.gradle"

description = "ServiceTalk BOM that includes all modules and direct dependencies"

javaPlatform {
allowDependencies()
}

// Include modules directly rather than by defining servicetalk bom as
// a platform to work around [MNG-6772](https://issues.apache.org/jira/browse/MNG-6772).
rootProject.subprojects.findAll { it -> bomInclusionClosure(it) }.each {
dependencies.constraints.add("api", it)
}

dependencies {
api platform(project(":servicetalk-bom"))
api platform("io.netty:netty-bom:${nettyVersion}")
api platform("com.google.protobuf:protobuf-bom:${protobufVersion}")
api platform("org.apache.logging.log4j:log4j-bom:${log4jVersion}")
Expand Down

0 comments on commit 943d7d5

Please sign in to comment.