From 6e8d9adaf87024483da8382c55eefe65e4b6c331 Mon Sep 17 00:00:00 2001 From: "Dmitriy.Panov" Date: Fri, 16 Sep 2022 19:00:19 +0200 Subject: [PATCH] IJI-772 reproducible dependencies order in pom.xml GitOrigin-RevId: 2a1667ec75239c35a00faf62ce4e64b3b27723de --- .../jetbrains/intellij/build/impl/MavenArtifactsBuilder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/MavenArtifactsBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/MavenArtifactsBuilder.kt index 4d2d79d4caac..12c26c09a42e 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/MavenArtifactsBuilder.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/MavenArtifactsBuilder.kt @@ -58,7 +58,7 @@ open class MavenArtifactsBuilder(protected val context: BuildContext, private va } internal fun scopedDependencies(module: JpsModule): Map { - val result = HashMap() + val result = LinkedHashMap() for (dependency in module.dependenciesList.dependencies) { val extension = JpsJavaExtensionService.getInstance().getDependencyExtension(dependency) ?: continue result.put(dependency, when (extension.scope) { @@ -112,7 +112,7 @@ open class MavenArtifactsBuilder(protected val context: BuildContext, private va val moduleCoordinates = modules.mapTo(HashSet()) { aModule -> generateMavenCoordinatesForModule(aModule) } val dependencies = modules .asSequence() - .flatMap { aModule -> squashingMavenArtifactsData.get(aModule)!!.dependencies } + .flatMap { aModule -> squashingMavenArtifactsData.getValue(aModule).dependencies } .distinct() .filter { !moduleCoordinates.contains(it.coordinates) } .toList()