Made latest SpotBugs passing.

AlexeyKuznetsov-DD · AlexeyKuznetsov-DD · commit aae1e8072130 · 2025-10-23T15:49:34.000-04:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,9 +7,8 @@ plugins {
   id("datadog.dump-hanged-test")
 
   id("com.diffplug.spotless") version "6.13.0"
-  // id("com.github.spotbugs") version "5.0.14"
-  id("com.github.spotbugs") version "6.4.2"
-  id("de.thetaphi.forbiddenapis") version "3.8"
+  id("com.github.spotbugs") version "6.4.4"
+  id("de.thetaphi.forbiddenapis") version "3.10"
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
   id("com.gradleup.shadow") version "8.3.6" apply false
   id("me.champeau.jmh") version "0.7.3" apply false
diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
   testImplementation("org.objenesis", "objenesis", "3.0.1")
   testImplementation(libs.groovy)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
-  testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")
+  testImplementation(libs.spotbugs.annotations)
 }
 
 sourceSets {
diff --git a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
@@ -47,6 +47,7 @@ public class SharedCommunicationObjects {
   @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
   public boolean forceClearTextHttpForIntakeClient;
 
+  @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
   public HttpUrl agentUrl;
 
   @SuppressFBWarnings("PA_PUBLIC_PRIMITIVE_ATTRIBUTE")
diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java
@@ -50,7 +50,7 @@ public static boolean checkEnvironment(String temp, StringBuilder sb) {
     boolean result = false;
     result |= checkJFR(sb);
     result |= checkDdprof(sb);
-    if (!result) {;
+    if (!result) {
       appendLine("Profiler is not supported on this JVM.", sb);
       return false;
     } else {
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageImpl.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/usm/UsmMessageImpl.java
@@ -22,7 +22,7 @@ enum MessageType {
   private static final Logger log = LoggerFactory.getLogger(BaseUsmMessage.class);
 
   // TODO: sync with systemprobe code
-  static final NativeLong USM_IOCTL_ID = new NativeLong(0xda7ad09L);;
+  static final NativeLong USM_IOCTL_ID = new NativeLong(0xda7ad09L);
 
   abstract static class BaseUsmMessage implements UsmMessage {
 
diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
@@ -1,5 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 import java.util.concurrent.atomic.AtomicBoolean
 
 plugins {
@@ -29,7 +28,6 @@ tasks.named("processResources") {
 sourceSets {
   "main_java6" {
     java.srcDirs "${project.projectDir}/src/main/java6"
-
   }
   main.resources.srcDir(includedAgentDir)
 }
@@ -43,7 +41,7 @@ tasks.named("compileJava") {
 }
 
 dependencies {
-  main_java6CompileOnly 'de.thetaphi:forbiddenapis:3.8'
+  main_java6CompileOnly libs.forbiddenapis
   testImplementation sourceSets.main_java6.output
 }
 
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle
@@ -117,7 +117,7 @@ dependencies {
   baseTestImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.11', version: '10.0.10'
 
   iastTestImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
-  iastTestCompileOnly group: 'de.thetaphi', name: 'forbiddenapis', version: '3.4'
+  iastTestCompileOnly libs.forbiddenapis
   iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
   iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8')
   iastTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
diff --git a/dd-java-agent/instrumentation/exception-profiling/build.gradle b/dd-java-agent/instrumentation/exception-profiling/build.gradle
@@ -11,7 +11,7 @@ apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
 dependencies {
-  testImplementation 'de.thetaphi:forbiddenapis:3.8'
+  testImplementation libs.forbiddenapis
   testImplementation libs.bundles.junit5
   testImplementation libs.bundles.jmc
   testImplementation libs.commons.math
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle
@@ -60,7 +60,7 @@ dependencies {
   testFixturesApi project(':dd-trace-api')
   testFixturesApi project(':dd-java-agent:instrumentation:trace-annotation')
   testFixturesApi project(':dd-java-agent:instrumentation-testing')
-  testFixturesApi 'com.github.spotbugs:spotbugs-annotations:4.2.0'
+  testFixturesApi libs.spotbugs.annotations
 
   testImplementation libs.kotlin
   testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0"
diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle
@@ -63,7 +63,7 @@ dependencies {
 
   iastTestImplementation group: 'com.github.pjfanning', name: 'pekko-http-jackson_2.12', version: '2.1.0'
   iastTestImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
-  iastTestCompileOnly group: 'de.thetaphi', name: 'forbiddenapis', version: '3.4'
+  iastTestCompileOnly libs.forbiddenapis
   iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
   iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.12')
   iastTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
diff --git a/dd-java-agent/instrumentation/ratpack-1.5/build.gradle b/dd-java-agent/instrumentation/ratpack-1.5/build.gradle
@@ -15,7 +15,7 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
   compileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.5.0'
-  compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.0'
+  compileOnly libs.spotbugs.annotations
 
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
   testImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0'
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10/build.gradle
@@ -28,7 +28,7 @@ tasks.named("compileMain_java11Java", JavaCompile) {
 
 dependencies {
   main_java11CompileOnly group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.0.0'
-  main_java11CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.0'
+  main_java11CompileOnly libs.spotbugs.annotations
 
   testImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.0.0'
   latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+'
diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle
@@ -123,7 +123,8 @@ tasks.named("compileTestGroovy", GroovyCompile) {
 
 ["compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each {
   tasks.named(it, GroovyCompile) {
-    configureCompiler(it, 17)}
+    configureCompiler(it, 17)
+  }
 }
 
 tasks.named("compileTestJava", JavaCompile) {
diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle
@@ -25,7 +25,8 @@ tasks.named("shadowJar", ShadowJar) {
   transform(PropertiesFileTransformer) {
     paths = ['META-INF/spring.factories']
     mergeStrategy = "append"
-  }}
+  }
+}
 
 dependencies {
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.6.0+'
diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle
@@ -80,7 +80,7 @@ dependencies {
 
   implementation group: 'com.google.re2j', name: 're2j', version: '1.7'
 
-  compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.0'
+  compileOnly libs.spotbugs.annotations
 
   // We have autoservices defined in test subtree, looks like we need this to be able to properly rebuild this
   testAnnotationProcessor libs.autoservice.processor
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateMetric.java b/dd-trace-core/src/main/java/datadog/trace/common/metrics/AggregateMetric.java
@@ -7,11 +7,7 @@
 
 /** Not thread-safe. Accumulates counts and durations. */
 @SuppressFBWarnings(
-    value = {
-      "AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE",
-      "AT_NONATOMIC_64BIT_PRIMITIVE",
-      "AT_STALE_THREAD_WRITE_OF_PRIMITIVE"
-    },
+    value = {"AT_NONATOMIC_OPERATIONS_ON_SHARED_VARIABLE", "AT_STALE_THREAD_WRITE_OF_PRIMITIVE"},
     justification = "Explicitly not thread-safe. Accumulates counts and durations.")
 public final class AggregateMetric {
 
@@ -75,6 +71,7 @@ public Histogram getErrorLatencies() {
     return errorLatencies;
   }
 
+  @SuppressFBWarnings("AT_NONATOMIC_64BIT_PRIMITIVE")
   public void clear() {
     this.errorCount = 0;
     this.hitCount = 0;
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ListWriter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ListWriter.java
@@ -6,6 +6,7 @@
 
 import datadog.trace.core.DDSpan;
 import datadog.trace.core.MetadataConsumer;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
@@ -32,6 +33,7 @@ public List<DDSpan> firstTrace() {
     return get(0);
   }
 
+  @SuppressFBWarnings("NN_NAKED_NOTIFY")
   @Override
   public void write(List<DDSpan> trace) {
     if (!filter.accept(trace)) {
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/GenerationalUtf8Cache.java
@@ -64,11 +64,7 @@
  * provide better cache utilization.
  */
 @SuppressFBWarnings(
-    value = {
-      "IS2_INCONSISTENT_SYNC",
-      "AT_NONATOMIC_64BIT_PRIMITIVE",
-      // "AT_STALE_THREAD_WRITE_OF_PRIMITIVE"
-    },
+    value = "IS2_INCONSISTENT_SYNC",
     justification =
         "stat updates are deliberately racy - sync is only used to prevent simultaneous bulk updates")
 public final class GenerationalUtf8Cache implements EncodingCache {
@@ -142,6 +138,7 @@ public int tenuredCapacity() {
   }
 
   /** Updates access time used @link {@link #getUtf8(String, String)} to the provided value */
+  @SuppressFBWarnings("AT_NONATOMIC_64BIT_PRIMITIVE")
   public void updateAccessTime(long accessTimeMs) {
     this.accessTimeMs = accessTimeMs;
   }
diff --git a/gradle/forbiddenapis.gradle b/gradle/forbiddenapis.gradle
@@ -18,7 +18,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "de.thetaphi:forbiddenapis:3.8"
+    classpath libs.forbiddenapis
   }
 }
 
@@ -38,5 +38,5 @@ tasks.matching { it.name.startsWith('forbiddenApis') && it.name.endsWith('Test')
 }
 
 dependencies {
-  compileOnly group: 'de.thetaphi', name: 'forbiddenapis', version: '3.8'
+  compileOnly libs.forbiddenapis
 }
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
@@ -1 +1,3 @@
+org.gradle.java.installations.auto-detect=false
+org.gradle.java.installations.auto-download=false
 toolchainVersion=21
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -37,6 +37,8 @@ cafe_crypto = "0.1.0"
 lz4 = "1.7.1"
 jmh = "1.37"
 jackson = "2.20.0"
+forbiddenapis = "3.10"
+spotbugs_annotations = "4.9.8"
 
 [libraries]
 slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
@@ -57,14 +59,14 @@ asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
 asm-util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
 asmcommons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
 dogstatsd = { module = "com.datadoghq:java-dogstatsd-client", version.ref = "dogstatsd" }
-jnr-unixsocket = { module = "com.github.jnr:jnr-unixsocket", version.ref = "jnr-unixsocket"}
+jnr-unixsocket = { module = "com.github.jnr:jnr-unixsocket", version.ref = "jnr-unixsocket" }
 
 cafe-crypto-ed25519 = { module = "cafe.cryptography:ed25519-elisabeth", version.ref = "cafe_crypto" }
 cafe-crypto-curve25519 = { module = "cafe.cryptography:curve25519-elisabeth", version.ref = "cafe_crypto" }
 
 lz4 = { module = "org.lz4:lz4-java", version.ref = "lz4" }
 # aircompressor v3 requires Java 22
-aircompressor = { module = 'io.airlift:aircompressor', version = '2.0.2'}
+aircompressor = { module = 'io.airlift:aircompressor', version = '2.0.2' }
 
 # Testing
 spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
@@ -102,7 +104,10 @@ coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version
 jmc-common = { module = "org.openjdk.jmc:common", version.ref = "jmc" }
 jmc-flightrecorder = { module = "org.openjdk.jmc:flightrecorder", version.ref = "jmc" }
 
-jackson-databind = {module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson"}
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
+
+forbiddenapis = { module = "de.thetaphi:forbiddenapis", version.ref = "forbiddenapis" }
+spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugs_annotations" }
 
 [bundles]
 asm = ["asm", "asmcommons"]
diff --git a/gradle/spotbugFilters/exclude.xml b/gradle/spotbugFilters/exclude.xml
@@ -3,7 +3,6 @@
   <Match>
     <Or>
       <Class name="~com.datadog.debugger.util.WeakIdentityHashMap.*" />
-      <Package name="io.sqreen.testapp.sampleapp" />
       <Package name="datadog.trace.bootstrap.instrumentation.decorator.http.utils" />
       <Package name="datadog.smoketest.appsec.springboot.controller" />
       <Package name="datadog.smoketest.appsec.springboot.service" />
diff --git a/gradle/spotbugs.gradle b/gradle/spotbugs.gradle
@@ -60,8 +60,8 @@ tasks.matching { it.name.startsWith('spotbugs') }.configureEach {
 
 dependencies {
   compileOnly 'net.jcip:jcip-annotations:1.0'
-  compileOnly 'com.github.spotbugs:spotbugs-annotations:4.2.0'
+  compileOnly libs.spotbugs.annotations
 
   testImplementation 'net.jcip:jcip-annotations:1.0'
-  testImplementation 'com.github.spotbugs:spotbugs-annotations:4.2.0'
+  testImplementation libs.spotbugs.annotations
 }
diff --git a/internal-api/internal-api-9/build.gradle.kts b/internal-api/internal-api-9/build.gradle.kts
@@ -3,7 +3,7 @@ import java.nio.file.Paths
 
 plugins {
   `java-library`
-  id("de.thetaphi.forbiddenapis") version "3.8"
+  id("de.thetaphi.forbiddenapis") version "3.10"
   id("me.champeau.jmh")
   idea
 }
@@ -18,7 +18,7 @@ java {
   }
 }
 
-tasks.withType<Javadoc>().configureEach() {
+tasks.withType<Javadoc>().configureEach {
   javadocTool = javaToolchains.javadocToolFor(java.toolchain)
 }
 
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/EndpointCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/EndpointCollector.java
@@ -8,7 +8,7 @@
 
 @SuppressFBWarnings(
     value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
-    justification = "Other usages")
+    justification = "Usage in tests")
 public class EndpointCollector {
 
   private static final EndpointCollector INSTANCE = new EndpointCollector();
diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/LogCollector.java
@@ -14,9 +14,6 @@
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 
-@SuppressFBWarnings(
-    value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
-    justification = "Usage in tests")
 public class LogCollector {
   public static final Marker SEND_TELEMETRY = MarkerFactory.getMarker("SEND_TELEMETRY");
   public static final Marker EXCLUDE_TELEMETRY = MarkerFactory.getMarker("EXCLUDE_TELEMETRY");
@@ -33,7 +30,9 @@ private LogCollector() {
     this(DEFAULT_MAX_CAPACITY);
   }
 
-  // For testing purpose
+  @SuppressFBWarnings(
+      value = "SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR",
+      justification = "Usage in tests")
   LogCollector(int maxCapacity) {
     this.maxCapacity = maxCapacity;
     this.rawLogMessages = new ConcurrentHashMap<>(maxCapacity);
diff --git a/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackWalker.java b/internal-api/src/main/java/datadog/trace/util/stacktrace/HotSpotStackWalker.java
@@ -1,18 +1,19 @@
 package datadog.trace.util.stacktrace;
 
 import datadog.environment.JavaVirtualMachine;
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.util.function.Function;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 public class HotSpotStackWalker extends AbstractStackWalker {
+  @SuppressForbidden sun.misc.JavaLangAccess access;
 
-  sun.misc.JavaLangAccess access;
-
+  @SuppressForbidden
   HotSpotStackWalker() {
     try {
       access = sun.misc.SharedSecrets.getJavaLangAccess();
-    } catch (Throwable e) {
+    } catch (Throwable ignored) {
     }
   }
 
diff --git a/internal-api/src/test/groovy/datadog/trace/api/env/FixedCapturedEnvironment.java b/internal-api/src/test/groovy/datadog/trace/api/env/FixedCapturedEnvironment.java
@@ -4,6 +4,8 @@
 
 /** Helper class that has access to {@link CapturedEnvironment} */
 public class FixedCapturedEnvironment {
+  private FixedCapturedEnvironment() {}
+
   /** Load properties instance into the {@code CapturedEnvironment} instance. */
   public static void useFixedEnv(final Map<String, String> properties) {
     CapturedEnvironment.useFixedEnv(properties);
diff --git a/telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverQueueSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverQueueSpecification.groovy
@@ -98,6 +98,5 @@ class DependencyResolverQueueSpecification extends DepSpecification {
 
     then:
     assert deps.isEmpty()
-
   }
 }
diff --git a/utils/config-utils/src/main/java/datadog/trace/api/env/CapturedEnvironment.java b/utils/config-utils/src/main/java/datadog/trace/api/env/CapturedEnvironment.java
@@ -41,7 +41,7 @@ public ProcessInfo() {
   private final Map<String, String> properties;
   private ProcessInfo processInfo;
 
-  CapturedEnvironment() {
+  private CapturedEnvironment() {
     properties = new HashMap<>();
     processInfo = new ProcessInfo();
     properties.put(GeneralConfig.SERVICE_NAME, autodetectServiceName());
diff --git a/utils/config-utils/src/main/java/datadog/trace/config/inversion/ConfigHelper.java b/utils/config-utils/src/main/java/datadog/trace/config/inversion/ConfigHelper.java
@@ -11,6 +11,7 @@
 import org.slf4j.LoggerFactory;
 
 public class ConfigHelper {
+  private ConfigHelper() {}
 
   /** Config Inversion strictness policy for enforcement of undocumented environment variables */
   public enum StrictnessPolicy {
diff --git a/utils/config-utils/src/test/groovy/datadog/trace/api/env/CapturedEnvironmentTest.groovy b/utils/config-utils/src/test/groovy/datadog/trace/api/env/CapturedEnvironmentTest.groovy
diff --git a/utils/test-utils/src/main/groovy/datadog/trace/test/util/DDSpecification.groovy b/utils/test-utils/src/main/groovy/datadog/trace/test/util/DDSpecification.groovy

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ dependencies {`
`39`	`39`	`testImplementation("org.objenesis", "objenesis", "3.0.1")`
`40`	`40`	`testImplementation(libs.groovy)`
`41`	`41`	`testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")`
`42`		`- testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")`
	`42`	`+ testImplementation(libs.spotbugs.annotations)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar`
`2`		`-`
`3`	`2`	`import java.util.concurrent.atomic.AtomicBoolean`
`4`	`3`
`5`	`4`	`plugins {`
`@@ -29,7 +28,6 @@ tasks.named("processResources") {`
`29`	`28`	`sourceSets {`
`30`	`29`	`"main_java6" {`
`31`	`30`	`java.srcDirs "${project.projectDir}/src/main/java6"`
`32`		`-`
`33`	`31`	`}`
`34`	`32`	`main.resources.srcDir(includedAgentDir)`
`35`	`33`	`}`
`@@ -43,7 +41,7 @@ tasks.named("compileJava") {`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`dependencies {`
`46`		`- main_java6CompileOnly 'de.thetaphi:forbiddenapis:3.8'`
	`44`	`+ main_java6CompileOnly libs.forbiddenapis`
`47`	`45`	`testImplementation sourceSets.main_java6.output`
`48`	`46`	`}`
`49`	`47`