Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions dd-java-agent/agent-bootstrap/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id 'com.gradleup.shadow'
id 'dd-trace-java.module.bootstrap-component'
id 'dd-trace-java.jmh-conventions'
id 'idea'
}

// The shadowJar of this project will be injected into the JVM's bootstrap classloader
Expand Down Expand Up @@ -56,12 +55,6 @@ tasks.named("jar", Jar) {
from sourceSets.main_java11.output
}

idea {
module {
jdkName = '11'
}
}

jmh {
jmhVersion = libs.versions.jmh
duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
Expand Down
7 changes: 0 additions & 7 deletions dd-java-agent/agent-installer/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.internal-library'
id 'idea'
}

minimumBranchCoverage = 0.6
Expand Down Expand Up @@ -71,9 +70,3 @@ tasks.named("jar", Jar) {
from sourceSets.main_java11.output
from sourceSets.main_java25.output
}

idea {
module {
jdkName = '11'
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.internal-library'
id 'idea'
}

tracerJava {
Expand Down Expand Up @@ -42,9 +41,3 @@ tasks.withType(AbstractCompile).configureEach {
// Disable '-path' because we do not have some of the paths seem to be missing.
options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
}

idea {
module {
jdkName = '11'
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
plugins {
id 'java-test-fixtures'
id 'dd-trace-java.module.internal-library'
id 'idea'
}

testJvmConstraints {
Expand Down Expand Up @@ -38,9 +37,3 @@ tasks.named("compileTestJava", JavaCompile) {
// Disable '-path' because we do not have some of the paths seem to be missing.
options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
}

idea {
module {
jdkName = '11'
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.internal-library'
id 'idea'
}

// Set properties before any plugins get loaded
Expand Down Expand Up @@ -48,12 +47,6 @@ tasks.named("jar", Jar) {
from sourceSets.main_java11.output
}

idea {
module {
jdkName = '11'
}
}

tasks.withType(Test).configureEach {
conditionalJvmArgs(
it,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.internal-library'
id 'idea'
}

tracerJava {
Expand Down Expand Up @@ -37,7 +36,6 @@ dependencies {
Setup here is as following:
* We compile with Java25 compiler to get JFR definitions.
* We specify source/target as Java8 to get code that is loadable on Java8 - JFR defs are Java8 compatible.
* We force IDEA to treat this as Java11 project with 'idea' plugin below.
*/
[JavaCompile, GroovyCompile].each {
tasks.withType(it).configureEach {
Expand All @@ -49,9 +47,3 @@ dependencies {
options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
}
}

idea {
module {
jdkName = '11'
}
}
7 changes: 0 additions & 7 deletions dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id 'com.gradleup.shadow'
id 'dd-trace-java.module.internal-library'
id 'dd-trace-java.jmh-conventions'
id 'idea'
}

ext {
Expand Down Expand Up @@ -68,9 +67,3 @@ configurations.configureEach {
options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
}
}

idea {
module {
jdkName = '11'
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.instrumentation'
id 'idea'
}

tracerJava {
Expand Down Expand Up @@ -39,9 +38,3 @@ dependencies {
tasks.named("test", Test) {
useJUnitPlatform()
}

idea {
module {
jdkName = '11'
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.instrumentation'
id 'idea'
}

muzzle {
Expand Down Expand Up @@ -40,9 +39,3 @@ dependencies {
tasks.named("forbiddenApisMain_java11") {
failOnMissingClasses = false
}

idea {
module {
jdkName = '11'
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
// Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI.
id 'dd-trace-java.conventions.testing.slf4j-simple'
Expand All @@ -15,12 +14,6 @@ muzzle {
}
}

idea {
module {
jdkName = '21'
}
}

/*
* Declare previewTest, a test suite that requires the Javac/Java --enable-preview feature flag
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
// Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI.
id 'dd-trace-java.conventions.testing.slf4j-simple'
Expand All @@ -18,9 +17,3 @@ muzzle {
coreJdk('25')
}
}

idea {
module {
jdkName = '25'
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
id 'dd-trace-java.call-site-instrumentation'
}
Expand All @@ -14,12 +13,6 @@ muzzle {
}
}

idea {
module {
jdkName = '11'
}
}

csi {
javaVersion = JavaLanguageVersion.of(11)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
id 'dd-trace-java.call-site-instrumentation'
}
Expand All @@ -14,12 +13,6 @@ muzzle {
}
}

idea {
module {
jdkName = '17'
}
}

csi {
javaVersion = JavaLanguageVersion.of(17)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
id 'dd-trace-java.call-site-instrumentation'
}
Expand All @@ -14,12 +13,6 @@ muzzle {
}
}

idea {
module {
jdkName = '17'
}
}

csi {
javaVersion = JavaLanguageVersion.of(17)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
// Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI.
id 'dd-trace-java.conventions.testing.slf4j-simple'
Expand All @@ -15,12 +14,6 @@ muzzle {
}
}

idea {
module {
jdkName = '21'
}
}

// Set test compile task to use JDK 21 to use the virtual threads API
tasks.named("compileTestJava", JavaCompile) {
configureCompiler(it, JavaVersion.VERSION_21)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
id 'dd-trace-java.conventions.testing.slf4j-simple'
}
Expand All @@ -14,13 +13,6 @@ tracerJava {
addSourceSetFor(JavaVersion.VERSION_25)
}

idea {
module {
jdkName = '25'
}
}


tasks.named("compileMain_java25Java", JavaCompile) {
// This advice is loaded only on Java 25, so a follow-up can target Java 25 and restore --release.
configureCompiler(it, JavaVersion.VERSION_1_8, "Uses Foreign Function & Memory API (java.lang.foreign, Java 22+) at Java 8 bytecode")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
id 'dd-trace-java.call-site-instrumentation'
}
Expand All @@ -14,12 +13,6 @@ muzzle {
}
}

idea {
module {
jdkName = '11'
}
}

csi {
javaVersion = JavaLanguageVersion.of(11)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.instrumentation'
id 'idea'
}

muzzle {
Expand All @@ -20,10 +19,3 @@ dependencies {
tasks.named("compileTestGroovy", GroovyCompile) {
configureCompiler(it, JavaVersion.VERSION_11)
}

idea {
module {
jdkName = '11'
}
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.instrumentation'
id 'idea'
}

muzzle {
Expand All @@ -22,9 +21,3 @@ testJvmConstraints {
it.options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'])
}
}

idea {
module {
jdkName = '11'
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.instrumentation'
id 'idea'
}

muzzle {
Expand Down Expand Up @@ -127,9 +126,3 @@ tasks.named("compileMain_java11Java", JavaCompile) {
// Java 8 bytecode — override addSourceSetFor(11)'s Java 11 default
configureCompiler(it, JavaVersion.VERSION_1_8)
}

idea {
module {
jdkName = '11'
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.instrumentation'
id 'idea'
id 'java-test-fixtures'
}

Expand Down Expand Up @@ -83,9 +82,3 @@ tasks.named("compileMain_java11Java", JavaCompile) {
tasks.withType(Test).configureEach {
javaLauncher = getJavaLauncherFor(11)
}

idea {
module {
jdkName = '11'
}
}
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/mule-4.5/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'dd-trace-java.module.instrumentation'
id 'idea'
}

def muleVersion = '4.5.0'
Expand Down
Loading
Loading