From fb9fdc0feffeb1f94a5ec7e8ecd4bf616eff5084 Mon Sep 17 00:00:00 2001
From: "Alexander.Kass" <Alexander.Kass@jetbrains.com>
Date: Thu, 27 Apr 2023 19:09:50 +0300
Subject: [PATCH] DBE-7947 load certificates from system storage (move required
 libs from app.jar)

GitOrigin-RevId: 6ec87d46540299f8c68c288fa7aff97f571084bc
---
 .../src/org/jetbrains/intellij/build/impl/JarPackager.kt       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
index b6deffd453ff..76a98a5272c8 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
@@ -88,6 +88,7 @@ private val predefinedMergeRules = persistentMapOf<String, (String) -> Boolean>(
   map.put("rd.jar") { it.startsWith("rd-") }
   // all grpc garbage into one jar
   map.put("grpc.jar") { it.startsWith("grpc-") }
+  map.put("bouncy-castle.jar") { it.startsWith("bouncy-castle-") }
   map.put(PRODUCT_JAR) { it.startsWith("License") }
   // see ClassPathUtil.getUtilClassPath
   map.put(UTIL_8_JAR) {
@@ -97,7 +98,7 @@ private val predefinedMergeRules = persistentMapOf<String, (String) -> Boolean>(
   }
 
   // used in external process - see ConsoleProcessListFetcher.getConsoleProcessCount
-  map.put(UTIL_JAR) { it == "pty4j" }
+  map.put(UTIL_JAR) { it == "pty4j" || it == "jvm-native-trusted-roots" }
 }
 
 internal fun getLibraryFileName(library: JpsLibrary): String {