From d0a981b512b4ae4c99fa26767e9ade49e58278e2 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 2 Apr 2024 10:09:27 +0300
Subject: [PATCH] don't use intellij.platform.ide.impl module to define
 libraries that should be packed into all products (javax.activation,
 jaxb-api, jaxb-runtime, javax.annotation-api) - specify it in PlatformModules
 with explanation for what

GitOrigin-RevId: 9345f3e003a55c2d4691240afac031f82c764ec6
---
 .../jetbrains/intellij/build/impl/BaseLayout.kt    | 14 +++++++++++---
 .../intellij/build/impl/PlatformModules.kt         | 10 ++++++++++
 .../platform-impl/intellij.platform.ide.impl.iml   |  4 ----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BaseLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BaseLayout.kt
index f9e93f7d2d92..a56b30cdd1e3 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BaseLayout.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BaseLayout.kt
@@ -147,9 +147,17 @@ sealed class BaseLayout {
   }
 
   fun withProjectLibrary(libraryName: String) {
-    includedProjectLibraries.add(ProjectLibraryData(libraryName = libraryName,
-                                                    packMode = LibraryPackMode.MERGED,
-                                                    reason = "withProjectLibrary"))
+    includedProjectLibraries.add(
+      ProjectLibraryData(libraryName = libraryName, packMode = LibraryPackMode.MERGED, reason = "withProjectLibrary")
+    )
+  }
+
+  internal fun withProjectLibraries(libraryNames: List<String>) {
+    for (libraryName in libraryNames) {
+      includedProjectLibraries.add(
+        ProjectLibraryData(libraryName = libraryName, packMode = LibraryPackMode.MERGED, reason = "withProjectLibrary")
+      )
+    }
   }
 
   fun withProjectLibraries(libraryNames: Iterable<String>) {
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index 8ebb0e2b83de..7460ea84708e 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -213,6 +213,16 @@ internal suspend fun createPlatformLayout(addPlatformCoverage: Boolean,
   layout.withProjectLibrary(libraryName = "ktor-client-logging")
   layout.withProjectLibrary(libraryName = "ktor-serialization-kotlinx-json")
 
+  // https://jetbrains.team/p/ij/reviews/67104/timeline
+  // https://youtrack.jetbrains.com/issue/IDEA-179784
+  // https://youtrack.jetbrains.com/issue/IDEA-205600
+  layout.withProjectLibraries(listOf(
+    "javax.annotation-api",
+    "javax.activation",
+    "jaxb-runtime",
+    "jaxb-api",
+  ))
+
   // used by intellij.database.jdbcConsole - put to a small util module
   layout.withProjectLibrary(libraryName = "jbr-api", jarName = UTIL_JAR)
   // platform-loader.jar is loaded by JVM classloader as part of loading our custom PathClassLoader class - reduce file size
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index 80e0a4003bf1..de85fe8a3607 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -67,10 +67,6 @@
     <orderEntry type="library" name="netty-codec-http" level="project" />
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="Java Compatibility" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="javax.activation" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="jaxb-api" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="jaxb-runtime" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="javax.annotation-api" level="project" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer" scope="RUNTIME" />
     <orderEntry type="library" name="jackson-databind" level="project" />