IJ-MR-175479 IJ-CR-146078 IJPL-209476 caffeine as product lib

GitOrigin-RevId: a4585825ed7a9f49d9c74266ea2ebd4323d6405e

.idea/modules.xml

@@ -627,6 +627,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" filepath="$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/ai.grazie.spell.gec.engine.local/intellij.libraries.ai.grazie.spell.gec.engine.local.iml" filepath="$PROJECT_DIR$/libraries/ai.grazie.spell.gec.engine.local/intellij.libraries.ai.grazie.spell.gec.engine.local.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/assertj-core/intellij.libraries.assertj.core.iml" filepath="$PROJECT_DIR$/libraries/assertj-core/intellij.libraries.assertj.core.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/caffeine/intellij.libraries.caffeine.iml" filepath="$PROJECT_DIR$/libraries/caffeine/intellij.libraries.caffeine.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/libraries/cglib/intellij.libraries.cglib.iml" filepath="$PROJECT_DIR$/platform/libraries/cglib/intellij.libraries.cglib.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/coil/intellij.libraries.coil.iml" filepath="$PROJECT_DIR$/libraries/coil/intellij.libraries.coil.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/compose-foundation-desktop/intellij.libraries.compose.foundation.desktop.iml" filepath="$PROJECT_DIR$/libraries/compose-foundation-desktop/intellij.libraries.compose.foundation.desktop.iml" />
@@ -637,9 +638,9 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" filepath="$PROJECT_DIR$/libraries/grpc/intellij.libraries.grpc.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/grpc-netty-shaded/intellij.libraries.grpc.netty.shaded.iml" filepath="$PROJECT_DIR$/libraries/grpc-netty-shaded/intellij.libraries.grpc.netty.shaded.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/guava/intellij.libraries.guava.iml" filepath="$PROJECT_DIR$/libraries/guava/intellij.libraries.guava.iml" />
-      <module fileurl="file://$PROJECT_DIR$/libraries/hash4j/intellij.libraries.hash4j.iml" filepath="$PROJECT_DIR$/libraries/hash4j/intellij.libraries.hash4j.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/hamcrest/intellij.libraries.hamcrest.iml" filepath="$PROJECT_DIR$/libraries/hamcrest/intellij.libraries.hamcrest.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/hamcrest-more-matchers/intellij.libraries.hamcrest.more.matchers.iml" filepath="$PROJECT_DIR$/libraries/hamcrest-more-matchers/intellij.libraries.hamcrest.more.matchers.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/hash4j/intellij.libraries.hash4j.iml" filepath="$PROJECT_DIR$/libraries/hash4j/intellij.libraries.hash4j.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit4/intellij.libraries.junit4.iml" filepath="$PROJECT_DIR$/libraries/junit4/intellij.libraries.junit4.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit5/intellij.libraries.junit5.iml" filepath="$PROJECT_DIR$/libraries/junit5/intellij.libraries.junit5.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit5-launcher/intellij.libraries.junit5.launcher.iml" filepath="$PROJECT_DIR$/libraries/junit5-launcher/intellij.libraries.junit5.launcher.iml" />

build/bazel-generated-file-list.txt

@@ -339,6 +339,7 @@ jvm/jvm-analysis-refactoring
 jvm/jvm-analysis-testFramework
 libraries/ai.grazie.spell.gec.engine.local
 libraries/assertj-core
+libraries/caffeine
 libraries/coil
 libraries/compose-foundation-desktop
 libraries/compose-foundation-desktop-junit

build/jvm-rules/dependency-graph/intellij.platform.jps.build.dependencyGraph.iml

@@ -27,7 +27,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="library" name="kotlin-metadata" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.hash4j" />
     <orderEntry type="library" name="fastutil-min" level="project" />

java/compiler/impl/BUILD.bazel

