From 077b3d14ce05ffdfbc9e58aa7524e383617308cd Mon Sep 17 00:00:00 2001
From: Jeff Alder <49817386+jeffalder@users.noreply.github.com>
Date: Tue, 7 Apr 2026 08:33:49 -0400
Subject: [PATCH 1/4] Add several test and dev configurations

---
 src/Strategy/Gradle/Common.hs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Strategy/Gradle/Common.hs b/src/Strategy/Gradle/Common.hs
index e2d6e055d6..4fe2ff2aa7 100644
--- a/src/Strategy/Gradle/Common.hs
+++ b/src/Strategy/Gradle/Common.hs
@@ -40,6 +40,7 @@ configNameToLabel :: Text -> GradleLabel
 configNameToLabel conf =
   case conf of
     "compileOnly" -> Env EnvDevelopment
+    x | x `elem` knownDevConfigs -> Env EnvDevelopment
     x | x `elem` knownTestConfigs -> Env EnvTesting
     x | isDefaultAndroidDevConfig x -> Env EnvDevelopment
     x | isDefaultAndroidTestConfig x -> Env EnvTesting
@@ -47,7 +48,11 @@ configNameToLabel conf =
 
 knownTestConfigs :: [Text]
 knownTestConfigs =
-  [ "testImplementation"
+  [ "aggregateCodeCoverageReportResults"
+  , "jacocoAgent"
+  , "jacocoAggregation"
+  , "jacocoAnt"
+  , "testImplementation"
   , "testCompileOnly"
   , "testRuntimeOnly"
   , "testCompileClasspath"
@@ -61,6 +66,13 @@ knownTestConfigs =
   , "testFixturesApiElements"
   ]
 
+knownDevConfigs :: [Text]
+knownDevConfigs =
+  [ "spotbugs"
+  , "spotbugsPlugins"
+  , "spotbugsSlf4j"
+  ]
+
 getDebugMessages :: Text -> [Text]
 getDebugMessages text = getLogWithPrefix text "FOSSA-DEBUG"
 

From 3f2f3d27e14e43f8d42fbc6e17546c45949b0cfd Mon Sep 17 00:00:00 2001
From: Jeff Alder <49817386+jeffalder@users.noreply.github.com>
Date: Tue, 7 Apr 2026 08:43:43 -0400
Subject: [PATCH 2/4] Update docs

---
 docs/references/strategies/languages/gradle/gradle.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/references/strategies/languages/gradle/gradle.md b/docs/references/strategies/languages/gradle/gradle.md
index 41223ceeda..1d8a0828e1 100644
--- a/docs/references/strategies/languages/gradle/gradle.md
+++ b/docs/references/strategies/languages/gradle/gradle.md
@@ -236,10 +236,17 @@ With newer versions of gradle, some configurations are no longer supported (`com
 FOSSA classifies any dependencies originating from the following configurations as development dependencies:
 ```
 - compileOnly
+- spotbugs
+- spotbugsPlugins
+- spotbugsSlf4j
 ```
 
 FOSSA classifies any dependencies originating from the following configurations as test dependencies:
 ```
+- aggregateCodeCoverageReportResults
+- jacocoAgent
+- jacocoAggregation
+- jacocoAnt
 - testImplementation
 - testCompileOnly
 - testRuntimeOnly

From 31b95ee07b7adaf8cdf3c8efb7e2bc54ef39f6e1 Mon Sep 17 00:00:00 2001
From: Jeff Alder <49817386+jeffalder@users.noreply.github.com>
Date: Tue, 7 Apr 2026 08:44:19 -0400
Subject: [PATCH 3/4] Merge compileOnly with other dev configs

---
 src/Strategy/Gradle/Common.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Strategy/Gradle/Common.hs b/src/Strategy/Gradle/Common.hs
index 4fe2ff2aa7..26ca06869f 100644
--- a/src/Strategy/Gradle/Common.hs
+++ b/src/Strategy/Gradle/Common.hs
@@ -39,7 +39,6 @@ getLinesWithPrefix text prefix = prefixLines
 configNameToLabel :: Text -> GradleLabel
 configNameToLabel conf =
   case conf of
-    "compileOnly" -> Env EnvDevelopment
     x | x `elem` knownDevConfigs -> Env EnvDevelopment
     x | x `elem` knownTestConfigs -> Env EnvTesting
     x | isDefaultAndroidDevConfig x -> Env EnvDevelopment
@@ -68,7 +67,8 @@ knownTestConfigs =
 
 knownDevConfigs :: [Text]
 knownDevConfigs =
-  [ "spotbugs"
+  [ "compileOnly"
+  , "spotbugs"
   , "spotbugsPlugins"
   , "spotbugsSlf4j"
   ]

From ce9fe8f4cb641771ed43264db9e3b4377d8b9dbb Mon Sep 17 00:00:00 2001
From: Jeff Alder <49817386+jeffalder@users.noreply.github.com>
Date: Tue, 7 Apr 2026 08:48:43 -0400
Subject: [PATCH 4/4] Add change to changelog

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 1c44c99cca..c32ef83f5b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - UV: Fix fatal parse error on uv.lock files containing editable/workspace packages with dynamic versions ([#1682](https://github.com/fossas/fossa-cli/pull/1682))
+- Gradle: Add additional development and test configurations for common plugins ([#1684](https://github.com/fossas/fossa-cli/pull/1684))
 
 ## 3.16.7