Skip to content

Small Gradle Style tweaks #11306

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

Open
bric3 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Small Gradle Style tweaks #11306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
034b35d
build: Fix some Gradle style around java compatibility
bric3 May 7, 2026
05a9014
build: Fix configuration creation order in log4j-1.2.4/build.gradle
bric3 May 7, 2026
a7cc832
build: Additional correct configuration creation order
bric3 May 7, 2026
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
6 changes: 4 additions & 2 deletions buildSrc/src/test/kotlin/datadog/gradle/plugin/csi/CallSiteInstrumentationPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ class CallSiteInstrumentationPluginTest {
id 'dd-trace-java.call-site-instrumentation'
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

csi {
suffix = 'CallSite'
Expand Down
18 changes: 12 additions & 6 deletions ...rc/src/test/kotlin/datadog/gradle/plugin/instrument/BuildTimeInstrumentationPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ class BuildTimeInstrumentationPluginTest {
id 'dd-trace-java.build-time-instrumentation'
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

repositories {
mavenCentral()
Expand Down Expand Up @@ -76,8 +78,10 @@ class BuildTimeInstrumentationPluginTest {
id 'dd-trace-java.build-time-instrumentation'
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

repositories {
mavenCentral()
Expand Down Expand Up @@ -121,8 +125,10 @@ class BuildTimeInstrumentationPluginTest {
id 'dd-trace-java.build-time-instrumentation'
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

repositories {
mavenCentral()
Expand Down
6 changes: 4 additions & 2 deletions dd-java-agent/benchmark-integration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ apply from: "$rootDir/gradle/java.gradle"

description = 'Integration Level Agent benchmarks.'

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

subprojects { sub ->
sub.apply plugin: 'com.gradleup.shadow'
Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ muzzle {
}
}

apply from: "$rootDir/gradle/java.gradle"

configurations {
testImplementation.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j'
}

apply from: "$rootDir/gradle/java.gradle"

testJvmConstraints {
// Log4j 1.x reached EOL in 2015 and is not compatible with Java 25+: https://endoflife.date/log4j
maxJavaVersion = JavaVersion.VERSION_24
Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ muzzle {
}
}

apply from: "$rootDir/gradle/java.gradle"

configurations.configureEach {
// shut up about broken xml-api pom relocation
resolutionStrategy {
force 'xml-apis:xml-apis:1.4.01'
}
}

apply from: "$rootDir/gradle/java.gradle"
apply plugin: 'dd-trace-java.call-site-instrumentation'

addTestSuiteForDir('latestDepTest', 'test')
Expand Down
3 changes: 2 additions & 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,10 +13,11 @@ muzzle {
assertInverse = true
}
}
apply from: "$rootDir/gradle/java.gradle"

configurations.configureEach {
resolutionStrategy.deactivateDependencyLocking()
}
apply from: "$rootDir/gradle/java.gradle"

addTestSuiteForDir('latestDepTest', 'test')
addTestSuite('test_spark24')
Expand Down
Loading