@@ -69,7 +69,7 @@ jvm_library(
     "@lib//:kotlin-reflect",
     "@lib//:kryo5",
     "//libraries/guava",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:opentelemetry",
     "@lib//:opentelemetry-semconv",
     "@lib//:kotlinx-collections-immutable",

java/compiler/impl/intellij.java.compiler.impl.iml

@@ -69,7 +69,7 @@
     <orderEntry type="library" name="kotlin-reflect" level="project" />
     <orderEntry type="library" name="Kryo5" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.guava" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="opentelemetry" level="project" />
     <orderEntry type="library" name="opentelemetry-semconv" level="project" />
     <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />

java/java-impl/BUILD.bazel

@@ -88,7 +88,7 @@ jvm_library(
     "//platform/workspace/jps",
     "//platform/platform-impl/internal",
     "//platform/backend/workspace",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/platform-impl:ide-impl",
     "//platform/markdown-utils",
     "@lib//:jetbrains-markdown",

java/java-impl/intellij.java.impl.iml

@@ -111,7 +111,7 @@
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.ide.internal" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
     <orderEntry type="library" name="jetbrains.markdown" level="project" />

jps/jps-builders/BUILD.bazel

@@ -37,7 +37,7 @@ jvm_library(
     "//platform/tracing:tracing-rt",
     "//platform/util/zip",
     "@community//build:dependency-graph",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kotlin-stdlib-provided",
     "//libraries/hash4j",
     "@lib//:jetbrains-annotations",

jps/jps-builders/intellij.platform.jps.build.iml

@@ -66,7 +66,7 @@
     <orderEntry type="module" module-name="intellij.platform.tracing.rt" />
     <orderEntry type="module" module-name="intellij.platform.util.zip" />
     <orderEntry type="module" module-name="intellij.platform.jps.build.dependencyGraph" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" scope="PROVIDED" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.hash4j" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />

json/BUILD.bazel

@@ -27,7 +27,7 @@ jvm_library(
     "//platform/lang-impl",
     "@lib//:kotlin-stdlib",
     "//platform/editor-ui-api:editor-ui",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//json/syntax",
     "//platform/syntax/syntax-psi:psi",
     "//platform/syntax/syntax-util:util",

json/backend/BUILD.bazel

@@ -45,7 +45,7 @@ jvm_library(
     "@lib//:jackson",
     "@lib//:jackson-dataformat-yaml",
     "@lib//:jetbrains-markdown",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:stream_ex",
     "@lib//:kotlinx-collections-immutable",
     "//json",

json/backend/intellij.json.backend.iml

@@ -41,7 +41,7 @@
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="jackson-dataformat-yaml" level="project" />
     <orderEntry type="library" name="jetbrains.markdown" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
     <orderEntry type="module" module-name="intellij.json" exported="" />

json/intellij.json.iml

@@ -22,7 +22,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.json.syntax" exported="" />
     <orderEntry type="module" module-name="intellij.platform.syntax.psi" />
     <orderEntry type="module" module-name="intellij.platform.syntax.util" />

libraries/README.md

@@ -71,23 +71,27 @@ Add the entry in alphabetical order.
 
 ### 5. Register in Project Modules
 
-Add the module to both `modules.xml` files in alphabetical order:
+Add the module to both `modules.xml` files. **CRITICAL**: Entries must be sorted by the `filepath` attribute value, not by module name or directory name. The IDE will auto-sort on save, but you should place entries in the correct position initially.
 
 #### Root project file: `.idea/modules.xml`
 ```xml
-<module fileurl="file://$PROJECT_DIR$/community/libraries/example-lib/intellij.libraries.example.lib.iml" 
+<module fileurl="file://$PROJECT_DIR$/community/libraries/example-lib/intellij.libraries.example.lib.iml"
         filepath="$PROJECT_DIR$/community/libraries/example-lib/intellij.libraries.example.lib.iml" />
 ```
 
 #### Community project file: `community/.idea/modules.xml`
 ```xml
-<module fileurl="file://$PROJECT_DIR$/libraries/example-lib/intellij.libraries.example.lib.iml" 
+<module fileurl="file://$PROJECT_DIR$/libraries/example-lib/intellij.libraries.example.lib.iml"
         filepath="$PROJECT_DIR$/libraries/example-lib/intellij.libraries.example.lib.iml" />
 ```
 
-**Important:** 
+**Important:**
 - Root `modules.xml` uses full path with `community/` prefix
 - Community `modules.xml` uses relative path without `community/` prefix
+- **Sorting**: Entries are sorted by `filepath` attribute (standard string comparison)
+  - Example: `libraries/hamcrest` < `libraries/hamcrest-more-matchers` < `libraries/hash4j`
+  - Note: Hyphen `-` comes before slash `/` in sorting, so `hamcrest-more-matchers` comes before `hash4j`
+- The IDE will auto-correct sorting on save, but tests will fail if order is incorrect
 
 ### 6. Register in LIBRARY_MODULE_NAMES
 

libraries/caffeine/BUILD.bazel

@@ -0,0 +1,18 @@
+### auto-generated section `build intellij.libraries.caffeine` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "caffeine_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "caffeine",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":caffeine_resources"],
+  exports = ["@lib//:caffeine"],
+  runtime_deps = ["@lib//:caffeine"]
+)
+### auto-generated section `build intellij.libraries.caffeine` end

libraries/caffeine/intellij.libraries.caffeine.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="caffeine" level="project" />
+  </component>
+</module>

libraries/caffeine/resources/intellij.libraries.caffeine.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt

@@ -19,6 +19,7 @@ fun JpsModule.isLibraryModule(): Boolean {
  */
 private val LIBRARY_MODULE_NAMES: Set<String> = setOf(
   "intellij.libraries.assertj.core",
+  "intellij.libraries.caffeine",
   "intellij.libraries.compose.foundation.desktop",
   "intellij.libraries.compose.foundation.desktop.junit",
   "intellij.libraries.compose.runtime.desktop",

platform/built-in-server/BUILD.bazel

@@ -36,7 +36,7 @@ jvm_library(
     "@lib//:jackson",
     "@lib//:jackson-jr-objects",
     "@lib//:netty-buffer",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/util/concurrency",
     "//platform/core-ui",
     "//platform/platform-util-io-impl:ide-util-io-impl",

platform/built-in-server/intellij.platform.builtInServer.impl.iml

@@ -33,7 +33,7 @@
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="jackson-jr-objects" level="project" />
     <orderEntry type="library" name="netty-buffer" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />

platform/collaboration-tools/BUILD.bazel

@@ -40,7 +40,7 @@ jvm_library(
     "//platform/vcs-impl",
     "//platform/platform-util-io:ide-util-io",
     "//platform/vcs-log/api:vcs-log",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:jetbrains-markdown",
     "//platform/dvcs-impl:vcs-dvcs-impl",
@@ -90,7 +90,7 @@ jvm_library(
     "//platform/vcs-impl:vcs-impl_test_lib",
     "//platform/platform-util-io:ide-util-io",
     "//platform/vcs-log/api:vcs-log",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:jetbrains-markdown",
     "@lib//:kotlin-test",

platform/collaboration-tools/intellij.platform.collaborationTools.iml

@@ -38,7 +38,7 @@
     <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.vcs.log" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="jetbrains.markdown" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />

platform/credential-store-impl/BUILD.bazel

@@ -37,7 +37,7 @@ jvm_library(
     "@lib//:snakeyaml",
     "@lib//:fastutil-min",
     "@lib//:platform-credential_store-impl-dbus-java",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
   ]
 )
 
@@ -71,7 +71,7 @@ jvm_library(
     "@lib//:snakeyaml",
     "@lib//:fastutil-min",
     "@lib//:platform-credential_store-impl-dbus-java",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//platform/testFramework/extensions:testExtensions",

platform/credential-store-impl/intellij.platform.credentialStore.impl.iml

@@ -57,7 +57,7 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />

platform/indexing-impl/BUILD.bazel

@@ -26,7 +26,7 @@ jvm_library(
     "//libraries/guava",
     "//platform/workspace/jps",
     "//platform/diagnostic",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/util/nanoxml",
     "@lib//:aalto-xml",
     "//platform/util/xmlDom",

platform/indexing-impl/intellij.platform.indexing.impl.iml

@@ -26,7 +26,7 @@
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.util.nanoxml" />
     <orderEntry type="library" name="aalto-xml" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.xmlDom" />

platform/lang-impl/BUILD.bazel

@@ -82,7 +82,7 @@ jvm_library(
     "//platform/core-ui",
     "//platform/code-style-api:codeStyle",
     "//platform/code-style-impl:codeStyle-impl",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/platform-util-io-impl:ide-util-io-impl",
     "//platform/tracing:tracing-rt",
     "//platform/rd-platform-community:rd-community",

platform/lang-impl/intellij.platform.lang.impl.iml

@@ -90,7 +90,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
     <orderEntry type="module" module-name="intellij.platform.tracing.rt" />
     <orderEntry type="module" module-name="intellij.platform.rd.community" />

platform/platform-api/BUILD.bazel

@@ -53,7 +53,7 @@ jvm_library(
     "//platform/util/text-matching",
     "//platform/diagnostic",
     "@lib//:jackson",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/progress/shared:ide-progress",
     "//platform/util/diff",
     "//platform/runtime/product",

platform/platform-api/intellij.platform.ide.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic" />
     <orderEntry type="library" name="jackson" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.ide.progress" exported="" />
     <orderEntry type="module" module-name="intellij.platform.util.diff" />
     <orderEntry type="module" module-name="intellij.platform.runtime.product" />

platform/platform-impl/BUILD.bazel

@@ -94,7 +94,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/core-ui",
     "@lib//:zip-signer",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:classgraph",
     "//platform/util/zip",
     "@lib//:icu4j",
@@ -256,7 +256,7 @@ jvm_library(
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-ui",
     "@lib//:zip-signer",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:classgraph",
     "//platform/util/zip",
     "@lib//:icu4j",

platform/platform-impl/concurrency/BUILD.bazel

@@ -25,7 +25,7 @@ jvm_library(
     "//platform/util/coroutines",
     "//platform/indexing-api:indexing",
     "//libraries/guava",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
   ]
 )
 
@@ -49,7 +49,7 @@ jvm_library(
     "//libraries/guava",
     "@lib//:junit5",
     "@lib//:assert_j",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
   ]
 )
 ### auto-generated section `build intellij.platform.ide.concurrency` end

platform/platform-impl/concurrency/intellij.platform.ide.concurrency.iml

@@ -22,6 +22,6 @@
     <orderEntry type="module" module-name="intellij.libraries.guava" />
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
   </component>
 </module>

platform/platform-impl/intellij.platform.ide.impl.iml

@@ -100,7 +100,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" name="zip-signer" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="classgraph" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="protobuf" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.zip" />

platform/platform-resources/src/META-INF/essential-libs.xml

@@ -6,6 +6,7 @@
     <module name="intellij.libraries.kotlinx.serialization.core" loading="embedded"/>
     <module name="intellij.libraries.kotlinx.serialization.json" loading="embedded"/>
 
+    <module name="intellij.libraries.caffeine" loading="embedded"/>
     <module name="intellij.libraries.guava" loading="embedded"/>
     <module name="intellij.libraries.hash4j" loading="embedded"/>
   </content>

platform/platform-tests/BUILD.bazel

@@ -93,7 +93,7 @@ jvm_library(
     "//platform/util-class-loader:util-classLoader",
     "@lib//:netty-buffer",
     "@lib//:lz4-java",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:jackson",
     "//platform/core-ui",
     "//platform/code-style-impl:codeStyle-impl",

platform/platform-tests/intellij.platform.tests.iml

@@ -79,7 +79,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="netty-buffer" level="project" />
     <orderEntry type="library" scope="TEST" name="lz4-java" level="project" />
-    <orderEntry type="library" scope="TEST" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jackson" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" scope="TEST" />

platform/statistics/BUILD.bazel

@@ -28,7 +28,7 @@ jvm_library(
     "//platform/runtime/product",
     "//platform/platform-util-io:ide-util-io",
     "//platform/util-ex",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/editor-ui-api:editor-ui",
     "//platform/ide-core",
     "//platform/ide-core/plugins",
@@ -73,7 +73,7 @@ jvm_library(
     "//platform/runtime/product",
     "//platform/platform-util-io:ide-util-io",
     "//platform/util-ex",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/editor-ui-api:editor-ui",
     "//platform/ide-core",
     "//platform/ide-core/plugins",

platform/statistics/intellij.platform.statistics.iml

@@ -23,7 +23,7 @@
     <orderEntry type="module" module-name="intellij.platform.runtime.product" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />

platform/util-ex/BUILD.bazel

@@ -15,7 +15,7 @@ jvm_library(
     "@lib//:kotlinx-coroutines-core",
     "@lib//:fastutil-min",
     "@lib//:netty-buffer",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/util/base",
     "//platform/util-class-loader:util-classLoader",
     "@lib//:lz4-java",

platform/util-ex/intellij.platform.util.ex.iml

@@ -15,7 +15,7 @@
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="library" name="netty-buffer" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.util.base" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="library" name="lz4-java" level="project" />

platform/util/BUILD.bazel

@@ -179,7 +179,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "//platform/util-ex",
     "@lib//:netty-buffer",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:aalto-xml",
     "//platform/util/xmlDom",
     "//platform/util/zip",

platform/util/intellij.platform.util.ui.iml

@@ -39,7 +39,7 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="library" name="netty-buffer" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="aalto-xml" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.xmlDom" />
     <orderEntry type="module" module-name="intellij.platform.util.zip" />

platform/vcs-api/BUILD.bazel

@@ -28,7 +28,7 @@ jvm_library(
     "//platform/util:util-ui",
     "//platform/core-api:core",
     "//platform/core-ui",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/vcs-api/shared",
   ],
   exports = [

platform/vcs-api/intellij.platform.vcs.iml

@@ -23,7 +23,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.vcs.shared" exported="" />
   </component>
 </module>

platform/vcs-impl/BUILD.bazel

@@ -51,7 +51,7 @@ jvm_library(
     "//platform/code-style-impl:codeStyle-impl",
     "//platform/platform-util-io-impl:ide-util-io-impl",
     "//platform/util/progress",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/workspace/storage",
     "//platform/util/jdom",
     "//platform/diagnostic/telemetry",
@@ -126,7 +126,7 @@ jvm_library(
     "//platform/code-style-impl:codeStyle-impl",
     "//platform/platform-util-io-impl:ide-util-io-impl",
     "//platform/util/progress",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/workspace/storage",
     "//platform/util/jdom",
     "//platform/diagnostic/telemetry",

platform/vcs-impl/intellij.platform.vcs.impl.iml

@@ -73,7 +73,7 @@
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.progress" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />

platform/vcs-log/impl/BUILD.bazel

@@ -41,7 +41,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "//platform/core-ui",
     "@lib//:gson",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:kotlinx-coroutines-guava",
     "//platform/diagnostic/telemetry",
@@ -100,7 +100,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "//platform/core-ui",
     "@lib//:gson",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:kotlinx-coroutines-guava",
     "//platform/diagnostic/telemetry",

platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml

@@ -42,7 +42,7 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-guava" level="project" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />

platform/workspace/storage/BUILD.bazel

@@ -32,7 +32,7 @@ jvm_library(
     "@lib//:kotlin-reflect",
     "//platform/util",
     "@lib//:fastutil-min",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kryo5",
     "//platform/diagnostic/telemetry",
     "@lib//:opentelemetry",

platform/workspace/storage/intellij.platform.workspace.storage.iml

@@ -31,7 +31,7 @@
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="fastutil-min" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="Kryo5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
     <orderEntry type="library" name="opentelemetry" level="project" />

plugins/completion-ml-ranking/BUILD.bazel

@@ -26,7 +26,7 @@ jvm_library(
     "//platform/statistics",
     "//platform/core-ui",
     "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:jackson-jr-objects",
     "@lib//:jackson",
     "//libraries/kotlinx/serialization/json",

plugins/completion-ml-ranking/intellij.completionMlRanking.iml

@@ -42,7 +42,7 @@
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.codeinsight.inline" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="jackson-jr-objects" level="project" />
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />

plugins/devkit/devkit-core/BUILD.bazel

@@ -88,7 +88,7 @@ jvm_library(
     "//json/backend",
     "@lib//:kotlinx-serialization-protobuf",
     "//platform/built-in-server-api:builtInServer",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/editor-ui-ex:editor-ex",
     "//platform/ijent/buildConstants",
     "//platform/markdown-utils",

plugins/devkit/devkit-core/intellij.devkit.core.iml

@@ -95,7 +95,7 @@
     <orderEntry type="module" module-name="intellij.json.backend" />
     <orderEntry type="library" name="kotlinx-serialization-protobuf" level="project" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.ijent.community.buildConstants" />
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />

plugins/git4idea/BUILD.bazel

@@ -76,7 +76,7 @@ jvm_library(
     "//platform/core-ui",
     "@lib//:fastutil-min",
     "//platform/platform-util-io:ide-util-io",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kotlinx-coroutines-core",
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",
@@ -181,7 +181,7 @@ jvm_library(
     "//platform/core-ui",
     "@lib//:fastutil-min",
     "//platform/platform-util-io:ide-util-io",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kotlinx-coroutines-core",
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",

plugins/git4idea/intellij.vcs.git.iml

@@ -91,7 +91,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />

plugins/git4idea/shared/BUILD.bazel

@@ -29,7 +29,7 @@ jvm_library(
     "//platform/core-ui",
     "//platform/util/coroutines",
     "//platform/editor-ui-api:editor-ui",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/analysis-api:analysis",
     "//platform/util/text-matching",
     "//platform/platform-impl/ui",

plugins/git4idea/shared/intellij.vcs.git.shared.iml

@@ -48,7 +48,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
     <orderEntry type="module" module-name="intellij.platform.ide.ui" />

plugins/github/github-core/BUILD.bazel

@@ -67,7 +67,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "//platform/platform-util-io:ide-util-io",
     "//platform/platform-util-netty:ide-util-netty",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/collaboration-tools/auth",
     "//platform/collaboration-tools/auth-base:collaborationTools-auth-base",
     "//platform/markdown-utils",
@@ -141,7 +141,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "//platform/platform-util-io:ide-util-io",
     "//platform/platform-util-netty:ide-util-netty",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/collaboration-tools/auth",
     "//platform/collaboration-tools/auth-base:collaborationTools-auth-base",
     "//platform/markdown-utils",

plugins/github/github-core/intellij.vcs.github.iml

@@ -74,7 +74,7 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.collaborationTools.auth" />
     <orderEntry type="module" module-name="intellij.platform.collaborationTools.auth.base" />
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />

plugins/github/github-git/BUILD.bazel

@@ -16,7 +16,7 @@ jvm_library(
   deps = [
     "@lib//:kotlin-stdlib",
     "@lib//:kotlinx-coroutines-core",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/core-api:core",
     "//platform/platform-api:ide",
     "//platform/projectModel-api:projectModel",

plugins/github/github-git/intellij.vcs.github.git.iml

@@ -10,7 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />

plugins/gitlab/gitlab-core/BUILD.bazel

@@ -59,7 +59,7 @@ jvm_library(
     "@lib//:jetbrains-markdown",
     "//platform/markdown-utils",
     "@lib//:miglayout-swing",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/diff-impl",
     "//platform/lang-impl",
     "//platform/statistics",
@@ -120,7 +120,7 @@ jvm_library(
     "//platform/markdown-utils",
     "//platform/markdown-utils:markdown-utils_test_lib",
     "@lib//:miglayout-swing",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/diff-impl",
     "//platform/lang-impl",
     "//platform/statistics",

plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml

@@ -68,7 +68,7 @@
     <orderEntry type="library" name="jetbrains.markdown" level="project" />
     <orderEntry type="module" module-name="intellij.platform.markdown.utils" />
     <orderEntry type="library" name="miglayout-swing" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />

plugins/gitlab/gitlab-git/BUILD.bazel

@@ -16,7 +16,7 @@ jvm_library(
   deps = [
     "@lib//:kotlin-stdlib",
     "@lib//:kotlinx-coroutines-core",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/core-api:core",
     "//platform/core-impl",
     "//platform/core-ui",

plugins/gitlab/gitlab-git/intellij.vcs.gitlab.git.iml

@@ -10,7 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />

plugins/grazie/src/BUILD.bazel

@@ -77,7 +77,7 @@ jvm_library(
     "//platform/util/text-matching",
     "//libraries/grpc",
     "//platform/util/jdom",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
   ],
   exports = [
     "@lib//:grazie-core-org-jetbrains-intellij-deps-languagetool-languagetool-core",

plugins/grazie/src/intellij.grazie.core.iml

@@ -412,6 +412,6 @@
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
     <orderEntry type="module" module-name="intellij.libraries.grpc" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
   </component>
 </module>

plugins/kotlin/base/analysis-api-platform/BUILD.bazel

@@ -28,7 +28,7 @@ jvm_library(
   kotlinc_opts = ":custom_analysis-api-platform",
   deps = [
     "@lib//:kotlin-stdlib",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kotlinc-kotlin-compiler-common",
     "@lib//:kotlinc-analysis-api",
     "@lib//:kotlinc-analysis-api-platform-interface",

plugins/kotlin/base/analysis-api-platform/kotlin.base.analysis-api-platform.iml

@@ -25,7 +25,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
     <orderEntry type="library" name="kotlinc.analysis-api-platform-interface" level="project" />

plugins/kotlin/base/project-structure/BUILD.bazel

@@ -61,7 +61,7 @@ jvm_library(
     "//java/idea-ui:ui",
     "//platform/workspace/jps",
     "//platform/backend/workspace",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/util/jdom",
     "//java/java-impl:impl",
     "@lib//:kotlinc-analysis-api-impl-base",
@@ -111,7 +111,7 @@ jvm_library(
     "//java/idea-ui:ui",
     "//platform/workspace/jps",
     "//platform/backend/workspace",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/util/jdom",
     "//java/java-impl:impl",
     "@lib//:junit4",

plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml

@@ -59,7 +59,7 @@
     <orderEntry type="module" module-name="intellij.java.ui" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />

plugins/kotlin/jvm-debugger/core-fe10/BUILD.bazel

@@ -21,7 +21,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "@lib//:asm",
     "@lib//:stream_ex",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:kotlinc-kotlin-compiler-common",
     "@lib//:kotlinc-kotlin-compiler-fe10",
     "//java/debugger/openapi:java-debugger",

plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml

@@ -26,7 +26,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="module" module-name="intellij.java.debugger" />

plugins/markdown/core/BUILD.bazel

@@ -54,7 +54,7 @@ jvm_library(
     "@lib//:kotlinx-coroutines-core",
     "//platform/diagnostic",
     "//platform/util/coroutines",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/ui.jcef",
     "@lib//:kotlin-stdlib",
     "//platform/project/shared:project",

plugins/markdown/core/intellij.markdown.iml

@@ -74,7 +74,7 @@
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.ui.jcef" exported="" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.project" />

plugins/marketplace-ml/BUILD.bazel

@@ -20,7 +20,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl",
     "//platform/statistics",
     "//platform/platform-impl/internal",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/ml-impl",
   ]
 )

plugins/marketplace-ml/intellij.marketplaceMl.iml

@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.ide.internal" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.ml.impl" />
   </component>
 </module>

plugins/performanceTesting/core/BUILD.bazel

@@ -51,7 +51,7 @@ jvm_library(
     "@lib//:fastutil-min",
     "//platform/xdebugger-api:debugger",
     "//platform/xdebugger-impl:debugger-impl",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/remote-driver/core:driver-impl",
     "@lib//:netty-codec-http",
     "@lib//:netty-buffer",
@@ -114,7 +114,7 @@ jvm_library(
     "//platform/xdebugger-api:debugger",
     "//platform/xdebugger-impl:debugger-impl",
     "//platform/xdebugger-impl:debugger-impl_test_lib",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/remote-driver/core:driver-impl",
     "@lib//:netty-codec-http",
     "@lib//:netty-buffer",

plugins/performanceTesting/core/intellij.performanceTesting.iml

@@ -69,7 +69,7 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.driver.impl" />
     <orderEntry type="library" name="netty-codec-http" level="project" />
     <orderEntry type="library" name="netty-buffer" level="project" />

plugins/search-everywhere-ml/ranking/core/BUILD.bazel

@@ -23,7 +23,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-impl:ide-impl",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-impl",
@@ -66,7 +66,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-impl:ide-impl",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-core",

plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml

@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />

plugins/settings-repository/BUILD.bazel

@@ -39,7 +39,7 @@ jvm_library(
     "//platform/vcs-api:vcs",
     "//platform/statistics",
     "//platform/core-ui",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/platform-util-io:ide-util-io",
     "//platform/util/coroutines",
     "//platform/credential-store-impl:credentialStore-impl",

plugins/settings-repository/intellij.settingsRepository.iml

@@ -71,7 +71,7 @@
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
     <orderEntry type="module" module-name="intellij.platform.credentialStore.impl" />

plugins/terminal/BUILD.bazel

@@ -44,7 +44,7 @@ jvm_library(
     "//plugins/terminal/completion",
     "//libraries/kotlinx/serialization/core",
     "//libraries/kotlinx/serialization/json",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/refactoring",
     "@lib//:terminal-terminal-completion-db-with-extensions",
     "//platform/util/coroutines",

plugins/terminal/frontend/BUILD.bazel

@@ -41,7 +41,7 @@ jvm_library(
     "//platform/inline-completion/shared:inline-completion",
     "//plugins/terminal/completion",
     "//platform/eel-provider",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/observable",
     "@lib//:kotlinx-datetime-jvm",
     "//libraries/kotlinx/serialization/core",

plugins/terminal/frontend/intellij.terminal.frontend.iml

@@ -60,7 +60,7 @@
     <orderEntry type="module" module-name="intellij.platform.inline.completion" />
     <orderEntry type="module" module-name="intellij.terminal.completion" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="library" name="kotlinx-datetime-jvm" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />

plugins/terminal/intellij.terminal.iml

@@ -63,7 +63,7 @@
     <orderEntry type="module" module-name="intellij.terminal.completion" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
     <orderEntry type="module-library">
       <library name="terminal-completion-db-with-extensions" type="repository">

plugins/textmate/BUILD.bazel

@@ -31,7 +31,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl",
     "//libraries/kotlinx/serialization/core",
     "//platform/code-style-impl:codeStyle-impl",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//fleet/fastutil",
     "@lib//:fastutil-min",
     "//platform/util/xmlDom",

plugins/textmate/intellij.textmate.iml

@@ -47,7 +47,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="fleet.fastutil" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.xmlDom" />

plugins/ui-designer/BUILD.bazel

@@ -148,7 +148,7 @@ jvm_library(
     "//platform/util/jdom",
     "//jps/jps-builders:build-tests_test_lib",
     "//xml/xml-psi-api:psi",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
   ],
   exports = [
     "//java/compiler/forms-compiler:java-guiForms-compiler",

plugins/ui-designer/intellij.java.guiForms.designer.iml

@@ -65,7 +65,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.jps.build.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.xml.psi" />
-    <orderEntry type="library" scope="TEST" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" scope="TEST" />
   </component>
   <component name="copyright">
     <Base>

python/BUILD.bazel

@@ -305,7 +305,7 @@ jvm_library(
     "@lib//:jsr305",
     "@lib//:jetbrains-annotations",
     "@lib//:kotlin-stdlib",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/util/jdom",
     "//platform/extensions",
     "//libraries/kotlinx/serialization/json",

python/intellij.python.community.impl.iml

@@ -124,7 +124,7 @@
     <orderEntry type="library" name="jsr305" level="project" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.extensions" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />

python/python-sdk-ui/BUILD.bazel

@@ -26,7 +26,7 @@ jvm_library(
     "//python/python-sdk:sdk",
     "//python/python-syntax-core:syntax-core",
     "//python/python-psi-impl:psi-impl",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:io-github-z4kn4fein-semver-jvm",
     "//python/python-exec-service:community-execService",
   ]

python/python-sdk-ui/intellij.python.sdk.ui.iml

@@ -21,7 +21,7 @@
     <orderEntry type="module" module-name="intellij.python.sdk" />
     <orderEntry type="module" module-name="intellij.python.syntax.core" />
     <orderEntry type="module" module-name="intellij.python.psi.impl" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="io.github.z4kn4fein.semver.jvm" level="project" />
     <orderEntry type="module" module-name="intellij.python.community.execService" />
   </component>

python/python-sdk/BUILD.bazel

@@ -41,7 +41,7 @@ jvm_library(
     "//platform/execution",
     "//platform/remote-core",
     "@lib//:jna",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:jackson",
     "@lib//:jackson-databind",
     "@lib//:jackson-module-kotlin",
@@ -82,7 +82,7 @@ jvm_library(
     "//platform/remote-core",
     "@lib//:jna",
     "@lib//:junit4",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "@lib//:jackson",
     "@lib//:jackson-databind",
     "@lib//:jackson-module-kotlin",

python/python-sdk/intellij.python.sdk.iml

@@ -32,7 +32,7 @@
     <orderEntry type="module" module-name="intellij.platform.remote.core" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="library" name="caffeine" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.caffeine" />
     <orderEntry type="library" name="jackson" level="project" />
     <orderEntry type="library" name="jackson-databind" level="project" />
     <orderEntry type="library" name="jackson-module-kotlin" level="project" />

xml/xml-psi-impl/BUILD.bazel

@@ -41,7 +41,7 @@ jvm_library(
     "@lib//:jackson",
     "@lib//:jackson-databind",
     "@lib//:jackson-module-kotlin",
-    "@lib//:caffeine",
+    "//libraries/caffeine",
     "//platform/util/jdom",
     "//platform/markdown-utils",
     "//platform/polySymbols",