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.

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

Update scope of test-fixtures dependencies #3166

Merged
merged 1 commit into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ if (JavaVersion.current().isJava11Compatible()) {
// We import it as api dependency via :servicetalk-annotations
exclude("com.google.code.findbugs:jsr305")
}
onIncorrectConfiguration {
// We import it as api dependency via :servicetalk-annotations
exclude("com.google.code.findbugs:jsr305")
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions servicetalk-concurrent-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ dependencies {
testImplementation "org.mockito:mockito-core:$mockitoCoreVersion"

testFixturesApi project(":servicetalk-concurrent")
testFixturesApi project(":servicetalk-concurrent-internal")
testFixturesApi "org.junit.jupiter:junit-jupiter-api"
testFixturesApi "org.hamcrest:hamcrest:$hamcrestVersion"

testFixturesImplementation platform("org.junit:junit-bom:$junit5Version")
testFixturesImplementation project(":servicetalk-concurrent-internal")
testFixturesImplementation project(":servicetalk-utils-internal")
testFixturesImplementation project(":servicetalk-concurrent-test-internal")
testFixturesImplementation "com.google.code.findbugs:jsr305:$jsr305Version"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-api"
testFixturesImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
testFixturesImplementation "org.slf4j:slf4j-api:$slf4jVersion"
}
5 changes: 3 additions & 2 deletions servicetalk-concurrent-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ dependencies {
testImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
testImplementation "org.mockito:mockito-core:$mockitoCoreVersion"

testFixturesImplementation platform("org.junit:junit-bom:$junit5Version")
testFixturesImplementation "org.junit.jupiter:junit-jupiter-api"
testFixturesApi platform("org.junit:junit-bom:$junit5Version")
testFixturesApi "org.junit.jupiter:junit-jupiter-api"

testFixturesImplementation "org.slf4j:slf4j-api:$slf4jVersion"
}
13 changes: 13 additions & 0 deletions servicetalk-concurrent-reactivestreams/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@

apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"

afterEvaluate {
if (tasks.findByName("projectHealth")) {
dependencyAnalysis {
issues {
// False positives for testFixturesApi
onIncorrectConfiguration {
exclude("org.reactivestreams:reactive-streams-tck")
}
}
}
}
}

dependencies {
api project(":servicetalk-concurrent")
api project(":servicetalk-concurrent-api")
Expand Down
2 changes: 1 addition & 1 deletion servicetalk-dependencies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
api "io.zipkin.reporter2:zipkin-reporter:$zipkinReporterVersion"
api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxRsVersion"
api "jakarta.xml.bind:jakarta.xml.bind-api:$javaxJaxbApiVersion"
api "org.hamcrest:hamcrest:$hamcrestVersion" // Matchers are exposed by test-resources & buffer-api
api "org.hamcrest:hamcrest:$hamcrestVersion" // Matchers are exposed by test-resources & some test-fixtures
api "org.jctools:jctools-core:$jcToolsVersion"
api "org.openjdk.jmh:jmh-core:$jmhCoreVersion"
api "org.reactivestreams:reactive-streams:$reactiveStreamsVersion"
Expand Down
9 changes: 4 additions & 5 deletions servicetalk-http-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,18 @@ dependencies {
testImplementation "org.mockito:mockito-core:$mockitoCoreVersion"
testImplementation "org.mockito:mockito-junit-jupiter:$mockitoCoreVersion"

testFixturesApi platform("org.junit:junit-bom:$junit5Version")
testFixturesApi project(":servicetalk-buffer-api")
testFixturesApi project(":servicetalk-concurrent-api")
testFixturesApi project(":servicetalk-transport-api")
testFixturesApi "org.junit.jupiter:junit-jupiter-api"
testFixturesApi "org.junit.jupiter:junit-jupiter-params"
testFixturesApi "org.mockito:mockito-junit-jupiter:$mockitoCoreVersion"

testFixturesImplementation platform("org.junit:junit-bom:$junit5Version")
testFixturesImplementation testFixtures(project(":servicetalk-transport-netty-internal"))
testFixturesImplementation project(":servicetalk-buffer-netty")
testFixturesImplementation "com.google.code.findbugs:jsr305:$jsr305Version"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-api"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-params"
testFixturesImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
testFixturesImplementation "org.mockito:mockito-core:$mockitoCoreVersion"
testFixturesImplementation "org.mockito:mockito-junit-jupiter:$mockitoCoreVersion"
}

sourceSets {
Expand Down
1 change: 0 additions & 1 deletion servicetalk-http-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ dependencies {
testImplementation project(":servicetalk-oio-api")
testImplementation project(":servicetalk-serializer-api")
testImplementation project(":servicetalk-test-resources")
testImplementation project(":servicetalk-utils-internal")
testImplementation "com.fasterxml.jackson.core:jackson-core"
testImplementation "io.netty.incubator:netty-incubator-transport-classes-io_uring:$nettyIoUringVersion"
testImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
Expand Down
8 changes: 4 additions & 4 deletions servicetalk-http-router-jersey/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,20 @@ dependencies {

testRuntimeOnly "org.glassfish.jersey.media:jersey-media-json-jackson"

testFixturesApi platform("org.junit:junit-bom:$junit5Version")
testFixturesApi project(":servicetalk-buffer-api")
testFixturesApi project(":servicetalk-concurrent-api")
testFixturesApi project(":servicetalk-http-api")
testFixturesApi project(":servicetalk-router-api")
testFixturesApi project(":servicetalk-transport-api")
testFixturesApi "jakarta.annotation:jakarta.annotation-api:$actualJavaxAnnotationsApiVersion"
testFixturesApi "jakarta.ws.rs:jakarta.ws.rs-api:$actualJaxRsVersion"
testFixturesApi "org.glassfish.jersey.core:jersey-server"
testFixturesApi "org.hamcrest:hamcrest:$hamcrestVersion"
testFixturesApi "org.junit.jupiter:junit-jupiter-api"
testFixturesApi "org.junit.platform:junit-platform-suite-api:$junitPlatformVersion"

testFixturesImplementation platform("com.fasterxml.jackson:jackson-bom:$jacksonVersion")
testFixturesImplementation platform("org.junit:junit-bom:$junit5Version")
testFixturesImplementation testFixtures(project(":servicetalk-concurrent-api"))
testFixturesImplementation testFixtures(project(":servicetalk-concurrent-internal"))
testFixturesImplementation testFixtures(project(":servicetalk-http-netty"))
Expand All @@ -103,9 +106,6 @@ dependencies {
testFixturesImplementation "com.fasterxml.jackson.core:jackson-databind"
testFixturesImplementation "com.google.code.findbugs:jsr305:$jsr305Version"
testFixturesImplementation "net.javacrumbs.json-unit:json-unit:$jsonUnitVersion"
testFixturesImplementation "org.glassfish.jersey.core:jersey-server"
testFixturesImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-api"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-params"
testFixturesImplementation "org.junit.platform:junit-platform-suite:$junitPlatformVersion"
testFixturesImplementation "org.mockito:mockito-core:$mockitoCoreVersion"
Expand Down
8 changes: 4 additions & 4 deletions servicetalk-http-router-jersey3-jakarta10/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,20 @@ dependencies {

testRuntimeOnly "org.glassfish.jersey.media:jersey-media-json-jackson"

testFixturesApi platform("org.junit:junit-bom:$junit5Version")
testFixturesApi project(":servicetalk-buffer-api")
testFixturesApi project(":servicetalk-concurrent-api")
testFixturesApi project(":servicetalk-http-api")
testFixturesApi project(":servicetalk-router-api")
testFixturesApi project(":servicetalk-transport-api")
testFixturesApi "jakarta.annotation:jakarta.annotation-api:$actualJavaxAnnotationsApiVersion"
testFixturesApi "jakarta.ws.rs:jakarta.ws.rs-api:$actualJaxRsVersion"
testFixturesApi "org.glassfish.jersey.core:jersey-server"
testFixturesApi "org.hamcrest:hamcrest:$hamcrestVersion"
testFixturesApi "org.junit.jupiter:junit-jupiter-api"
testFixturesApi "org.junit.platform:junit-platform-suite-api:$junitPlatformVersion"

testFixturesImplementation platform("com.fasterxml.jackson:jackson-bom:$jacksonVersion")
testFixturesImplementation platform("org.junit:junit-bom:$junit5Version")
testFixturesImplementation testFixtures(project(":servicetalk-concurrent-api"))
testFixturesImplementation testFixtures(project(":servicetalk-concurrent-internal"))
testFixturesImplementation testFixtures(project(":servicetalk-http-netty"))
Expand All @@ -165,9 +168,6 @@ dependencies {
testFixturesImplementation "com.fasterxml.jackson.core:jackson-databind"
testFixturesImplementation "com.google.code.findbugs:jsr305:$jsr305Version"
testFixturesImplementation "net.javacrumbs.json-unit:json-unit:$jsonUnitVersion"
testFixturesImplementation "org.glassfish.jersey.core:jersey-server"
testFixturesImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-api"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-params"
testFixturesImplementation "org.junit.platform:junit-platform-suite:$junitPlatformVersion"
testFixturesImplementation "org.mockito:mockito-core:$mockitoCoreVersion"
Expand Down
8 changes: 4 additions & 4 deletions servicetalk-http-router-jersey3-jakarta9/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,20 @@ dependencies {

testRuntimeOnly "org.glassfish.jersey.media:jersey-media-json-jackson"

testFixturesApi platform("org.junit:junit-bom:$junit5Version")
testFixturesApi project(":servicetalk-buffer-api")
testFixturesApi project(":servicetalk-concurrent-api")
testFixturesApi project(":servicetalk-http-api")
testFixturesApi project(":servicetalk-router-api")
testFixturesApi project(":servicetalk-transport-api")
testFixturesApi "jakarta.annotation:jakarta.annotation-api:$actualJavaxAnnotationsApiVersion"
testFixturesApi "jakarta.ws.rs:jakarta.ws.rs-api:$actualJaxRsVersion"
testFixturesApi "org.glassfish.jersey.core:jersey-server"
testFixturesApi "org.hamcrest:hamcrest:$hamcrestVersion"
testFixturesApi "org.junit.jupiter:junit-jupiter-api"
testFixturesApi "org.junit.platform:junit-platform-suite-api:$junitPlatformVersion"

testFixturesImplementation platform("com.fasterxml.jackson:jackson-bom:$jacksonVersion")
testFixturesImplementation platform("org.junit:junit-bom:$junit5Version")
testFixturesImplementation testFixtures(project(":servicetalk-concurrent-api"))
testFixturesImplementation testFixtures(project(":servicetalk-concurrent-internal"))
testFixturesImplementation testFixtures(project(":servicetalk-http-netty"))
Expand All @@ -165,9 +168,6 @@ dependencies {
testFixturesImplementation "com.fasterxml.jackson.core:jackson-databind"
testFixturesImplementation "com.google.code.findbugs:jsr305:$jsr305Version"
testFixturesImplementation "net.javacrumbs.json-unit:json-unit:$jsonUnitVersion"
testFixturesImplementation "org.glassfish.jersey.core:jersey-server"
testFixturesImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-api"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-params"
testFixturesImplementation "org.junit.platform:junit-platform-suite:$junitPlatformVersion"
testFixturesImplementation "org.mockito:mockito-core:$mockitoCoreVersion"
Expand Down
4 changes: 2 additions & 2 deletions servicetalk-transport-netty-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,18 @@ dependencies {
testImplementation "org.mockito:mockito-junit-jupiter:$mockitoCoreVersion"

testFixturesApi platform("io.netty:netty-bom:$nettyVersion")
testFixturesApi platform("org.junit:junit-bom:$junit5Version")
testFixturesApi project(":servicetalk-buffer-api")
testFixturesApi project(":servicetalk-concurrent-api")
testFixturesApi project(":servicetalk-transport-api")
testFixturesApi "io.netty:netty-common"
testFixturesApi "io.netty:netty-transport"
testFixturesApi "org.junit.jupiter:junit-jupiter-api"

testFixturesImplementation platform("org.junit:junit-bom:$junit5Version")
testFixturesImplementation project(":servicetalk-utils-internal")
testFixturesImplementation "io.netty.incubator:netty-incubator-transport-classes-io_uring:$nettyIoUringVersion"
testFixturesImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
testFixturesImplementation "com.google.code.findbugs:jsr305:$jsr305Version"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-api"
testFixturesImplementation "org.mockito:mockito-core:$mockitoCoreVersion"
testFixturesImplementation "org.slf4j:slf4j-api:$slf4jVersion"
}
Loading