Skip to content

Convert configurations syntax to use lazy API #9606

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
sarahchen6 merged 2 commits into from
Sep 24, 2025
Merged

Convert configurations syntax to use lazy API #9606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1ed79f
Convert configurations.all to configurations.configureEach to use laz…
sarahchen6 Sep 24, 2025
1544334
Convert stray .all
sarahchen6 Sep 24, 2025
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
2 changes: 1 addition & 1 deletion dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {
}


configurations.all {
configurations.configureEach {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/axis2-1.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ apply from: "$rootDir/gradle/java.gradle"

addTestSuiteForDir('latestDepTest', 'test')
addTestSuiteForDir('latestDepForkedTest', 'test')
configurations.all {
configurations.configureEach {
// the version used by axis2 isn't available in a public repository - we don't need it, so exclude it
exclude group: 'org.apache.woden', module: 'woden'
// shut up about broken xml-api pom relocation
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/javax-xml/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repositories {
}
}

configurations.all {
configurations.configureEach {
// shut up about broken xml-api pom relocation
resolutionStrategy {
force 'xml-apis:xml-apis:1.4.01'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/mule-4.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ configurations {
latestMuleServices
}

configurations.all {
configurations.configureEach {
exclude group: 'pull-parser', module: 'pull-parser'

resolutionStrategy {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/owasp-esapi-2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ muzzle {
}
}

configurations.all {
configurations.configureEach {
// shut up about broken xml-api pom relocation
resolutionStrategy {
force 'xml-apis:xml-apis:1.4.01'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/resteasy-appsec/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ addTestSuite('jettyAsyncTest')
//check.dependsOn nettyTest, jettyAsyncTest
// CI invocations are only for test/latestDepTest
test.finalizedBy nettyTest, jettyAsyncTest
configurations.all {
configurations.configureEach {
resolutionStrategy.deactivateDependencyLocking()
}
dependencies {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

apply from: "$rootDir/gradle/java.gradle"
configurations.all {
configurations.configureEach {
resolutionStrategy.deactivateDependencyLocking()
}
dependencies {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spark/spark_2.12/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ muzzle {
assertInverse = true
}
}
configurations.all {
configurations.configureEach {
resolutionStrategy.deactivateDependencyLocking()
}
apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spark/spark_2.13/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ext {
// Spark does not support Java > 11 until 3.3.0 https://issues.apache.org/jira/browse/SPARK-33772
maxJavaVersionForTests = JavaVersion.VERSION_11
}
configurations.all {
configurations.configureEach {
resolutionStrategy.deactivateDependencyLocking()
}
dependencies {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/sslsocket/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle"

// IBM8 is having troubles with TLS set up by jetty 9.4.
// As a temporary workaround we used a lower jetty version for ssl socket tests
configurations.all {
configurations.configureEach {
resolutionStrategy {
force group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428'
}
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/synapse-3.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ muzzle {
apply from: "$rootDir/gradle/java.gradle"

addTestSuiteForDir('latestDepTest', 'test')
configurations.all {
configurations.configureEach {
// the version used by Synapse isn't available in a public repository - we don't need it, so exclude it
exclude group: 'org.snmp4j', module: 'snmp4j'
exclude group: 'org.snmp4j', module: 'snmp4j-agent'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ addTestSuiteExtendingForDir('latest10ForkedTest', 'latest10Test', 'latestDepTest

def tomcatVersion = '5.5.12' // earliest 5.5.x available in maven central (with all needed dependencies).

configurations.all {
configurations.configureEach {
// shut up about broken xml-api pom relocation
resolutionStrategy {
force 'xml-apis:xml-apis:1.4.01'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dependencies {
implementation project(':dd-java-agent:instrumentation:tomcat:tomcat-common')
}

configurations.all {
configurations.configureEach {
// shut up about broken xml-api pom relocation
resolutionStrategy {
force 'xml-apis:xml-apis:1.4.01'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply from: "$rootDir/gradle/java.gradle"

configurations.all {
configurations.configureEach {
// shut up about broken xml-api pom relocation
resolutionStrategy {
force 'xml-apis:xml-apis:1.4.01'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+'

testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:javax-websocket-1.0")
configurations.all {
configurations.configureEach {
it.resolutionStrategy {
force libs.slf4j
}
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10")
testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0")

configurations.all {
configurations.configureEach {
it.resolutionStrategy {
force libs.slf4j
}
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:javax-websocket-1.0")
testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0")

configurations.all {
configurations.configureEach {
it.resolutionStrategy {
force libs.slf4j
}
Expand Down
2 changes: 1 addition & 1 deletion dd-trace-ot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ dependencies {
}

// gradle can't downgrade the opentracing dependencies with `strictly`
configurations.matching { it.name.startsWith("ot31") }.all {
configurations.matching { it.name.startsWith("ot31") }.configureEach {
resolutionStrategy {
force("io.opentracing:opentracing-api:0.31.0")
force("io.opentracing:opentracing-util:0.31.0")
Expand Down