Skip to content

Gradle config cache: wildfly testing #15379

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

Merged
laurit merged 1 commit into from
Nov 19, 2025
Merged

Gradle config cache: wildfly testing #15379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 15 additions & 24 deletions instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,37 +40,28 @@ tasks {
destinationDirectory.set(layout.buildDirectory.dir("tmp"))
archiveFileName.set("logback-classic-modified.jar")
exclude("/META-INF/services/javax.servlet.ServletContainerInitializer")
doFirst {
configurations.configureEach {
if (name.lowercase().endsWith("testruntimeclasspath")) {
val logbackJar = find { it.name.contains("logback-classic") }
logbackJar?.let {
from(zipTree(logbackJar))
}
}
}
}

val testRuntimeClasspath = configurations.named("testRuntimeClasspath")
Copy link
Member Author

@trask trask Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@laurit everything seems to be passing, so guessing we don't need the more flexible name.lowercase().endsWith("testruntimeclasspath")?

Copy link
Contributor

@laurit laurit Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can trust the test here. If the tests pass then all is good.

from({
testRuntimeClasspath.get().filter { it.name.contains("logback-classic") }.map { zipTree(it) }
})
}

test {
dependsOn(modifyLogbackJar)
dependsOn(setupServer)

doFirst {
// --add-modules is unrecognized on jdk8, ignore it instead of failing
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
jvmArgs("--add-modules=java.se")
// add offset to default port values
jvmArgs("-Djboss.socket.binding.port-offset=400")
// --add-modules is unrecognized on jdk8, ignore it instead of failing
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
jvmArgs("--add-modules=java.se")
// add offset to default port values
jvmArgs("-Djboss.socket.binding.port-offset=400")

// remove logback-classic from classpath
classpath = classpath.filter {
!it.absolutePath.contains("logback-classic")
}
// add modified copy of logback-classic to classpath
classpath = classpath.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
}
// remove logback-classic from classpath and add modified copy
classpath = classpath.filter {
!it.absolutePath.contains("logback-classic")
}.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
}
}

Expand Down
39 changes: 15 additions & 24 deletions instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,37 +41,28 @@ tasks {
destinationDirectory.set(layout.buildDirectory.dir("tmp"))
archiveFileName.set("logback-classic-modified.jar")
exclude("/META-INF/services/javax.servlet.ServletContainerInitializer")
doFirst {
configurations.configureEach {
if (name.lowercase().endsWith("testruntimeclasspath")) {
val logbackJar = find { it.name.contains("logback-classic") }
logbackJar?.let {
from(zipTree(logbackJar))
}
}
}
}

val testRuntimeClasspath = configurations.named("testRuntimeClasspath")
from({
testRuntimeClasspath.get().filter { it.name.contains("logback-classic") }.map { zipTree(it) }
})
}

test {
dependsOn(modifyLogbackJar)
dependsOn(setupServer)

doFirst {
// --add-modules is unrecognized on jdk8, ignore it instead of failing
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
jvmArgs("--add-modules=java.se")
// add offset to default port values
jvmArgs("-Djboss.socket.binding.port-offset=200")
// --add-modules is unrecognized on jdk8, ignore it instead of failing
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
jvmArgs("--add-modules=java.se")
// add offset to default port values
jvmArgs("-Djboss.socket.binding.port-offset=200")

// remove logback-classic from classpath
classpath = classpath.filter {
!it.absolutePath.contains("logback-classic")
}
// add modified copy of logback-classic to classpath
classpath = classpath.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
}
// remove logback-classic from classpath and add modified copy
classpath = classpath.filter {
!it.absolutePath.contains("logback-classic")
}.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
}
}

Expand Down
41 changes: 16 additions & 25 deletions instrumentation/spring/spring-webmvc/spring-webmvc-3.1/wildfly-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,11 @@ tasks {
destinationDirectory.set(layout.buildDirectory.dir("tmp"))
archiveFileName.set("logback-classic-modified.jar")
exclude("/META-INF/services/javax.servlet.ServletContainerInitializer")
doFirst {
configurations.configureEach {
if (name.lowercase().endsWith("testruntimeclasspath")) {
val logbackJar = find { it.name.contains("logback-classic") }
logbackJar?.let {
from(zipTree(logbackJar))
}
}
}
}

val testRuntimeClasspath = configurations.named("testRuntimeClasspath")
from({
testRuntimeClasspath.get().filter { it.name.contains("logback-classic") }.map { zipTree(it) }
})
}

val copyDependencies by registering(Copy::class) {
Expand All @@ -72,21 +67,17 @@ tasks {
dependsOn(setupServer)
dependsOn(copyDependencies)

doFirst {
// --add-modules is unrecognized on jdk8, ignore it instead of failing
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
jvmArgs("--add-modules=java.se")
// add offset to default port values
jvmArgs("-Djboss.socket.binding.port-offset=300")
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
// --add-modules is unrecognized on jdk8, ignore it instead of failing
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
jvmArgs("--add-modules=java.se")
// add offset to default port values
jvmArgs("-Djboss.socket.binding.port-offset=300")
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")

// remove logback-classic from classpath
classpath = classpath.filter {
!it.absolutePath.contains("logback-classic")
}
// add modified copy of logback-classic to classpath
classpath = classpath.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
}
// remove logback-classic from classpath and add modified copy
classpath = classpath.filter {
!it.absolutePath.contains("logback-classic")
}.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
}
}
Loading