File tree Expand file tree Collapse file tree 1 file changed +12
-1
lines changed
Expand file tree Collapse file tree 1 file changed +12
-1
lines changed Original file line number Diff line number Diff line change @@ -19,9 +19,20 @@ task ensureReleaseCheckUpToDate {
1919 releaseCheckDependencies. each { releaseCheckDependency ->
2020 VersionCatalog versionCatalog = versionCatalogs. named(" libs" )
2121 def dependencies = versionCatalog. libraryAliases. collect { versionCatalog. findLibrary(it). get(). get() }
22- def matchingProjectDependency = dependencies. find {
22+ def matchingProjectDependencies = dependencies. findAll {
2323 it. group == releaseCheckDependency. groupId && it. name == releaseCheckDependency. artifactId
2424 }
25+
26+ assert matchingProjectDependencies. size() == 1 || releaseCheckDependency. groupId. contains(" org.junit" ) :
27+ " Multiple dependency ${ matchingProjectDependencies.size()} : ${ matchingProjectDependencies} "
28+
29+ // Filter out duplicate versions of JUnit5 or JUnit6.
30+ def matchingProjectDependency = releaseCheckDependency. groupId. contains(" org.junit" )
31+ ? releaseCheckDependency. version. contains(" 6." )
32+ ? matchingProjectDependencies. find {ju -> ju. version. contains(" 6." ) }
33+ : matchingProjectDependencies. find {ju -> ! ju. version. contains(" 6." ) }
34+ : matchingProjectDependencies. first()
35+
2536 assert matchingProjectDependency != null :
2637 " No project dependency was found for expected release dependency ${ releaseCheckDependency} "
2738 assert matchingProjectDependency. version == releaseCheckDependency. version:
You can’t perform that action at this time.
0 commit comments