Skip to content

Commit 8dbcf48

Browse files
authored
Fix dependency update finder for bom and diverse resolution params (#6247)
Fix for #6246
1 parent b5f0cd6 commit 8dbcf48

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

libs/javalib/src/mill/javalib/dependency/versions/VersionsFinder.scala

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,20 @@ private[dependency] object VersionsFinder {
6060
)
6161

6262
val bindDependency = javaModule.bindDependency()
63-
val deps = javaModule.mvnDeps()
64-
val compileMvnDeps = javaModule.compileMvnDeps()
65-
val runMvnDeps = javaModule.runMvnDeps()
63+
val deps = javaModule.mvnDeps().filterNot(_.version.isEmpty)
64+
val compileMvnDeps = javaModule.compileMvnDeps().filterNot(_.version.isEmpty)
65+
val runMvnDeps = javaModule.runMvnDeps().filterNot(_.version.isEmpty)
66+
val bomMvnDeps = javaModule.bomMvnDeps()
67+
6668
val repos = javaModule.repositoriesTask()
6769
val mapDeps = javaModule.mapDependencies()
6870
val custom = javaModule.resolutionCustomizer()
6971
val cacheCustom = javaModule.coursierCacheCustomizer()
72+
val resolutionParams = javaModule.resolutionParams()
7073

7174
val metadataLoaders = repos.flatMap(MetadataLoaderFactory(_, offline, clock))
7275

73-
val dependencies = (deps ++ compileMvnDeps ++ runMvnDeps)
76+
val dependencies = (deps ++ compileMvnDeps ++ runMvnDeps ++ bomMvnDeps)
7477
.map(bindDependency)
7578
.iterator
7679
.toSeq
@@ -82,7 +85,7 @@ private[dependency] object VersionsFinder {
8285
customizer = custom,
8386
ctx = Option(Task.ctx()),
8487
coursierCacheCustomizer = cacheCustom,
85-
resolutionParams = coursier.params.ResolutionParams(),
88+
resolutionParams = resolutionParams,
8689
boms = Nil,
8790
checkGradleModules = javaModule.checkGradleModules(),
8891
config = coursierConfigModule.coursierConfig()

0 commit comments

Comments
 (0)