Merge pull request #1544 from IETS3/bugfix/all-provided-deps

build: put all transitive dependencies as provided in the POM as well

Author: sergej-koscejev

build.gradle.kts

@@ -369,7 +369,30 @@ fun MavenPom.includeAdditionalInfo() {
     }
 }
 
-fun MavenPom.addBundledDependencies() = bundledDependencies.forEach { addDependency(it, "provided") }
+fun MavenPom.addBundledDependencies() {
+    val seen = mutableSetOf<ResolvedDependency>()
+    val queue = ArrayDeque<ResolvedDependency>()
+
+    // Visit each bundled dependency, including its transitive dependencies if so configured, so that the exact set
+    // of used JARs ends up in the POM as provided dependencies.
+    for (config in bundledDependencies) {
+        queue.addAll(config.resolvedConfiguration.firstLevelModuleDependencies)
+
+        while (!queue.isEmpty()) {
+            val dep = queue.removeFirst()
+            if (seen.add(dep)) {
+                addDependency(
+                    dep.moduleGroup,
+                    dep.moduleName,
+                    dep.moduleVersion,
+                    dep.moduleArtifacts.first().type,
+                    "provided"
+                )
+                queue.addAll(dep.children)
+            }
+        }
+    }
+}
 
 publishing {
     repositories {
@@ -407,6 +430,7 @@ publishing {
 
             pom.addDependency(languageLibs)
             pom.includeAdditionalInfo()
+            pom.addBundledDependencies()
         }
 
         create<MavenPublication>("tests") {
@@ -420,7 +444,6 @@ publishing {
                 moduleVersion = project.version.toString(),
                 type = "zip"
             )
-            pom.addBundledDependencies()
             pom.includeAdditionalInfo()
         }
         val runtimesDir = file(artifactsDir).resolve("org.iets3.opensource/org.iets3.core.os/languages/iets3.core.os")