Agent second batch

Author: sarahchen6

dd-java-agent/agent-profiling/build.gradle

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -38,10 +40,10 @@ configurations {
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }

dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle

@@ -51,7 +51,7 @@ dependencies {
   }
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 

dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle

@@ -43,7 +43,7 @@ tasks.named("compileTestJava") {
   options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'/*, '-Werror'*/])
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 

dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle

@@ -48,7 +48,7 @@ dependencies {
   }
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 

dd-java-agent/agent-profiling/profiling-ddprof/build.gradle

@@ -57,7 +57,7 @@ configurations.configureEach {
   }
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 

dd-java-agent/agent-tooling/build.gradle

@@ -70,11 +70,11 @@ jmh {
 compileJmhJava.dependsOn compileTestJava
 compileTestJava.dependsOn 'generateTestClassNameTries'
 
-forbiddenApisJmh {
+tasks.named("forbiddenApisJmh") {
   ignoreFailures = true
 }
 
-forbiddenApisTest_java11 {
+tasks.named("forbiddenApisTest_java11") {
   // it will fail due to missing JDK >= 9 classes
   // java.lang.ClassNotFoundException: java.lang.invoke.StringConcatFactory
   failOnMissingClasses = false

dd-java-agent/appsec/build.gradle

@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 
@@ -25,16 +26,16 @@ dependencies {
   testImplementation libs.jackson.databind
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   exclude '**/*-dbgsym.zip'
   dependencies deps.excludeShared
 }
 
-jar {
+tasks.named("jar", Jar) {
   archiveClassifier = 'unbundled'
 }
 
-processResources {
+tasks.named("processResources", ProcessResources) {
   doLast {
     fileTree(dir: outputs.files.asPath, includes: ['**/*.json']).each {
       it.text = JsonOutput.toJson(new JsonSlurper().parse(it))
@@ -52,7 +53,8 @@ jmh {
     includes = [project.jmhIncludes]
   }
 }
-jmhJar {
+
+tasks.named("jmhJar", Jar) {
   exclude 'org/slf4j/impl/**/*'
 }
 
@@ -95,7 +97,9 @@ ext {
 tasks.withType(Test).configureEach {
   jvmArgs += ['-Ddd.appsec.enabled=true']
 }
+
 def rootDir = project.rootDir
+
 spotless {
   java {
     target 'src/**/*.java'

dd-java-agent/benchmark-integration/jetty-perftest/build.gradle

@@ -8,7 +8,7 @@ dependencies {
   implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120'
 }
 
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes("Main-Class": "datadog.perftest.jetty.JettyPerftest")
   }

dd-java-agent/cws-tls/build.gradle

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -18,7 +20,7 @@ dependencies {
   testImplementation project(":dd-java-agent:testing")
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies deps.excludeShared
   // exclude this since it's available in the instrumentation jar
   exclude 'com/sun/jna/**/*'

dd-java-agent/ddprof-lib/build.gradle

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id "com.gradleup.shadow"
 }
@@ -12,7 +14,7 @@ dependencies {
   api project(':dd-trace-api')
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   dependencies {
     deps.excludeShared
     exclude '**/*.debug'