Removing some gralde warnings
MODIFY
build.gradle
build.gradle
+import nebula.plugin.release.git.opinion.Strategies
+
plugins {
id 'idea'
@@ -12,14 +14,14 @@ plugins {
id 'com.dorongold.task-tree' version '1.5'
- id "com.github.johnrengelman.shadow" version "5.2.0"
+ id "com.github.johnrengelman.shadow" version "6.0.0"
id "com.diffplug.gradle.spotless" version "4.3.0"
id "com.github.spotbugs" version "4.0.1"
}
release {
- defaultVersionStrategy = nebula.plugin.release.git.opinion.Strategies.SNAPSHOT
+ defaultVersionStrategy = Strategies.SNAPSHOT
}
def isCI = System.getenv("CI") != null

MODIFY
buildSrc/src/main/java/io/opentelemetry/instrumentation/gradle/AutoInstrumentationPlugin.java
buildSrc/src/main/java/io/opentelemetry/instrumentation/gradle/AutoInstrumentationPlugin.java
@@ -151,8 +151,12 @@ public class AutoInstrumentationPlugin implements Plugin<Project> {
}
private static class BootstrapClasspath implements CommandLineArgumentProvider {
+ private final File bootstrapJar;
+
@Internal
- File bootstrapJar;
+ public File getBootstrapJar() {
+ return bootstrapJar;
+ }
public BootstrapClasspath(File bootstrapJar) {
this.bootstrapJar = bootstrapJar;

MODIFY
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
@@ -3,3 +3,4 @@ distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+distributionSha256Sum=83fa7c3e5ab84c3c5c4a04fb16947338209efa9aab1f6bf09a5d0e3d2ed87742
\ No newline at end of file

MODIFY
instrumentation/spring/spring-data-1.8/spring-data-1.8.gradle
instrumentation/spring/spring-data-1.8/spring-data-1.8.gradle
-// This file includes software developed at SignalFx
-
apply from: "$rootDir/gradle/instrumentation.gradle"
muzzle {
@@ -20,12 +18,6 @@ muzzle {
}
}
-testSets {
- latestDepTest {
- dirName = 'test'
- }
-}
-
// DQH - API changes that impact instrumentation occurred in spring-data-commons in March 2014.
// For now, that limits support to spring-data-commons 1.9.0 (maybe 1.8.0).
// For testing, chose a couple spring-data modules that are old enough to work with 1.9.0.

MODIFY
settings.gradle
settings.gradle
@@ -183,7 +183,6 @@ include ":javaagent-exporters:zipkin"
include ':benchmark'
include ':benchmark-integration'
include ':benchmark-integration:jetty-perftest'
-include ':benchmark-integration:play-perftest'
def setBuildFile(project) {
if (['auto', 'library', 'testing'].contains(project.projectDir.name)) {

Removing some gralde warnings (#1094)