daee9f1242
In commit05ebca8677, the `public` modifier was removed from the SpringAtInjectTckTests class, which prevents it from being run as a JUnit 3 test class. To address that, this commit adds the missing `public` modifier as well as a a code comment to help prevent this from happening again. In addition, this commit updates spring-context.gradle to ensure that the JUnit Vintage test engine is always applied. However, that Gradle configuration is unfortunately ignored due to how our TestConventions class has been implemented. Thus, that issue will have to be addressed separately. Closes gh-34800 (cherry picked from commite384389790)
68 lines
2.9 KiB
Groovy
68 lines
2.9 KiB
Groovy
plugins {
|
|
id 'org.springframework.build.runtimehints-agent'
|
|
}
|
|
|
|
description = "Spring Context"
|
|
|
|
apply plugin: "kotlin"
|
|
|
|
dependencies {
|
|
api(project(":spring-aop"))
|
|
api(project(":spring-beans"))
|
|
api(project(":spring-core"))
|
|
api(project(":spring-expression"))
|
|
api("io.micrometer:micrometer-observation")
|
|
optional(project(":spring-instrument"))
|
|
optional("io.projectreactor:reactor-core")
|
|
optional("jakarta.annotation:jakarta.annotation-api")
|
|
optional("jakarta.ejb:jakarta.ejb-api")
|
|
optional("jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api")
|
|
optional("jakarta.inject:jakarta.inject-api")
|
|
optional("jakarta.interceptor:jakarta.interceptor-api")
|
|
optional("jakarta.validation:jakarta.validation-api")
|
|
optional("javax.annotation:javax.annotation-api")
|
|
optional("javax.inject:javax.inject")
|
|
optional("javax.money:money-api")
|
|
optional("org.apache.groovy:groovy")
|
|
optional("org.apache-extras.beanshell:bsh")
|
|
optional("org.aspectj:aspectjweaver")
|
|
optional("org.crac:crac")
|
|
optional("org.hibernate:hibernate-validator")
|
|
optional("org.jetbrains.kotlin:kotlin-reflect")
|
|
optional("org.jetbrains.kotlin:kotlin-stdlib")
|
|
optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
|
|
optional("org.reactivestreams:reactive-streams")
|
|
testFixturesApi("org.junit.jupiter:junit-jupiter-api")
|
|
testFixturesImplementation(testFixtures(project(":spring-beans")))
|
|
testFixturesImplementation("com.google.code.findbugs:jsr305")
|
|
testFixturesImplementation("io.projectreactor:reactor-test")
|
|
testFixturesImplementation("org.assertj:assertj-core")
|
|
testImplementation(project(":spring-core-test"))
|
|
testImplementation(testFixtures(project(":spring-aop")))
|
|
testImplementation(testFixtures(project(":spring-beans")))
|
|
testImplementation(testFixtures(project(":spring-core")))
|
|
testImplementation("jakarta.inject:jakarta.inject-tck")
|
|
testImplementation("org.apache.commons:commons-pool2")
|
|
testImplementation("org.apache.groovy:groovy-jsr223")
|
|
testImplementation("org.apache.groovy:groovy-xml")
|
|
testImplementation("org.awaitility:awaitility")
|
|
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
|
|
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
|
|
testImplementation("io.reactivex.rxjava3:rxjava")
|
|
testImplementation('io.micrometer:context-propagation')
|
|
testImplementation("io.micrometer:micrometer-observation-test")
|
|
testRuntimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")
|
|
testRuntimeOnly("org.glassfish:jakarta.el")
|
|
// Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central)
|
|
testRuntimeOnly("org.glassfish.external:opendmk_jmxremote_optional_jar")
|
|
testRuntimeOnly("org.javamoney:moneta")
|
|
testRuntimeOnly("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
|
|
}
|
|
|
|
test {
|
|
description = "Runs JUnit Jupiter tests and the @Inject TCK via JUnit Vintage."
|
|
useJUnitPlatform {
|
|
includeEngines "junit-jupiter", "junit-vintage"
|
|
}
|
|
}
|