Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert from bom deps. Set duplicatesStrategy for benchmark project #336

Merged
merged 3 commits into from
Jun 2, 2022
Merged

Revert from bom deps. Set duplicatesStrategy for benchmark project #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4555e62
Revert some deps versioning from bom. Set duplicatesStrategy for benc…
srprash Jun 2, 2022
c5e97b7
Add a todo message
srprash Jun 2, 2022
838ef4a
Add gradle 7 issue link
srprash Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions aws-xray-recorder-sdk-aws-sdk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,16 @@ dependencies {

implementation(project(":aws-xray-recorder-sdk-aws-sdk-core"))

api("com.amazonaws:aws-java-sdk-core")
// TODO: Try and find a way to declare aws-java-sdk dependencies
// via a bom in the dependencyManagement project and make it available
// for resolution not only in the SDK projects but also in projects
// like benchmark.
// See PR for more details: https://github.com/aws/aws-xray-sdk-java/pull/336
api("com.amazonaws:aws-java-sdk-core:1.12.228")

testImplementation("com.amazonaws:aws-java-sdk-lambda")
testImplementation("com.amazonaws:aws-java-sdk-s3")
testImplementation("com.amazonaws:aws-java-sdk-sns")
testImplementation("com.amazonaws:aws-java-sdk-lambda:1.12.228")
testImplementation("com.amazonaws:aws-java-sdk-s3:1.12.228")
testImplementation("com.amazonaws:aws-java-sdk-sns:1.12.228")
testImplementation("org.powermock:powermock-reflect:2.0.2")
testImplementation("org.skyscreamer:jsonassert:1.3.0")
}
Expand Down
7 changes: 7 additions & 0 deletions aws-xray-recorder-sdk-benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ tasks.jar {
}
}

tasks.jmhJar {
// Gradle 7 requires duplicatesStrategy to be specified.
//
// See more: https://github.com/gradle/gradle/issues/17236
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}

jmh {
fork = 1
// Required when also including annotation processor.
Expand Down
2 changes: 1 addition & 1 deletion aws-xray-recorder-sdk-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

dependencies {
api("com.amazonaws:aws-java-sdk-xray")
api("com.amazonaws:aws-java-sdk-xray:1.12.228")

compileOnly("com.google.code.findbugs:jsr305:3.0.2")
compileOnly("javax.servlet:javax.servlet-api:3.1.0")
Expand Down
1 change: 0 additions & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ plugins {
data class DependencySet(val group: String, val version: String, val modules: List<String>)

val DEPENDENCY_BOMS = listOf(
"com.amazonaws:aws-java-sdk-bom:1.12.228",
"com.fasterxml.jackson:jackson-bom:2.12.0",
"org.junit:junit-bom:5.8.2"
)
Expand Down