Merge branch 'master' into mattalp/reroute-gradle-profiler-dependencies

Author: jbachorik

dd-java-agent/instrumentation/spark-executor/build.gradle

@@ -37,9 +37,10 @@ dependencies {
   baseTestImplementation group: 'org.apache.spark', name: "spark-core_2.12", version: "2.4.0"
   baseTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: "2.4.0"
 
-  latest212DepTestImplementation group: 'org.apache.spark', name: "spark-core_2.12", version: '3.+'
-  latest212DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: '3.+'
+  // FIXME: 3.6.0 seems missing from central
+  latest212DepTestImplementation group: 'org.apache.spark', name: "spark-core_2.12", version: '3.5.5'
+  latest212DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.12", version: '3.5.5'
 
-  latest213DepTestImplementation group: 'org.apache.spark', name: "spark-core_2.13", version: '3.+'
-  latest213DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.13", version: '3.+'
+  latest213DepTestImplementation group: 'org.apache.spark', name: "spark-core_2.13", version: '3.5.5'
+  latest213DepTestImplementation group: 'org.apache.spark', name: "spark-sql_2.13", version: '3.5.5'
 }

dd-java-agent/instrumentation/spark/spark_2.13/build.gradle

@@ -52,9 +52,10 @@ dependencies {
   test_spark32Implementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: "3.2.4"
 
   // FIXME: Currently not working on Spark 4.0.0 preview releases.
-  latestDepTestImplementation group: 'org.apache.spark', name: "spark-core_$scalaVersion", version: '3.+'
-  latestDepTestImplementation group: 'org.apache.spark', name: "spark-sql_$scalaVersion", version: '3.+'
-  latestDepTestImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: '3.+'
+  // FIXME: 3.6.0 seems missing from central
+  latestDepTestImplementation group: 'org.apache.spark', name: "spark-core_$scalaVersion", version: '3.5.5'
+  latestDepTestImplementation group: 'org.apache.spark', name: "spark-sql_$scalaVersion", version: '3.5.5'
+  latestDepTestImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: '3.5.5'
 }
 
 tasks.named("test").configure {