Skip to content

Commit 6d6915e

Browse files
trasktrask
authored
Gradle config cache: wildfly testing (#15379)
1 parent b975fd7 commit 6d6915e

File tree

3 files changed

+46
-73
lines changed

3 files changed

+46
-73
lines changed

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/build.gradle.kts‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,28 @@ tasks {
4040
destinationDirectory.set(layout.buildDirectory.dir("tmp"))
4141
archiveFileName.set("logback-classic-modified.jar")
4242
exclude("/META-INF/services/javax.servlet.ServletContainerInitializer")
43-
doFirst {
44-
configurations.configureEach {
45-
if (name.lowercase().endsWith("testruntimeclasspath")) {
46-
val logbackJar = find { it.name.contains("logback-classic") }
47-
logbackJar?.let {
48-
from(zipTree(logbackJar))
49-
}
50-
}
51-
}
52-
}
43+
44+
val testRuntimeClasspath = configurations.named("testRuntimeClasspath")
45+
from({
46+
testRuntimeClasspath.get().filter { it.name.contains("logback-classic") }.map { zipTree(it) }
47+
})
5348
}
5449

5550
test {
5651
dependsOn(modifyLogbackJar)
5752
dependsOn(setupServer)
5853

59-
doFirst {
60-
// --add-modules is unrecognized on jdk8, ignore it instead of failing
61-
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
62-
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
63-
jvmArgs("--add-modules=java.se")
64-
// add offset to default port values
65-
jvmArgs("-Djboss.socket.binding.port-offset=400")
54+
// --add-modules is unrecognized on jdk8, ignore it instead of failing
55+
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
56+
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
57+
jvmArgs("--add-modules=java.se")
58+
// add offset to default port values
59+
jvmArgs("-Djboss.socket.binding.port-offset=400")
6660

67-
// remove logback-classic from classpath
68-
classpath = classpath.filter {
69-
!it.absolutePath.contains("logback-classic")
70-
}
71-
// add modified copy of logback-classic to classpath
72-
classpath = classpath.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
73-
}
61+
// remove logback-classic from classpath and add modified copy
62+
classpath = classpath.filter {
63+
!it.absolutePath.contains("logback-classic")
64+
}.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
7465
}
7566
}
7667

‎instrumentation/jaxws/jaxws-2.0-wildfly-testing/build.gradle.kts‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,28 @@ tasks {
4141
destinationDirectory.set(layout.buildDirectory.dir("tmp"))
4242
archiveFileName.set("logback-classic-modified.jar")
4343
exclude("/META-INF/services/javax.servlet.ServletContainerInitializer")
44-
doFirst {
45-
configurations.configureEach {
46-
if (name.lowercase().endsWith("testruntimeclasspath")) {
47-
val logbackJar = find { it.name.contains("logback-classic") }
48-
logbackJar?.let {
49-
from(zipTree(logbackJar))
50-
}
51-
}
52-
}
53-
}
44+
45+
val testRuntimeClasspath = configurations.named("testRuntimeClasspath")
46+
from({
47+
testRuntimeClasspath.get().filter { it.name.contains("logback-classic") }.map { zipTree(it) }
48+
})
5449
}
5550

5651
test {
5752
dependsOn(modifyLogbackJar)
5853
dependsOn(setupServer)
5954

60-
doFirst {
61-
// --add-modules is unrecognized on jdk8, ignore it instead of failing
62-
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
63-
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
64-
jvmArgs("--add-modules=java.se")
65-
// add offset to default port values
66-
jvmArgs("-Djboss.socket.binding.port-offset=200")
55+
// --add-modules is unrecognized on jdk8, ignore it instead of failing
56+
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
57+
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
58+
jvmArgs("--add-modules=java.se")
59+
// add offset to default port values
60+
jvmArgs("-Djboss.socket.binding.port-offset=200")
6761

68-
// remove logback-classic from classpath
69-
classpath = classpath.filter {
70-
!it.absolutePath.contains("logback-classic")
71-
}
72-
// add modified copy of logback-classic to classpath
73-
classpath = classpath.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
74-
}
62+
// remove logback-classic from classpath and add modified copy
63+
classpath = classpath.filter {
64+
!it.absolutePath.contains("logback-classic")
65+
}.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
7566
}
7667
}
7768

‎instrumentation/spring/spring-webmvc/spring-webmvc-3.1/wildfly-testing/build.gradle.kts‎

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,11 @@ tasks {
5050
destinationDirectory.set(layout.buildDirectory.dir("tmp"))
5151
archiveFileName.set("logback-classic-modified.jar")
5252
exclude("/META-INF/services/javax.servlet.ServletContainerInitializer")
53-
doFirst {
54-
configurations.configureEach {
55-
if (name.lowercase().endsWith("testruntimeclasspath")) {
56-
val logbackJar = find { it.name.contains("logback-classic") }
57-
logbackJar?.let {
58-
from(zipTree(logbackJar))
59-
}
60-
}
61-
}
62-
}
53+
54+
val testRuntimeClasspath = configurations.named("testRuntimeClasspath")
55+
from({
56+
testRuntimeClasspath.get().filter { it.name.contains("logback-classic") }.map { zipTree(it) }
57+
})
6358
}
6459

6560
val copyDependencies by registering(Copy::class) {
@@ -72,21 +67,17 @@ tasks {
7267
dependsOn(setupServer)
7368
dependsOn(copyDependencies)
7469

75-
doFirst {
76-
// --add-modules is unrecognized on jdk8, ignore it instead of failing
77-
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
78-
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
79-
jvmArgs("--add-modules=java.se")
80-
// add offset to default port values
81-
jvmArgs("-Djboss.socket.binding.port-offset=300")
82-
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
70+
// --add-modules is unrecognized on jdk8, ignore it instead of failing
71+
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
72+
// needed for java 11 to avoid org.jboss.modules.ModuleNotFoundException: java.se
73+
jvmArgs("--add-modules=java.se")
74+
// add offset to default port values
75+
jvmArgs("-Djboss.socket.binding.port-offset=300")
76+
jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
8377

84-
// remove logback-classic from classpath
85-
classpath = classpath.filter {
86-
!it.absolutePath.contains("logback-classic")
87-
}
88-
// add modified copy of logback-classic to classpath
89-
classpath = classpath.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
90-
}
78+
// remove logback-classic from classpath and add modified copy
79+
classpath = classpath.filter {
80+
!it.absolutePath.contains("logback-classic")
81+
}.plus(files(layout.buildDirectory.file("tmp/logback-classic-modified.jar")))
9182
}
9283
}

0 commit comments

Comments
 (0)