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<JpsDependencyElement, DependencyScope> {
-      val result = HashMap<JpsDependencyElement, DependencyScope>()
+      val result = LinkedHashMap<JpsDependencyElement, DependencyScope>()
       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()