diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle index 3895cb3cbd9..03ba77796f6 100644 --- a/dd-java-agent/agent-bootstrap/build.gradle +++ b/dd-java-agent/agent-bootstrap/build.gradle @@ -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 @@ -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 diff --git a/dd-java-agent/agent-installer/build.gradle b/dd-java-agent/agent-installer/build.gradle index 67496f93801..1579982d6c6 100644 --- a/dd-java-agent/agent-installer/build.gradle +++ b/dd-java-agent/agent-installer/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.internal-library' - id 'idea' } minimumBranchCoverage = 0.6 @@ -71,9 +70,3 @@ tasks.named("jar", Jar) { from sourceSets.main_java11.output from sourceSets.main_java25.output } - -idea { - module { - jdkName = '11' - } -} diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle index b2c1e46f57f..1b31128050a 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.internal-library' - id 'idea' } tracerJava { @@ -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' - } -} diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle index aa1d7f6e235..46b50a861dc 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle @@ -1,7 +1,6 @@ plugins { id 'java-test-fixtures' id 'dd-trace-java.module.internal-library' - id 'idea' } testJvmConstraints { @@ -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' - } -} diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle index 83372c7404b..3e56b61fd59 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.internal-library' - id 'idea' } // Set properties before any plugins get loaded @@ -48,12 +47,6 @@ tasks.named("jar", Jar) { from sourceSets.main_java11.output } -idea { - module { - jdkName = '11' - } -} - tasks.withType(Test).configureEach { conditionalJvmArgs( it, diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle index fa8f9c5f6da..b2abf7ed724 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.internal-library' - id 'idea' } tracerJava { @@ -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 { @@ -49,9 +47,3 @@ dependencies { options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/]) } } - -idea { - module { - jdkName = '11' - } -} diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle index 698d856e307..b37cd7a1d80 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle @@ -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 { @@ -68,9 +67,3 @@ configurations.configureEach { options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/]) } } - -idea { - module { - jdkName = '11' - } -} diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle index 5f2b00b341f..ff446035c39 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle +++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.instrumentation' - id 'idea' } tracerJava { @@ -39,9 +38,3 @@ dependencies { tasks.named("test", Test) { useJUnitPlatform() } - -idea { - module { - jdkName = '11' - } -} diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle index 4ad8f2f3f66..30441e8757d 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.instrumentation' - id 'idea' } muzzle { @@ -40,9 +39,3 @@ dependencies { tasks.named("forbiddenApisMain_java11") { failOnMissingClasses = false } - -idea { - module { - jdkName = '11' - } -} diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle index b3845b89090..73517be9a11 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle @@ -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' @@ -15,12 +14,6 @@ muzzle { } } -idea { - module { - jdkName = '21' - } -} - /* * Declare previewTest, a test suite that requires the Javac/Java --enable-preview feature flag */ diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle index cde1b82b47d..d461a4a676e 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle @@ -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' @@ -18,9 +17,3 @@ muzzle { coreJdk('25') } } - -idea { - module { - jdkName = '25' - } -} diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle index 7b05d2326d6..fef4c6a3402 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle @@ -1,5 +1,4 @@ plugins { - id 'idea' id 'dd-trace-java.module.instrumentation' id 'dd-trace-java.call-site-instrumentation' } @@ -14,12 +13,6 @@ muzzle { } } -idea { - module { - jdkName = '11' - } -} - csi { javaVersion = JavaLanguageVersion.of(11) } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle index e7c9fd8cc1f..a5c66023cf7 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle @@ -1,5 +1,4 @@ plugins { - id 'idea' id 'dd-trace-java.module.instrumentation' id 'dd-trace-java.call-site-instrumentation' } @@ -14,12 +13,6 @@ muzzle { } } -idea { - module { - jdkName = '17' - } -} - csi { javaVersion = JavaLanguageVersion.of(17) } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle index 3ef786ba1a6..9a0639387ef 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle @@ -1,5 +1,4 @@ plugins { - id 'idea' id 'dd-trace-java.module.instrumentation' id 'dd-trace-java.call-site-instrumentation' } @@ -14,12 +13,6 @@ muzzle { } } -idea { - module { - jdkName = '17' - } -} - csi { javaVersion = JavaLanguageVersion.of(17) } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle index 9fbe0263a3c..f4c3bfd5bb0 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle @@ -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' @@ -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) diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle index 86cb2b3a59d..4a17a7a0f20 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle @@ -1,5 +1,4 @@ plugins { - id 'idea' id 'dd-trace-java.module.instrumentation' id 'dd-trace-java.conventions.testing.slf4j-simple' } @@ -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") diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle index 5c4b26a86da..41df18b69a5 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle @@ -1,5 +1,4 @@ plugins { - id 'idea' id 'dd-trace-java.module.instrumentation' id 'dd-trace-java.call-site-instrumentation' } @@ -14,12 +13,6 @@ muzzle { } } -idea { - module { - jdkName = '11' - } -} - csi { javaVersion = JavaLanguageVersion.of(11) } diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle index a5b7d0f4e40..866cddc928b 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.instrumentation' - id 'idea' } muzzle { @@ -20,10 +19,3 @@ dependencies { tasks.named("compileTestGroovy", GroovyCompile) { configureCompiler(it, JavaVersion.VERSION_11) } - -idea { - module { - jdkName = '11' - } -} - diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle index b8b2ecf519c..e198f310044 100644 --- a/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.instrumentation' - id 'idea' } muzzle { @@ -22,9 +21,3 @@ testJvmConstraints { it.options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path']) } } - -idea { - module { - jdkName = '11' - } -} diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle index bc104ad4eb5..1e1f1c1a270 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.instrumentation' - id 'idea' } muzzle { @@ -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' - } -} diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle index a41d9941a33..d7b9e093d21 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.instrumentation' - id 'idea' id 'java-test-fixtures' } @@ -83,9 +82,3 @@ tasks.named("compileMain_java11Java", JavaCompile) { tasks.withType(Test).configureEach { javaLauncher = getJavaLauncherFor(11) } - -idea { - module { - jdkName = '11' - } -} diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle index 107f589016b..612706724d1 100644 --- a/dd-java-agent/instrumentation/mule-4.5/build.gradle +++ b/dd-java-agent/instrumentation/mule-4.5/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.instrumentation' - id 'idea' } def muleVersion = '4.5.0' diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle index f8b4000eef5..376f53f5ad1 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.instrumentation' - id 'idea' } testJvmConstraints { @@ -17,12 +16,6 @@ muzzle { } } -idea { - module { - jdkName = '17' - } -} - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle index 38550a78636..95acf765e56 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle @@ -1,6 +1,5 @@ plugins { id 'dd-trace-java.module.instrumentation' - id 'idea' } testJvmConstraints { @@ -17,12 +16,6 @@ muzzle { } } -idea { - module { - jdkName = '17' - } -} - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-smoke-tests/iast-util/iast-util-11/build.gradle b/dd-smoke-tests/iast-util/iast-util-11/build.gradle index 65dc557e9ff..d30c851bb6d 100644 --- a/dd-smoke-tests/iast-util/iast-util-11/build.gradle +++ b/dd-smoke-tests/iast-util/iast-util-11/build.gradle @@ -1,17 +1,10 @@ plugins { - id 'idea' id 'java-test-fixtures' id 'dd-trace-java.module.smoke-test' } description = 'iast-smoke-tests-utils-java-11' -idea { - module { - jdkName = '11' - } -} - dependencies { api project(':dd-smoke-tests') compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.2.0.RELEASE' diff --git a/dd-smoke-tests/iast-util/iast-util-17/build.gradle b/dd-smoke-tests/iast-util/iast-util-17/build.gradle index 139ad6397bd..5981e5fc1e7 100644 --- a/dd-smoke-tests/iast-util/iast-util-17/build.gradle +++ b/dd-smoke-tests/iast-util/iast-util-17/build.gradle @@ -1,17 +1,10 @@ plugins { - id 'idea' id 'java-test-fixtures' id 'dd-trace-java.module.smoke-test' } description = 'iast-smoke-tests-utils-java-17' -idea { - module { - jdkName = '17' - } -} - dependencies { api project(':dd-smoke-tests') compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.2.0.RELEASE' diff --git a/internal-api/internal-api-9/build.gradle.kts b/internal-api/internal-api-9/build.gradle.kts index a5cb2b143c2..47ede220d8b 100644 --- a/internal-api/internal-api-9/build.gradle.kts +++ b/internal-api/internal-api-9/build.gradle.kts @@ -3,7 +3,6 @@ import datadog.gradle.configureCompiler plugins { `java-library` id("dd-trace-java.jmh-conventions") - idea id("dd-trace-java.module.internal-api") } @@ -43,12 +42,6 @@ dependencies { testImplementation(libs.slf4j) } -idea { - module { - jdkName = "11" - } -} - jmh { jmhVersion = libs.versions.jmh duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE diff --git a/products/feature-flagging/feature-flagging-api/build.gradle.kts b/products/feature-flagging/feature-flagging-api/build.gradle.kts index a787e7b3fd7..bea9ca08272 100644 --- a/products/feature-flagging/feature-flagging-api/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-api/build.gradle.kts @@ -3,7 +3,6 @@ import datadog.gradle.plugin.testJvmConstraints.TestJvmConstraintsExtension plugins { `java-library` - idea id("dd-trace-java.module.distributable.api") id("me.champeau.jmh") } @@ -26,12 +25,6 @@ publishing { } } -idea { - module { - jdkName = "11" - } -} - java { toolchain { languageVersion = JavaLanguageVersion.of(11) diff --git a/utils/socket-utils/build.gradle.kts b/utils/socket-utils/build.gradle.kts index 75775b6d30e..82fe95a4814 100644 --- a/utils/socket-utils/build.gradle.kts +++ b/utils/socket-utils/build.gradle.kts @@ -2,7 +2,6 @@ import datadog.gradle.configureCompiler plugins { `java-library` - idea id("dd-trace-java.module.internal-library") id("dd-trace-java.jmh-conventions") } @@ -35,9 +34,3 @@ listOf("compileMain_java17Java", "compileTestJava", "compileJmhJava").forEach { configureCompiler(JavaVersion.VERSION_1_8, "Uses java.net.UnixDomainSocketAddress (Java 16+) at Java 8 bytecode") } } - -idea { - module { - jdkName = "17" - } -}