MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

DBE-7947 load certificates from system storage (move required libs from app.jar)

Browse Source 
GitOrigin-RevId: 6ec87d46540299f8c68c288fa7aff97f571084bc
This commit is contained in:
Alexander.Kass
2023-04-28 12:59:50 +00:00
committed by intellij-monorepo-bot
parent 41f3d5ba2b
commit fb9fdc0fef
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
+2 -1
View File
@@ -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 {