Revert "IJ-CR-146078 IJPL-181726 pack libraries of non-V2 modules into a separate merged (per library) JAR file"

This reverts commit 566ba74d166c23a11a8f74ea3939572f567c9372.

GitOrigin-RevId: c4fc3b52b5fd0ef02c2cee7d1d5cbc3000cc9e6f

java/plugin/plugin-content.yaml

@@ -1,21 +1,13 @@
 - name: lib/aether-dependency-resolver.jar
   modules:
   - name: intellij.java.aetherDependencyResolver
-- name: lib/completion-ranking-java.jar
-  library: completion-ranking-java
-  module: intellij.java.impl
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0/completion-ranking-java-0.jar
 - name: lib/debugger-memory-agent.jar
-  library: debugger-memory-agent
-  module: intellij.java.debugger.memory.agent
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/debugger-memory-agent/1/debugger-memory-agent-1.jar
 - name: lib/ecj/eclipse.jar
-  library: Eclipse
-  files:
-  - name: $PROJECT_DIR$/community/lib/ecj-4.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Eclipse
+    files:
+    - name: $PROJECT_DIR$/community/lib/ecj-4.jar
+    reason: withProjectLibrary
 - name: lib/frontend-split/java-frontend.jar
   modules:
   - name: intellij.java.frontend
@@ -27,6 +19,11 @@
   - name: intellij.java.debugger.impl.shared
   - name: intellij.java.syntax
 - name: lib/java-impl.jar
+  projectLibraries:
+  - name: netty-codec-protobuf
+    files:
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-protobuf/4/netty-codec-protobuf-4.jar
+    reason: <- intellij.java.compiler.impl
   modules:
   - name: intellij.java.compiler
   - name: intellij.java.debugger
@@ -58,6 +55,9 @@
   - name: intellij.java.indexing.impl
   - name: intellij.java.psi.impl
   - name: intellij.java.impl
+    libraries:
+      completion-ranking-java:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0/completion-ranking-java-0.jar
   - name: intellij.java.impl.inspections
   - name: intellij.java.impl.refactorings
   - name: intellij.jsp.spi
@@ -85,15 +85,17 @@
   - name: intellij.java.compiler.instrumentationUtil
   - name: intellij.java.compiler.instrumentationUtil.java8
 - name: lib/jb-jdi.jar
-  library: jb-jdi
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2/jb-jdi-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: jb-jdi
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2/jb-jdi-2.jar
+    reason: withProjectLibrary
 - name: lib/jgoodies-common.jar
-  library: jgoodies-common
-  files:
-  - name: $MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1/jgoodies-common-1.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: jgoodies-common
+    files:
+    - name: $MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1/jgoodies-common-1.jar
+    reason: withProjectLibrary
 - name: lib/jps-builders-6.jar
   modules:
   - name: intellij.platform.jps.build.javac.rt
@@ -104,41 +106,27 @@
       qdox-java-parser:
       - name: $MAVEN_REPOSITORY$/com/thoughtworks/qdox/qdox/2/qdox-2.jar
 - name: lib/jps-javac-extension.jar
-  library: jps-javac-extension
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/jps/jps-javac-extension/10/jps-javac-extension-10.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: jps-javac-extension
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/jps/jps-javac-extension/10/jps-javac-extension-10.jar
+    reason: withProjectLibrary
 - name: lib/jps-launcher.jar
   modules:
   - name: intellij.platform.jps.build.launcher
 - name: lib/jshell-frontend.jar
-  library: jshell-frontend
-  module: intellij.java.execution.impl
-  files:
-  - name: $PROJECT_DIR$/community/java/execution/impl/jshell-frontend.jar
 - name: lib/jshell-protocol.jar
   modules:
   - name: intellij.java.jshell.protocol
 - name: lib/kotlin-metadata.jar
-  library: kotlin-metadata
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-metadata-jvm/2/kotlin-metadata-jvm-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlin-metadata
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-metadata-jvm/2/kotlin-metadata-jvm-2.jar
+    reason: withProjectLibrary
 - name: lib/maven-resolver-connector-basic.jar
-  library: org.apache.maven.resolver:maven-resolver-connector-basic
-  module: intellij.java.aetherDependencyResolver
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-connector-basic/1/maven-resolver-connector-basic-1.jar
 - name: lib/maven-resolver-transport-file.jar
-  library: org.apache.maven.resolver:maven-resolver-transport-file
-  module: intellij.java.aetherDependencyResolver
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-file/1/maven-resolver-transport-file-1.jar
 - name: lib/maven-resolver-transport-http.jar
-  library: org.apache.maven.resolver:maven-resolver-transport-http
-  module: intellij.java.aetherDependencyResolver
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-transport-http/1/maven-resolver-transport-http-1.jar
 - name: lib/modules/intellij.java.debugger.impl.frontend.jar
   contentModules:
   - name: intellij.java.debugger.impl.frontend
@@ -157,30 +145,18 @@
 - name: lib/modules/intellij.jvm.analysis.impl.jar
   contentModules:
   - name: intellij.jvm.analysis.impl
-- name: lib/netty-codec-protobuf.jar
-  library: netty-codec-protobuf
-  files:
-  - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-protobuf/4/netty-codec-protobuf-4.jar
-  reason: <- intellij.java.compiler.impl
 - name: lib/rt/debugger-agent.jar
-  library: debugger-agent
-  module: intellij.java.debugger.agent.holder
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/debugger-agent/1/debugger-agent-1.jar
 - name: lib/rt/netty-jps.jar
-  library: netty-jps
-  files:
-  - name: $MAVEN_REPOSITORY$/io/netty/netty-all/4/netty-all-4.jar
-  - name: $MAVEN_REPOSITORY$/io/netty/netty-buffer/4/netty-buffer-4.jar
-  - name: $MAVEN_REPOSITORY$/io/netty/netty-codec/4/netty-codec-4.jar
-  - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-http/4/netty-codec-http-4.jar
-  - name: $MAVEN_REPOSITORY$/io/netty/netty-common/4/netty-common-4.jar
-  - name: $MAVEN_REPOSITORY$/io/netty/netty-handler/4/netty-handler-4.jar
-  - name: $MAVEN_REPOSITORY$/io/netty/netty-resolver/4/netty-resolver-4.jar
-  - name: $MAVEN_REPOSITORY$/io/netty/netty-transport/4/netty-transport-4.jar
-  reason: withProjectLibrary
-- name: lib/sa-jdwp.jar
-  library: sa-jdwp
-  module: intellij.java.debugger.impl
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/sa-jdwp/1/sa-jdwp-1.jar
+  projectLibraries:
+  - name: netty-jps
+    files:
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-all/4/netty-all-4.jar
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-buffer/4/netty-buffer-4.jar
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-codec/4/netty-codec-4.jar
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-codec-http/4/netty-codec-http-4.jar
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-common/4/netty-common-4.jar
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-handler/4/netty-handler-4.jar
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-resolver/4/netty-resolver-4.jar
+    - name: $MAVEN_REPOSITORY$/io/netty/netty-transport/4/netty-transport-4.jar
+    reason: withProjectLibrary
+- name: lib/sa-jdwp.jar

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

@@ -140,7 +140,7 @@ internal fun getLibraryFileName(library: JpsLibrary): String {
 }
 
 class JarPackager private constructor(
-  private val outputDir: Path,
+  private val outDir: Path,
   private val context: BuildContext,
   private val platformLayout: PlatformLayout?,
   private val isRootDir: Boolean,
@@ -159,7 +159,7 @@ class JarPackager private constructor(
       outputDir: Path,
       context: BuildContext,
     ) {
-      val packager = JarPackager(outputDir = outputDir, context = context, platformLayout = null, isRootDir = false, moduleOutputPatcher = ModuleOutputPatcher())
+      val packager = JarPackager(outDir = outputDir, context = context, platformLayout = null, isRootDir = false, moduleOutputPatcher = ModuleOutputPatcher())
       packager.computeModuleSources(includedModules = includedModules, layout = null, searchableOptionSet = null)
       buildJars(
         assets = packager.assets.values,
@@ -185,7 +185,7 @@ class JarPackager private constructor(
       searchableOptionSet: SearchableOptionSetDescriptor? = null,
       context: BuildContext,
     ): Collection<DistributionFileEntry> {
-      val packager = JarPackager(outputDir = outputDir, context = context, platformLayout = platformLayout, isRootDir = isRootDir, moduleOutputPatcher = moduleOutputPatcher)
+      val packager = JarPackager(outDir = outputDir, context = context, platformLayout = platformLayout, isRootDir = isRootDir, moduleOutputPatcher = moduleOutputPatcher)
       packager.computeModuleSources(includedModules = includedModules, layout = layout, searchableOptionSet = searchableOptionSet)
       packager.computeModuleCustomLibrarySources(layout)
 
@@ -199,19 +199,19 @@ class JarPackager private constructor(
         if (!libraryToMerge.isEmpty()) {
           val clientLibraries = libraryToMerge.filterKeys { frontendModuleFilter.isProjectLibraryIncluded(it.name) }
           if (clientLibraries.isNotEmpty()) {
-            packager.projectLibsToSourceWithMappings(uberJarFile = outputDir.resolve(PlatformJarNames.LIB_CLIENT_JAR), libraryToMerge = clientLibraries)
+            packager.filesToSourceWithMappings(uberJarFile = outputDir.resolve(PlatformJarNames.LIB_CLIENT_JAR), libraryToMerge = clientLibraries)
           }
 
           val nonClientLibraries = libraryToMerge.filterKeys { !frontendModuleFilter.isProjectLibraryIncluded(it.name) }
           if (nonClientLibraries.isNotEmpty()) {
-            packager.projectLibsToSourceWithMappings(uberJarFile = outputDir.resolve(PlatformJarNames.LIB_JAR), libraryToMerge = nonClientLibraries)
+            packager.filesToSourceWithMappings(uberJarFile = outputDir.resolve(PlatformJarNames.LIB_JAR), libraryToMerge = nonClientLibraries)
           }
         }
       }
       else if (!libraryToMerge.isEmpty()) {
         val mainJarName = (layout as PluginLayout).getMainJarName()
         check(includedModules.any { it.relativeOutputFile == mainJarName })
-        packager.projectLibsToSourceWithMappings(uberJarFile = outputDir.resolve(mainJarName), libraryToMerge = libraryToMerge)
+        packager.filesToSourceWithMappings(uberJarFile = outputDir.resolve(mainJarName), libraryToMerge = libraryToMerge)
       }
 
       val cacheManager = if (dryRun || context !is BuildContextImpl) NonCachingJarCacheManager else context.jarCacheManager
@@ -295,7 +295,7 @@ class JarPackager private constructor(
                     extraExcludes.isEmpty()
 
     val nativeFiles = context.getModuleOutputFileContent(module = module, forTests = useTestModuleOutput, relativePath = "META-INF/native-files-list")?.let { String(it) }?.lines()
-    val outFile = outputDir.resolve(item.relativeOutputFile)
+    val outFile = outDir.resolve(item.relativeOutputFile)
     val asset = if (packToDir) {
       assets.computeIfAbsent(moduleOutDir) { file ->
         AssetDescriptor(isDir = true, file = file, relativePath = "", nativeFiles = nativeFiles)
@@ -358,7 +358,7 @@ class JarPackager private constructor(
         customAsset.getSources(context)?.let { jarAsset.value.sources.addAll(it) }
       }
       else {
-        val targetFile = outputDir.resolveSibling(relativePath)
+        val targetFile = outDir.resolveSibling(relativePath)
         val assetDescriptor = AssetDescriptor(
           isDir = false,
           file = targetFile,
@@ -430,6 +430,8 @@ class JarPackager private constructor(
           }
 
           projectLibraryData = ProjectLibraryData(libraryName = libName, reason = "<- $moduleName")
+          val library = element.library ?: throw IllegalStateException("cannot find $libRef")
+          libToMetadata.put(library, projectLibraryData)
         }
         else if (platformLayout != null && platformLayout.isLibraryAlwaysPackedIntoPlugin(libName)) {
           platformLayout.findProjectLibrary(libName)?.let {
@@ -441,6 +443,8 @@ class JarPackager private constructor(
           }
 
           projectLibraryData = ProjectLibraryData(libraryName = libName, reason = "<- $moduleName (always packed into plugin)")
+          val library = element.library ?: throw IllegalStateException("cannot find $libRef")
+          libToMetadata.put(library, projectLibraryData)
         }
         else {
           continue
@@ -453,67 +457,43 @@ class JarPackager private constructor(
         continue
       }
 
-      if (item.reason == ModuleIncludeReasons.PRODUCT_MODULES) {
-        packLibFilesIntoModuleJar(asset = asset.value, item = item, files = library.getPaths(JpsOrderRootType.COMPILED), projectLibraryData = projectLibraryData, library = library)
-      }
-      else {
-        val targetFile = outputDir.resolve(item.relativeOutputFile)
-        val files = getLibraryFiles(library = library, copiedFiles = copiedFiles, targetFile = targetFile)
-
-        for (i in (files.size - 1) downTo 0) {
-          val file = files[i]
-          val fileName = file.fileName.toString()
-          if (isSeparateJar(fileName)) {
-            files.removeAt(i)
-            val relativeOutputFile = removeVersionFromJar(fileName)
-            addLibrary(library = library, relativeOutputFile = relativeOutputFile, outputDir = outputDir, files = listOf(file), projectLibraryData = projectLibraryData)
-          }
-        }
-
-        if (layout is PluginLayout && item.relativeOutputFile == layout.getMainJarName()) {
-          val relativeOutputFile = removeVersionFromJar(nameToJarFileName(getLibraryFileName(library)))
-          addLibrary(library = library, relativeOutputFile = relativeOutputFile, outputDir = outputDir, files = files, projectLibraryData = projectLibraryData)
-        }
-        else {
-          packLibFilesIntoModuleJar(asset = asset.value, item = item, files = files, projectLibraryData = projectLibraryData, library = library)
+      val targetFile = outDir.resolve(item.relativeOutputFile)
+      val files = getLibraryFiles(library, copiedFiles, targetFile)
+      for (i in (files.size - 1) downTo 0) {
+        val file = files[i]
+        val fileName = file.fileName.toString()
+        if (item.reason != ModuleIncludeReasons.PRODUCT_MODULES && isSeparateJar(fileName)) {
+          files.removeAt(i)
+          addLibrary(library = library, targetFile = outDir.resolve(removeVersionFromJar(fileName)), relativeOutputFile = item.relativeOutputFile, files = listOf(file))
         }
       }
-    }
-  }
 
-  private fun packLibFilesIntoModuleJar(
-    asset: AssetDescriptor,
-    item: ModuleItem,
-    files: List<Path>,
-    projectLibraryData: ProjectLibraryData?,
-    library: JpsLibrary,
-  ) {
-    val libraryName = getLibraryFilename(library)
-    for (file in files) {
-      @Suppress("NAME_SHADOWING")
-      asset.sources.add(
-        ZipSource(
-          file = file,
-          distributionFileEntryProducer = { size, hash, targetFile ->
-            if (projectLibraryData == null) {
-              ModuleLibraryFileEntry(
-                path = targetFile,
-                moduleName = item.moduleName,
-                libraryName = libraryName,
-                libraryFile = file,
-                size = size,
-                hash = hash,
-                relativeOutputFile = item.relativeOutputFile,
-              )
-            }
-            else {
-              ProjectLibraryEntry(path = targetFile, data = projectLibraryData, libraryFile = file, hash = hash, size = size, relativeOutputFile = item.relativeOutputFile)
-            }
-          },
-          isPreSignedAndExtractedCandidate = asset.nativeFiles != null || isLibPreSigned(library),
-          filter = ::defaultLibrarySourcesNamesFilter,
+      for (file in files) {
+        @Suppress("NAME_SHADOWING")
+        asset.value.sources.add(
+          ZipSource(
+            file = file,
+            distributionFileEntryProducer = { size, hash, targetFile ->
+              if (projectLibraryData == null) {
+                ModuleLibraryFileEntry(
+                  path = targetFile,
+                  moduleName = moduleName,
+                  libraryName = getLibraryFilename(library),
+                  libraryFile = file,
+                  size = size,
+                  hash = hash,
+                  relativeOutputFile = item.relativeOutputFile,
+                )
+              }
+              else {
+                ProjectLibraryEntry(path = targetFile, data = projectLibraryData, libraryFile = file, hash = hash, size = size, relativeOutputFile = item.relativeOutputFile)
+              }
+            },
+            isPreSignedAndExtractedCandidate = asset.value.nativeFiles != null || isLibPreSigned(library),
+            filter = ::defaultLibrarySourcesNamesFilter,
+          )
         )
-      )
+      }
     }
   }
 
@@ -524,49 +504,36 @@ class JarPackager private constructor(
                     ?: throw IllegalArgumentException("Cannot find library ${item.libraryName} in '${item.moduleName}' module")
       var relativePath = item.relativeOutputPath
       if (relativePath.endsWith(".jar")) {
-        val targetFile = outputDir.resolve(relativePath)
+        val targetFile = outDir.resolve(relativePath)
         if (!relativePath.contains('/')) {
           relativePath = ""
         }
-        addLibrary(
-          library = library,
-          targetFile = targetFile,
-          relativeOutputFile = relativePath,
-          files = getLibraryFiles(library, copiedFiles, targetFile),
-          projectLibraryData = null,
-        )
+        addLibrary(library = library, targetFile = targetFile, relativeOutputFile = relativePath, files = getLibraryFiles(library, copiedFiles, targetFile))
       }
       else {
         val fileName = nameToJarFileName(item.libraryName)
         val targetFile: Path
         if (relativePath.isEmpty()) {
-          targetFile = outputDir.resolve(fileName)
+          targetFile = outDir.resolve(fileName)
         }
         else {
-          targetFile = outputDir.resolve(relativePath).resolve(fileName)
+          targetFile = outDir.resolve(relativePath).resolve(fileName)
           relativePath += "/$fileName"
         }
-        addLibrary(
-          library = library,
-          targetFile = targetFile,
-          relativeOutputFile = relativePath,
-          files = getLibraryFiles(library, copiedFiles, targetFile),
-          projectLibraryData = null,
-        )
+        addLibrary(library = library, targetFile = targetFile, relativeOutputFile = relativePath, files = getLibraryFiles(library, copiedFiles, targetFile))
       }
     }
   }
 
-  private fun alreadyHasLibrary(layout: BaseLayout, libraryName: String): Boolean {
-    return layout.includedModuleLibraries.any { it.libraryName == libraryName && !it.extraCopy }
-  }
+  private fun alreadyHasLibrary(layout: BaseLayout, libraryName: String): Boolean =
+    layout.includedModuleLibraries.any { it.libraryName == libraryName && !it.extraCopy }
 
   private fun mergeLibsByPredicate(
     jarName: String,
     libraryToMerge: MutableMap<JpsLibrary, List<Path>>,
     outputDir: Path,
     predicate: (String, FrontendModuleFilter) -> Boolean,
-    frontendModuleFilter: FrontendModuleFilter,
+    frontendModuleFilter: FrontendModuleFilter
   ) {
     val result = LinkedHashMap<JpsLibrary, List<Path>>()
     val iterator = libraryToMerge.entries.iterator()
@@ -580,19 +547,13 @@ class JarPackager private constructor(
     if (result.isEmpty()) {
       return
     }
-    projectLibsToSourceWithMappings(uberJarFile = outputDir.resolve(jarName), libraryToMerge = result)
+    filesToSourceWithMappings(uberJarFile = outputDir.resolve(jarName), libraryToMerge = result)
   }
 
-  private fun projectLibsToSourceWithMappings(uberJarFile: Path, libraryToMerge: Map<JpsLibrary, List<Path>>) {
+  private fun filesToSourceWithMappings(uberJarFile: Path, libraryToMerge: Map<JpsLibrary, List<Path>>) {
     val descriptor = getJarAsset(targetFile = uberJarFile, relativeOutputFile = "", nativeFiles = null)
-    for ((library, files) in libraryToMerge) {
-      filesToSourceWithMapping(
-        asset = descriptor,
-        files = files,
-        library = library,
-        relativeOutputFile = null,
-        projectLibraryData = libToMetadata.get(library) ?: throw IllegalStateException("Metadata not found for ${library.name}"),
-      )
+    for ((key, value) in libraryToMerge) {
+      filesToSourceWithMapping(asset = descriptor, files = value, library = key, relativeOutputFile = null)
     }
   }
 
@@ -638,7 +599,6 @@ class JarPackager private constructor(
             files = getLibraryFiles(library = library, copiedFiles = copiedFiles, targetFile = targetFile),
             library = library,
             relativeOutputFile = outPath,
-            projectLibraryData = libraryData,
           )
           continue
         }
@@ -649,13 +609,7 @@ class JarPackager private constructor(
       if (packMode == LibraryPackMode.STANDALONE_MERGED) {
         val targetFile = libOutputDir.resolve(nameToJarFileName(libName))
         val relativeOutputFile = if (outDir == libOutputDir) "" else outDir.relativize(targetFile).invariantSeparatorsPathString
-        addLibrary(
-          library = library,
-          targetFile = targetFile,
-          relativeOutputFile = relativeOutputFile,
-          files = getLibraryFiles(library, copiedFiles, targetFile),
-          projectLibraryData = libraryData,
-        )
+        addLibrary(library = library, targetFile = targetFile, relativeOutputFile = relativeOutputFile, files = getLibraryFiles(library, copiedFiles, targetFile))
       }
       else {
         for (file in library.getPaths(JpsOrderRootType.COMPILED)) {
@@ -666,13 +620,7 @@ class JarPackager private constructor(
 
           val targetFile = libOutputDir.resolve(fileName)
           val relativeOutputFile = if (outDir == libOutputDir) "" else outDir.relativize(targetFile).invariantSeparatorsPathString
-          addLibrary(
-            library = library,
-            targetFile = targetFile,
-            relativeOutputFile = relativeOutputFile,
-            files = listOf(file),
-            projectLibraryData = libraryData,
-          )
+          addLibrary(library = library, targetFile = targetFile, relativeOutputFile = relativeOutputFile, files = listOf(file))
         }
       }
     }
@@ -684,44 +632,36 @@ class JarPackager private constructor(
     files: List<Path>,
     library: JpsLibrary,
     relativeOutputFile: String?,
-    projectLibraryData: ProjectLibraryData?,
   ) {
-    val libraryName = library.name
     val moduleName = (library.createReference().parentReference as? JpsModuleReference)?.moduleName
-    if (moduleName == null && projectLibraryData == null) {
-      throw IllegalStateException("Metadata not specified for $libraryName")
-    }
-
     val sources = asset.sources
     val isPreSignedCandidate = asset.nativeFiles != null || (isRootDir && isLibPreSigned(library))
+    val libraryName = library.name
     for (file in files) {
       sources.add(
         ZipSource(
           file = file,
           isPreSignedAndExtractedCandidate = isPreSignedCandidate,
-          optimizeConfigId = libraryName.takeIf { isRootDir && libraryName == "jsvg" },
+          optimizeConfigId = libraryName.takeIf { isRootDir && (libraryName == "jsvg") },
           distributionFileEntryProducer = { size, hash, targetFile ->
-            if (moduleName == null) {
-              ProjectLibraryEntry(
-                path = targetFile,
-                data = projectLibraryData ?: throw IllegalStateException("Metadata not specified for $libraryName"),
-                libraryFile = file,
-                hash = hash,
-                size = size,
-                relativeOutputFile = relativeOutputFile,
-              )
-            }
-            else {
+            moduleName?.let {
               ModuleLibraryFileEntry(
                 path = targetFile,
-                moduleName = moduleName,
+                moduleName = it,
                 libraryName = getLibraryFilename(library),
                 libraryFile = file,
                 hash = hash,
                 size = size,
                 relativeOutputFile = relativeOutputFile,
               )
-            }
+            } ?: ProjectLibraryEntry(
+              path = targetFile,
+              data = libToMetadata[library] ?: throw IllegalStateException("Metadata not found for $libraryName"),
+              libraryFile = file,
+              hash = hash,
+              size = size,
+              relativeOutputFile = relativeOutputFile,
+            )
           },
           filter = ::defaultLibrarySourcesNamesFilter,
         )
@@ -729,23 +669,12 @@ class JarPackager private constructor(
     }
   }
 
-  private fun addLibrary(library: JpsLibrary, targetFile: Path, relativeOutputFile: String, files: List<Path>, projectLibraryData: ProjectLibraryData?) {
+  private fun addLibrary(library: JpsLibrary, targetFile: Path, relativeOutputFile: String, files: List<Path>) {
     filesToSourceWithMapping(
       asset = getJarAsset(targetFile = targetFile, relativeOutputFile = relativeOutputFile, nativeFiles = null),
       files = files,
       library = library,
       relativeOutputFile = relativeOutputFile,
-      projectLibraryData = projectLibraryData,
-    )
-  }
-
-  private fun addLibrary(library: JpsLibrary, relativeOutputFile: String, outputDir: Path, files: List<Path>, projectLibraryData: ProjectLibraryData?) {
-    filesToSourceWithMapping(
-      asset = getJarAsset(targetFile = outputDir.resolve(relativeOutputFile), relativeOutputFile = relativeOutputFile, nativeFiles = null),
-      files = files,
-      library = library,
-      relativeOutputFile = relativeOutputFile,
-      projectLibraryData = projectLibraryData,
     )
   }
 
@@ -762,9 +691,10 @@ private val agentLibrariesNotForcedInSeparateJars = listOf(
 )
 
 private fun isSeparateJar(fileName: String): Boolean {
-  return fileName.endsWith("-rt.jar") ||
-         (fileName.contains("-agent") && agentLibrariesNotForcedInSeparateJars.none { fileName.contains(it) }) ||
-         fileName.startsWith("maven-")
+  if (fileName.endsWith("-rt.jar") || (fileName.contains("-agent") && agentLibrariesNotForcedInSeparateJars.none { fileName.contains(it) })) {
+    return true
+  }
+  return fileName.startsWith("maven-")
 }
 
 private data class AssetDescriptor(
@@ -791,6 +721,11 @@ private fun removeVersionFromJar(fileName: String): String {
 
 private fun getLibraryFiles(library: JpsLibrary, copiedFiles: MutableMap<CopiedForKey, CopiedFor>, targetFile: Path?): MutableList<Path> {
   val files = library.getPaths(JpsOrderRootType.COMPILED)
+  val libName = library.name
+  if (libName == "ktor-client-jvm") {
+    return files
+  }
+
   val iterator = files.iterator()
   while (iterator.hasNext()) {
     val file = iterator.next()

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

@@ -1,22 +1,16 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-@file:Suppress("IO_FILE_USAGE")
-
 package org.jetbrains.intellij.build.impl.projectStructureMapping
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
-import org.jetbrains.intellij.build.BuildContext
-import org.jetbrains.intellij.build.BuildPaths
-import org.jetbrains.intellij.build.DistFile
-import org.jetbrains.intellij.build.MAVEN_REPO
-import org.jetbrains.intellij.build.PluginBuildDescriptor
+import org.jetbrains.intellij.build.*
 import org.jetbrains.intellij.build.impl.ProjectLibraryData
 import org.jetbrains.intellij.build.io.ZipFileWriter
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.nio.file.Path
-import java.util.TreeMap
+import java.util.*
 
 internal fun getIncludedModules(entries: Sequence<DistributionFileEntry>): Sequence<String> {
   return entries.mapNotNull { (it as? ModuleOutputEntry)?.moduleName }.distinct()
@@ -61,24 +55,16 @@ private fun buildPluginContentReport(pluginToEntries: List<Pair<PluginBuildDescr
     for ((filePath, fileEntries) in fileToEntry) {
       writer.writeStartObject()
       writer.writeStringField("name", filePath)
-      writeProjectLibs(entries = fileEntries, writer = writer, buildPaths = buildPaths, isInner = false)
-
-      if (fileEntries.all { it is ModuleLibraryFileEntry }) {
-        writeSeparatePackedModuleLibrary(fileEntries = fileEntries, writer = writer, buildPaths = buildPaths)
-        writer.writeEndObject()
-        continue
-      }
+      writeProjectLibs(fileEntries, writer, buildPaths)
 
       writeModules(
         writer = writer,
-        fileEntries = fileEntries,
-        buildPaths = buildPaths,
-        reasonFilter = { it.reason != contentModuleReason },
+        fileEntries = fileEntries.asSequence().filter { it !is ModuleOutputEntry || it.reason != contentModuleReason },
+        buildPaths = buildPaths
       )
       writeModules(
         writer = writer,
-        fileEntries = fileEntries,
-        reasonFilter = { it.reason == contentModuleReason },
+        fileEntries = fileEntries.asSequence().filter { it !is ModuleOutputEntry || it.reason == contentModuleReason },
         buildPaths = buildPaths,
         fieldName = "contentModules",
         writeReason = false,
@@ -117,8 +103,8 @@ private fun buildPlatformContentReport(contentReport: ContentReport, buildPaths:
   for ((filePath, fileEntries) in fileToEntry) {
     writer.writeStartObject()
     writer.writeStringField("name", filePath)
-    writeProjectLibs(entries = fileEntries, writer = writer, buildPaths = buildPaths, isInner = true)
-    writeModules(writer = writer, fileEntries = fileEntries, buildPaths = buildPaths)
+    writeProjectLibs(fileEntries, writer, buildPaths)
+    writeModules(writer = writer, fileEntries = fileEntries.asSequence(), buildPaths = buildPaths)
     writer.writeEndObject()
   }
 
@@ -178,15 +164,14 @@ private fun shortenAndNormalizePath(file: Path, buildPaths: BuildPaths, extraRoo
 
 private fun writeModules(
   writer: JsonGenerator,
-  fileEntries: List<DistributionFileEntry>,
+  fileEntries: Sequence<DistributionFileEntry>,
   buildPaths: BuildPaths,
   fieldName: String = "modules",
   writeReason: Boolean = true,
-  reasonFilter: (ModuleOutputEntry) -> Boolean = { true },
 ) {
   var opened = false
   for (entry in fileEntries) {
-    if (entry !is ModuleOutputEntry || !reasonFilter(entry)) {
+    if (entry !is ModuleOutputEntry) {
       continue
     }
 
@@ -216,15 +201,11 @@ private fun writeModuleItem(writer: JsonGenerator, entry: ModuleOutputEntry, wri
   }
 }
 
-private fun writeModuleLibraries(fileEntries: List<DistributionFileEntry>, moduleName: String, writer: JsonGenerator, buildPaths: BuildPaths) {
-  val entriesGroupedByLibraryName = LinkedHashMap<String, MutableList<ModuleLibraryFileEntry>>()
-  for (entry in fileEntries) {
-    if (entry is ModuleLibraryFileEntry) {
-      if (entry.moduleName == moduleName) {
-        entriesGroupedByLibraryName.computeIfAbsent(entry.libraryName) { ArrayList() }.add(entry)
-      }
-    }
-  }
+private fun writeModuleLibraries(fileEntries: Sequence<DistributionFileEntry>, moduleName: String, writer: JsonGenerator, buildPaths: BuildPaths) {
+  val entriesGroupedByLibraryName = fileEntries
+    .filterIsInstance<ModuleLibraryFileEntry>()
+    .filter { it.moduleName == moduleName }
+    .groupBy { it.libraryName }
 
   if (entriesGroupedByLibraryName.isEmpty()) {
     return
@@ -232,46 +213,19 @@ private fun writeModuleLibraries(fileEntries: List<DistributionFileEntry>, modul
 
   writer.writeObjectFieldStart("libraries")
   for ((libName, entries) in entriesGroupedByLibraryName) {
-    writeFiles(writer = writer, entries = entries, buildPaths = buildPaths, arrayFieldName = libName)
+    writer.writeArrayFieldStart(libName)
+    for (entry in entries) {
+      writer.writeStartObject()
+      writer.writeStringField("name", shortenAndNormalizePath(entry.libraryFile!!, buildPaths))
+      writer.writeNumberField("size", entry.size)
+      writer.writeEndObject()
+    }
+    writer.writeEndArray()
   }
   writer.writeEndObject()
 }
 
-private fun writeSeparatePackedModuleLibrary(fileEntries: List<DistributionFileEntry>, writer: JsonGenerator, buildPaths: BuildPaths) {
-  val entriesGroupedByLibraryName = LinkedHashMap<String, MutableList<ModuleLibraryFileEntry>>()
-  for (entry in fileEntries) {
-    if (entry is ModuleLibraryFileEntry) {
-      entriesGroupedByLibraryName.computeIfAbsent(entry.libraryName) { ArrayList() }.add(entry)
-    }
-  }
-
-  require(entriesGroupedByLibraryName.size == 1) {
-    "Expected only one library, but got: $entriesGroupedByLibraryName"
-  }
-
-  val (libName, entries) = entriesGroupedByLibraryName.iterator().next()
-  writer.writeObjectField("library", libName)
-  writer.writeObjectField("module", entries.first().moduleName)
-  writeFiles(writer = writer, entries = entries, buildPaths = buildPaths)
-}
-
-private fun writeFiles(
-  writer: JsonGenerator,
-  entries: List<LibraryFileEntry>,
-  buildPaths: BuildPaths,
-  arrayFieldName: String = "files",
-) {
-  writer.writeArrayFieldStart(arrayFieldName)
-  for (entry in entries) {
-    writer.writeStartObject()
-    writer.writeStringField("name", shortenAndNormalizePath(entry.libraryFile!!, buildPaths))
-    writer.writeNumberField("size", entry.size)
-    writer.writeEndObject()
-  }
-  writer.writeEndArray()
-}
-
-private fun writeProjectLibs(entries: List<DistributionFileEntry>, writer: JsonGenerator, buildPaths: BuildPaths, isInner: Boolean) {
+private fun writeProjectLibs(entries: List<DistributionFileEntry>, writer: JsonGenerator, buildPaths: BuildPaths) {
   // group by library
   val map = TreeMap<ProjectLibraryData, MutableList<ProjectLibraryEntry>> { o1, o2 ->
     o1.libraryName.compareTo(o2.libraryName)
@@ -286,14 +240,6 @@ private fun writeProjectLibs(entries: List<DistributionFileEntry>, writer: JsonG
     return
   }
 
-  if (!isInner && map.size == 1) {
-    val (libraryData, entries) = map.iterator().next()
-    writer.writeObjectField("library", libraryData.libraryName)
-    writeFiles(writer = writer, entries = entries, buildPaths = buildPaths)
-    writer.writeObjectField("reason", libraryData.reason)
-    return
-  }
-
   writer.writeArrayFieldStart("projectLibraries")
   for ((data, value) in map) {
     writer.writeStartObject()

platform/testFramework/common/src/common/testApplication.kt

@@ -37,7 +37,6 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.RecursionManager
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.util.registry.RegistryManager
-import com.intellij.openapi.util.text.StringUtil
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.openapi.vfs.encoding.EncodingManager

platform/testFramework/ui/plugin-content.yaml

@@ -1,37 +1,12 @@
 - name: lib/intellij.remoterobot.remote.fixtures.jar
-  library: intellij.remoterobot.remote.fixtures
-  module: intellij.platform.testFramework.ui
-  files:
-  - name: $MAVEN_REPOSITORY$/com/intellij/remoterobot/remote-fixtures/0/remote-fixtures-0.jar
 - name: lib/intellij.remoterobot.robot.server.core.jar
-  library: intellij.remoterobot.robot.server.core
-  module: intellij.platform.testFramework.ui
-  files:
-  - name: $MAVEN_REPOSITORY$/com/intellij/remoterobot/robot-server-core/0/robot-server-core-0.jar
-  - name: $MAVEN_REPOSITORY$/com/intellij/remoterobot/remote-robot/0/remote-robot-0.jar
-  - name: $MAVEN_REPOSITORY$/org/slf4j/slf4j-api/2/slf4j-api-2.jar
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1/kotlin-reflect-1.jar
-  - name: $MAVEN_REPOSITORY$/com/squareup/retrofit2/retrofit/2/retrofit-2.jar
-  - name: $MAVEN_REPOSITORY$/com/squareup/okhttp3/okhttp/3/okhttp-3.jar
-  - name: $MAVEN_REPOSITORY$/com/squareup/okio/okio/1/okio-1.jar
-  - name: $MAVEN_REPOSITORY$/com/squareup/retrofit2/converter-gson/2/converter-gson-2.jar
-  - name: $MAVEN_REPOSITORY$/org/mozilla/rhino/1/rhino-1.jar
-  - name: $MAVEN_REPOSITORY$/org/assertj/assertj-swing-junit/3/assertj-swing-junit-3.jar
-  - name: $MAVEN_REPOSITORY$/junit/junit/4/junit-4.jar
-  - name: $MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1/hamcrest-core-1.jar
-  - name: $MAVEN_REPOSITORY$/org/assertj/assertj-swing/3/assertj-swing-3.jar
-  - name: $MAVEN_REPOSITORY$/org/assertj/assertj-core/3/assertj-core-3.jar
-  - name: $MAVEN_REPOSITORY$/org/easytesting/fest-util/1/fest-util-1.jar
-  - name: $MAVEN_REPOSITORY$/org/easytesting/fest-reflect/1/fest-reflect-1.jar
-  - name: $MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-dep/1/byte-buddy-dep-1.jar
-  - name: $MAVEN_REPOSITORY$/org/ow2/asm/asm/9/asm-9.jar
-  - name: $MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/9/asm-commons-9.jar
 - name: lib/okhttp.jar
-  library: okhttp
-  files:
-  - name: $MAVEN_REPOSITORY$/com/squareup/okhttp3/okhttp/5/okhttp-5.jar
-  - name: $MAVEN_REPOSITORY$/com/squareup/okio/okio-jvm/3/okio-jvm-3.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: okhttp
+    files:
+    - name: $MAVEN_REPOSITORY$/com/squareup/okhttp3/okhttp/5/okhttp-5.jar
+    - name: $MAVEN_REPOSITORY$/com/squareup/okio/okio-jvm/3/okio-jvm-3.jar
+    reason: withProjectLibrary
 - name: lib/platform-testFramework-ui.jar
   modules:
   - name: intellij.platform.testFramework.ui

plugins/changeReminder/plugin-content.yaml

@@ -1,8 +1,6 @@
-- name: lib/change-reminder-prediction-model.jar
-  library: change-reminder-prediction-model
-  module: intellij.vcs.changeReminder
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/changeReminder/prediction/randomForestRegressor/0/randomForestRegressor-0.jar
 - name: lib/vcs-changeReminder.jar
   modules:
-  - name: intellij.vcs.changeReminder
+  - name: intellij.vcs.changeReminder
+    libraries:
+      change-reminder-prediction-model:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/changeReminder/prediction/randomForestRegressor/0/randomForestRegressor-0.jar

plugins/completion-ml-ranking-models/plugin-content.yaml

@@ -1,88 +1,38 @@
-- name: lib/completion-ranking-cpp-exp.jar
-  library: completion-ranking-cpp-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-cpp/0/completion-ranking-cpp-0.jar
-- name: lib/completion-ranking-css-exp.jar
-  library: completion-ranking-css-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-css/0/completion-ranking-css-0.jar
-- name: lib/completion-ranking-dart-exp.jar
-  library: completion-ranking-dart-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-dart/0/completion-ranking-dart-0.jar
-- name: lib/completion-ranking-go-exp.jar
-  library: completion-ranking-go-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-go/0/completion-ranking-go-0.jar
-- name: lib/completion-ranking-html-exp.jar
-  library: completion-ranking-html-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-html/0/completion-ranking-html-0.jar
-- name: lib/completion-ranking-java-exp.jar
-  library: completion-ranking-java-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0/completion-ranking-java-0.jar
-- name: lib/completion-ranking-java-exp2.jar
-  library: completion-ranking-java-exp2
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0/completion-ranking-java-0.jar
-- name: lib/completion-ranking-js-exp.jar
-  library: completion-ranking-js-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-js/0/completion-ranking-js-0.jar
-- name: lib/completion-ranking-kotlin-exp.jar
-  library: completion-ranking-kotlin-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-kotlin/0/completion-ranking-kotlin-0.jar
-- name: lib/completion-ranking-php-exp.jar
-  library: completion-ranking-php-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-php/0/completion-ranking-php-0.jar
-- name: lib/completion-ranking-python-exp.jar
-  library: completion-ranking-python-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-python/0/completion-ranking-python-0.jar
-- name: lib/completion-ranking-ruby-exp.jar
-  library: completion-ranking-ruby-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-ruby/0/completion-ranking-ruby-0.jar
-- name: lib/completion-ranking-rust-exp.jar
-  library: completion-ranking-rust-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-rust/0/completion-ranking-rust-0.jar
-- name: lib/completion-ranking-scala-exp.jar
-  library: completion-ranking-scala-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-scala/0/completion-ranking-scala-0.jar
-- name: lib/completion-ranking-sh-exp.jar
-  library: completion-ranking-sh-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-sh/0/completion-ranking-sh-0.jar
-- name: lib/completion-ranking-swift-exp.jar
-  library: completion-ranking-swift-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-swift/0/completion-ranking-swift-0.jar
-- name: lib/completion-ranking-typescript-exp.jar
-  library: completion-ranking-typescript-exp
-  module: intellij.completionMlRankingModels
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-typescript/0/completion-ranking-typescript-0.jar
 - name: lib/completionMlRankingModels.jar
   modules:
-  - name: intellij.completionMlRankingModels
+  - name: intellij.completionMlRankingModels
+    libraries:
+      completion-ranking-java-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0/completion-ranking-java-0.jar
+      completion-ranking-java-exp2:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-java/0/completion-ranking-java-0.jar
+      completion-ranking-kotlin-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-kotlin/0/completion-ranking-kotlin-0.jar
+      completion-ranking-scala-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-scala/0/completion-ranking-scala-0.jar
+      completion-ranking-rust-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-rust/0/completion-ranking-rust-0.jar
+      completion-ranking-python-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-python/0/completion-ranking-python-0.jar
+      completion-ranking-php-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-php/0/completion-ranking-php-0.jar
+      completion-ranking-ruby-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-ruby/0/completion-ranking-ruby-0.jar
+      completion-ranking-go-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-go/0/completion-ranking-go-0.jar
+      completion-ranking-js-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-js/0/completion-ranking-js-0.jar
+      completion-ranking-typescript-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-typescript/0/completion-ranking-typescript-0.jar
+      completion-ranking-dart-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-dart/0/completion-ranking-dart-0.jar
+      completion-ranking-swift-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-swift/0/completion-ranking-swift-0.jar
+      completion-ranking-cpp-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-cpp/0/completion-ranking-cpp-0.jar
+      completion-ranking-html-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-html/0/completion-ranking-html-0.jar
+      completion-ranking-css-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-css/0/completion-ranking-css-0.jar
+      completion-ranking-sh-exp:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-sh/0/completion-ranking-sh-0.jar

plugins/coverage/plugin-content.yaml

@@ -1,23 +1,11 @@
-- name: lib/coverage-report.jar
-  library: coverage-report
-  module: intellij.java.coverage
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/coverage-report/1/coverage-report-1.jar
-  - name: $MAVEN_REPOSITORY$/org/freemarker/freemarker/2/freemarker-2.jar
 - name: lib/jacoco.jar
-  library: JaCoCo
-  module: intellij.java.coverage
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jacoco/org.jacoco.ant/0/org.jacoco.ant-0.jar
-  - name: $MAVEN_REPOSITORY$/org/jacoco/org.jacoco.core/0/org.jacoco.core-0.jar
-  - name: $MAVEN_REPOSITORY$/org/ow2/asm/asm/9/asm-9.jar
-  - name: $MAVEN_REPOSITORY$/org/ow2/asm/asm-commons/9/asm-commons-9.jar
-  - name: $MAVEN_REPOSITORY$/org/ow2/asm/asm-tree/9/asm-tree-9.jar
-  - name: $MAVEN_REPOSITORY$/org/jacoco/org.jacoco.report/0/org.jacoco.report-0.jar
-  - name: $MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0/org.jacoco.agent-0.jar
 - name: lib/java-coverage-rt.jar
   modules:
   - name: intellij.java.coverage.rt
 - name: lib/java-coverage.jar
   modules:
-  - name: intellij.java.coverage
+  - name: intellij.java.coverage
+    libraries:
+      coverage-report:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/coverage-report/1/coverage-report-1.jar
+      - name: $MAVEN_REPOSITORY$/org/freemarker/freemarker/2/freemarker-2.jar

plugins/devkit/intellij.devkit/plugin-content.yaml

@@ -5,6 +5,11 @@
   modules:
   - name: intellij.devkit.runtimeModuleRepository.jps
 - name: lib/devkit.jar
+  projectLibraries:
+  - name: workspace-model-codegen
+    files:
+    - name: $MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/workspace-model-codegen/0/workspace-model-codegen-0.jar
+    reason: <- intellij.devkit.workspaceModel
   modules:
   - name: intellij.devkit
   contentModules:
@@ -25,9 +30,4 @@
   - name: intellij.devkit.debugger
   - name: intellij.devkit.stacktrace
   - name: intellij.devkit.apiDump
-  - name: intellij.devkit.apiDump.lang
-- name: lib/workspace-model-codegen.jar
-  library: workspace-model-codegen
-  files:
-  - name: $MAVEN_REPOSITORY$/com/jetbrains/intellij/platform/workspace-model-codegen/0/workspace-model-codegen-0.jar
-  reason: <- intellij.devkit.workspaceModel
+  - name: intellij.devkit.apiDump.lang

plugins/editorconfig/plugin-content.yaml

@@ -1,8 +1,8 @@
-- name: lib/ec4j-core.jar
-  library: ec4j-core
-  files:
-  - name: $MAVEN_REPOSITORY$/org/ec4j/core/ec4j-core/0/ec4j-core-0.jar
-  reason: <- intellij.editorconfig.plugin
 - name: lib/editorconfig-plugin.jar
+  projectLibraries:
+  - name: ec4j-core
+    files:
+    - name: $MAVEN_REPOSITORY$/org/ec4j/core/ec4j-core/0/ec4j-core-0.jar
+    reason: <- intellij.editorconfig.plugin
   modules:
   - name: intellij.editorconfig.plugin

plugins/evaluation-plugin/plugin-content.yaml

@@ -1,14 +1,35 @@
-- name: lib/clikt.jar
-  library: clikt
-  files:
-  - name: $MAVEN_REPOSITORY$/com/github/ajalt/clikt/clikt-jvm/3/clikt-jvm-3.jar
-  reason: <- intellij.evaluationPlugin
-- name: lib/commons-text.jar
-  library: commons-text
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/commons/commons-text/1/commons-text-1.jar
-  reason: <- intellij.evaluationPlugin.core
 - name: lib/evaluationPlugin.jar
+  projectLibraries:
+  - name: clikt
+    files:
+    - name: $MAVEN_REPOSITORY$/com/github/ajalt/clikt/clikt-jvm/3/clikt-jvm-3.jar
+    reason: <- intellij.evaluationPlugin
+  - name: commons-text
+    files:
+    - name: $MAVEN_REPOSITORY$/org/apache/commons/commons-text/1/commons-text-1.jar
+    reason: <- intellij.evaluationPlugin.core
+  - name: jerolba.carpet.record
+    files:
+    - name: $MAVEN_REPOSITORY$/com/jerolba/carpet-record/0/carpet-record-0.jar
+    - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-common/1/parquet-common-1.jar
+    - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-format-structures/1/parquet-format-structures-1.jar
+    - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-column/1/parquet-column-1.jar
+    - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-encoding/1/parquet-encoding-1.jar
+    - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-hadoop/1/parquet-hadoop-1.jar
+    - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-jackson/1/parquet-jackson-1.jar
+    - name: $MAVEN_REPOSITORY$/commons-pool/commons-pool/1/commons-pool-1.jar
+    - name: $MAVEN_REPOSITORY$/com/github/luben/zstd-jni/1/zstd-jni-1.jar
+    - name: $MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/3/hadoop-common-3.jar
+    - name: $MAVEN_REPOSITORY$/org/apache/hadoop/thirdparty/hadoop-shaded-guava/1/hadoop-shaded-guava-1.jar
+    - name: $MAVEN_REPOSITORY$/commons-collections/commons-collections/3/commons-collections-3.jar
+    - name: $MAVEN_REPOSITORY$/org/codehaus/woodstox/stax2-api/4/stax2-api-4.jar
+    - name: $MAVEN_REPOSITORY$/com/fasterxml/woodstox/woodstox-core/5/woodstox-core-5.jar
+    - name: $MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-mapreduce-client-core/3/hadoop-mapreduce-client-core-3.jar
+    reason: <- intellij.evaluationPlugin.llm
+  - name: xerial.snappy.java
+    files:
+    - name: $MAVEN_REPOSITORY$/org/xerial/snappy/snappy-java/1/snappy-java-1.jar
+    reason: <- intellij.evaluationPlugin.llm
   modules:
   - name: intellij.evaluationPlugin
   - name: intellij.evaluationPlugin.languages.cpp
@@ -37,28 +58,4 @@
   contentModules:
   - name: intellij.evaluationPlugin.languages.java
   - name: intellij.evaluationPlugin.languages.python
-  - name: intellij.evaluationPlugin.languages.kotlin
-- name: lib/jerolba.carpet.record.jar
-  library: jerolba.carpet.record
-  files:
-  - name: $MAVEN_REPOSITORY$/com/jerolba/carpet-record/0/carpet-record-0.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-common/1/parquet-common-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-format-structures/1/parquet-format-structures-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-column/1/parquet-column-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-encoding/1/parquet-encoding-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-hadoop/1/parquet-hadoop-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/parquet/parquet-jackson/1/parquet-jackson-1.jar
-  - name: $MAVEN_REPOSITORY$/commons-pool/commons-pool/1/commons-pool-1.jar
-  - name: $MAVEN_REPOSITORY$/com/github/luben/zstd-jni/1/zstd-jni-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/3/hadoop-common-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/hadoop/thirdparty/hadoop-shaded-guava/1/hadoop-shaded-guava-1.jar
-  - name: $MAVEN_REPOSITORY$/commons-collections/commons-collections/3/commons-collections-3.jar
-  - name: $MAVEN_REPOSITORY$/org/codehaus/woodstox/stax2-api/4/stax2-api-4.jar
-  - name: $MAVEN_REPOSITORY$/com/fasterxml/woodstox/woodstox-core/5/woodstox-core-5.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-mapreduce-client-core/3/hadoop-mapreduce-client-core-3.jar
-  reason: <- intellij.evaluationPlugin.llm
-- name: lib/xerial.snappy.java.jar
-  library: xerial.snappy.java
-  files:
-  - name: $MAVEN_REPOSITORY$/org/xerial/snappy/snappy-java/1/snappy-java-1.jar
-  reason: <- intellij.evaluationPlugin.llm
+  - name: intellij.evaluationPlugin.languages.kotlin

plugins/filePrediction/plugin-content.yaml

@@ -1,8 +1,6 @@
-- name: lib/file-prediction-model.jar
-  library: file-prediction-model
-  module: intellij.filePrediction
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/filePrediction/model/file-prediction-model/0/file-prediction-model-0.jar
 - name: lib/filePrediction.jar
   modules:
-  - name: intellij.filePrediction
+  - name: intellij.filePrediction
+    libraries:
+      file-prediction-model:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/filePrediction/model/file-prediction-model/0/file-prediction-model-0.jar

plugins/gradle/plugin-content.yaml

@@ -1,138 +1,165 @@
 - name: lib/ant/ant-antlr.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-antlr.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-antlr.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-apache-bcel.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-bcel.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-bcel.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-apache-bsf.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-bsf.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-bsf.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-apache-log4j.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-log4j.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-log4j.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-apache-oro.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-oro.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-oro.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-apache-regexp.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-regexp.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-regexp.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-apache-resolver.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-resolver.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-resolver.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-apache-xalan2.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-xalan2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-xalan2.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-commons-logging.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-commons-logging.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-commons-logging.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-commons-net.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-commons-net.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-commons-net.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-imageio.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-imageio.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-imageio.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-jai.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jai.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jai.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-jakartamail.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jakartamail.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jakartamail.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-javamail.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-javamail.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-javamail.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-jdepend.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jdepend.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jdepend.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-jmf.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jmf.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jmf.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-jsch.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jsch.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jsch.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-junit.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junit.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junit.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-junit4.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junit4.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junit4.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-junitlauncher.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junitlauncher.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junitlauncher.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-launcher.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-launcher.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-launcher.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-netrexx.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-netrexx.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-netrexx.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-swing.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-swing.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-swing.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-testutil.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-testutil.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-testutil.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant-xz.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant-xz.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant-xz.jar
+    reason: withProjectLibrary
 - name: lib/ant/ant.jar
-  library: Ant
-  files:
-  - name: $PROJECT_DIR$/community/lib/ant/lib/ant.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Ant
+    files:
+    - name: $PROJECT_DIR$/community/lib/ant/lib/ant.jar
+    reason: withProjectLibrary
 - name: lib/gradle-api-8.13.jar
-  library: Gradle
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/gradle-api/8/gradle-api-8.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: Gradle
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/gradle-api/8/gradle-api-8.jar
+    reason: withProjectLibrary
 - name: lib/gradle-tooling-extension-api.jar
   modules:
   - name: intellij.gradle.toolingExtension

plugins/grazie/plugin-content.yaml

@@ -1,133 +1,82 @@
-- name: lib/ai.grazie.nlp.detect.jar
-  library: ai.grazie.nlp.detect
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-detect-jvm/0/nlp-detect-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/utils/utils-common-jvm/0/utils-common-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-common-jvm/0/nlp-common-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-text-jvm/0/model-text-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-common-jvm/0/model-common-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-patterns-jvm/0/nlp-patterns-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-tokenizer-jvm/0/nlp-tokenizer-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-similarity-jvm/0/nlp-similarity-jvm-0.jar
-- name: lib/ai.grazie.nlp.langs.jar
-  library: ai.grazie.nlp.langs
-  files:
-  - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-langs-jvm/0/nlp-langs-jvm-0.jar
-  reason: <- intellij.grazie.core
-- name: lib/ai.grazie.utils.lucene.lt.compatibility.jar
-  library: ai.grazie.utils.lucene.lt.compatibility
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/ai/grazie/utils/utils-lucene-lt-compatibility/0/utils-lucene-lt-compatibility-0.jar
-- name: lib/com.carrotsearch-hppc.jar
-  library: com.carrotsearch:hppc
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/com/carrotsearch/hppc/0/hppc-0.jar
-- name: lib/com.hankcs-aho-corasick-double-array-trie.jar
-  library: com.hankcs:aho-corasick-double-array-trie
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/com/hankcs/aho-corasick-double-array-trie/1/aho-corasick-double-array-trie-1.jar
-- name: lib/com.vdurmont-emoji-java.jar
-  library: com.vdurmont:emoji-java
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/com/vdurmont/emoji-java/5/emoji-java-5.jar
-- name: lib/commons-text.jar
-  library: commons-text
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/commons/commons-text/1/commons-text-1.jar
-  reason: <- intellij.grazie.core
 - name: lib/grazie.jar
+  projectLibraries:
+  - name: ai.grazie.nlp.langs
+    files:
+    - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-langs-jvm/0/nlp-langs-jvm-0.jar
+    reason: <- intellij.grazie.core
+  - name: commons-text
+    files:
+    - name: $MAVEN_REPOSITORY$/org/apache/commons/commons-text/1/commons-text-1.jar
+    reason: <- intellij.grazie.core
+  - name: grpc-core
+    files:
+    - name: $MAVEN_REPOSITORY$/io/grpc/grpc-core/1/grpc-core-1.jar
+    - name: $MAVEN_REPOSITORY$/io/grpc/grpc-api/1/grpc-api-1.jar
+    - name: $MAVEN_REPOSITORY$/com/google/android/annotations/4/annotations-4.jar
+    - name: $MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1/animal-sniffer-annotations-1.jar
+    - name: $MAVEN_REPOSITORY$/io/perfmark/perfmark-api/0/perfmark-api-0.jar
+    - name: $MAVEN_REPOSITORY$/io/grpc/grpc-context/1/grpc-context-1.jar
+    reason: <- intellij.grazie.core
+  - name: grpc-protobuf
+    files:
+    - name: $MAVEN_REPOSITORY$/io/grpc/grpc-protobuf/1/grpc-protobuf-1.jar
+    - name: $MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-common-protos/2/proto-google-common-protos-2.jar
+    - name: $MAVEN_REPOSITORY$/io/grpc/grpc-protobuf-lite/1/grpc-protobuf-lite-1.jar
+    reason: <- intellij.grazie.core
+  - name: grpc-stub
+    files:
+    - name: $MAVEN_REPOSITORY$/io/grpc/grpc-stub/1/grpc-stub-1.jar
+    reason: <- intellij.grazie.core
   modules:
   - name: intellij.grazie
   - name: intellij.grazie.core
     reason: <- intellij.grazie
+    libraries:
+      org.jetbrains.intellij.deps.languagetool:languagetool-core:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/languagetool/languagetool-core/6/languagetool-core-6.jar
+      - name: $MAVEN_REPOSITORY$/edu/washington/cs/knowitall/openregex/1/openregex-1.jar
+      org.jetbrains.intellij.deps.languagetool:language-en:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/languagetool/language-en/6/language-en-6.jar
+      - name: $MAVEN_REPOSITORY$/org/languagetool/english-pos-dict/0/english-pos-dict-0.jar
+      net.loomchild:segment:2.0.1:
+      - name: $MAVEN_REPOSITORY$/net/loomchild/segment/2/segment-2.jar
+      org.carrot2:morfologik-stemming:
+      - name: $MAVEN_REPOSITORY$/org/carrot2/morfologik-stemming/2/morfologik-stemming-2.jar
+      org.carrot2:morfologik-speller:
+      - name: $MAVEN_REPOSITORY$/org/carrot2/morfologik-speller/2/morfologik-speller-2.jar
+      com.carrotsearch:hppc:
+      - name: $MAVEN_REPOSITORY$/com/carrotsearch/hppc/0/hppc-0.jar
+      org.carrot2:morfologik-fsa-builders:
+      - name: $MAVEN_REPOSITORY$/org/carrot2/morfologik-fsa-builders/2/morfologik-fsa-builders-2.jar
+      org.carrot2:morfologik-fsa:
+      - name: $MAVEN_REPOSITORY$/org/carrot2/morfologik-fsa/2/morfologik-fsa-2.jar
+      tech.uom.lib:uom-lib-common:1.1:
+      - name: $MAVEN_REPOSITORY$/tech/uom/lib/uom-lib-common/1/uom-lib-common-1.jar
+      tech.units:indriya:1.3:
+      - name: $MAVEN_REPOSITORY$/tech/units/indriya/1/indriya-1.jar
+      javax.measure:unit-api:1.0:
+      - name: $MAVEN_REPOSITORY$/javax/measure/unit-api/1/unit-api-1.jar
+      com.hankcs:aho-corasick-double-array-trie:
+      - name: $MAVEN_REPOSITORY$/com/hankcs/aho-corasick-double-array-trie/1/aho-corasick-double-array-trie-1.jar
+      com.vdurmont:emoji-java:
+      - name: $MAVEN_REPOSITORY$/com/vdurmont/emoji-java/5/emoji-java-5.jar
+      org.json:json:
+      - name: $MAVEN_REPOSITORY$/org/json/json/20240205/json-20240205.jar
+      ai.grazie.utils.lucene.lt.compatibility:
+      - name: $MAVEN_REPOSITORY$/ai/grazie/utils/utils-lucene-lt-compatibility/0/utils-lucene-lt-compatibility-0.jar
+      ai.grazie.nlp.detect:
+      - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-detect-jvm/0/nlp-detect-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/utils/utils-common-jvm/0/utils-common-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-common-jvm/0/nlp-common-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-text-jvm/0/model-text-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-common-jvm/0/model-common-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-patterns-jvm/0/nlp-patterns-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-tokenizer-jvm/0/nlp-tokenizer-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/nlp/nlp-similarity-jvm/0/nlp-similarity-jvm-0.jar
   contentModules:
   - name: intellij.grazie.java
   - name: intellij.grazie.json
   - name: intellij.grazie.markdown
   - name: intellij.grazie.properties
   - name: intellij.grazie.xml
-  - name: intellij.grazie.yaml
-- name: lib/grpc-core.jar
-  library: grpc-core
-  files:
-  - name: $MAVEN_REPOSITORY$/io/grpc/grpc-core/1/grpc-core-1.jar
-  - name: $MAVEN_REPOSITORY$/io/grpc/grpc-api/1/grpc-api-1.jar
-  - name: $MAVEN_REPOSITORY$/com/google/android/annotations/4/annotations-4.jar
-  - name: $MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1/animal-sniffer-annotations-1.jar
-  - name: $MAVEN_REPOSITORY$/io/perfmark/perfmark-api/0/perfmark-api-0.jar
-  - name: $MAVEN_REPOSITORY$/io/grpc/grpc-context/1/grpc-context-1.jar
-  reason: <- intellij.grazie.core
-- name: lib/grpc-protobuf.jar
-  library: grpc-protobuf
-  files:
-  - name: $MAVEN_REPOSITORY$/io/grpc/grpc-protobuf/1/grpc-protobuf-1.jar
-  - name: $MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-common-protos/2/proto-google-common-protos-2.jar
-  - name: $MAVEN_REPOSITORY$/io/grpc/grpc-protobuf-lite/1/grpc-protobuf-lite-1.jar
-  reason: <- intellij.grazie.core
-- name: lib/grpc-stub.jar
-  library: grpc-stub
-  files:
-  - name: $MAVEN_REPOSITORY$/io/grpc/grpc-stub/1/grpc-stub-1.jar
-  reason: <- intellij.grazie.core
-- name: lib/javax.measure-unit-api.jar
-  library: javax.measure:unit-api:1.0
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/javax/measure/unit-api/1/unit-api-1.jar
-- name: lib/net.loomchild-segment.jar
-  library: net.loomchild:segment:2.0.1
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/net/loomchild/segment/2/segment-2.jar
-- name: lib/org.carrot2-morfologik-fsa-builders.jar
-  library: org.carrot2:morfologik-fsa-builders
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/org/carrot2/morfologik-fsa-builders/2/morfologik-fsa-builders-2.jar
-- name: lib/org.carrot2-morfologik-fsa.jar
-  library: org.carrot2:morfologik-fsa
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/org/carrot2/morfologik-fsa/2/morfologik-fsa-2.jar
-- name: lib/org.carrot2-morfologik-speller.jar
-  library: org.carrot2:morfologik-speller
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/org/carrot2/morfologik-speller/2/morfologik-speller-2.jar
-- name: lib/org.carrot2-morfologik-stemming.jar
-  library: org.carrot2:morfologik-stemming
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/org/carrot2/morfologik-stemming/2/morfologik-stemming-2.jar
-- name: lib/org.jetbrains.intellij.deps.languagetool-language-en.jar
-  library: org.jetbrains.intellij.deps.languagetool:language-en
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/languagetool/language-en/6/language-en-6.jar
-  - name: $MAVEN_REPOSITORY$/org/languagetool/english-pos-dict/0/english-pos-dict-0.jar
-- name: lib/org.jetbrains.intellij.deps.languagetool-languagetool-core.jar
-  library: org.jetbrains.intellij.deps.languagetool:languagetool-core
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/languagetool/languagetool-core/6/languagetool-core-6.jar
-  - name: $MAVEN_REPOSITORY$/edu/washington/cs/knowitall/openregex/1/openregex-1.jar
-- name: lib/org.json-json.jar
-  library: org.json:json
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/org/json/json/20240205/json-20240205.jar
-- name: lib/tech.units-indriya.jar
-  library: tech.units:indriya:1.3
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/tech/units/indriya/1/indriya-1.jar
-- name: lib/tech.uom.lib-uom-lib-common.jar
-  library: tech.uom.lib:uom-lib-common:1.1
-  module: intellij.grazie.core
-  files:
-  - name: $MAVEN_REPOSITORY$/tech/uom/lib/uom-lib-common/1/uom-lib-common-1.jar
+  - name: intellij.grazie.yaml

plugins/ide-features-trainer/plugin-content.yaml

@@ -1,22 +1,20 @@
-- name: lib/assertj-swing.jar
-  library: assertj-swing
-  files:
-  - name: $MAVEN_REPOSITORY$/org/assertj/assertj-swing/3/assertj-swing-3.jar
-  reason: <- intellij.featuresTrainer
-- name: lib/assertj.jar
-  library: assertJ
-  files:
-  - name: $MAVEN_REPOSITORY$/org/assertj/assertj-core/3/assertj-core-3.jar
-  - name: $MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1/byte-buddy-1.jar
-  reason: <- intellij.featuresTrainer
 - name: lib/featuresTrainer.jar
+  projectLibraries:
+  - name: assertJ
+    files:
+    - name: $MAVEN_REPOSITORY$/org/assertj/assertj-core/3/assertj-core-3.jar
+    - name: $MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1/byte-buddy-1.jar
+    reason: <- intellij.featuresTrainer
+  - name: assertj-swing
+    files:
+    - name: $MAVEN_REPOSITORY$/org/assertj/assertj-swing/3/assertj-swing-3.jar
+    reason: <- intellij.featuresTrainer
+  - name: git-learning-project
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/ift/git-learning-project/212/git-learning-project-212.jar
+    reason: <- intellij.vcs.git.featuresTrainer
   modules:
   - name: intellij.featuresTrainer
   contentModules:
   - name: intellij.vcs.git.featuresTrainer
-  - name: intellij.featuresTrainer.onboarding
-- name: lib/git-learning-project.jar
-  library: git-learning-project
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/ift/git-learning-project/212/git-learning-project-212.jar
-  reason: <- intellij.vcs.git.featuresTrainer
+  - name: intellij.featuresTrainer.onboarding

plugins/jsonpath/plugin-content.yaml

@@ -1,9 +1,10 @@
 - name: lib/jsonpath.jar
+  projectLibraries:
+  - name: jsonpath
+    files:
+    - name: $MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2/json-path-2.jar
+    - name: $MAVEN_REPOSITORY$/net/minidev/json-smart/2/json-smart-2.jar
+    - name: $MAVEN_REPOSITORY$/net/minidev/accessors-smart/2/accessors-smart-2.jar
+    reason: <- intellij.jsonpath
   modules:
-  - name: intellij.jsonpath
-  library: jsonpath
-  files:
-  - name: $MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2/json-path-2.jar
-  - name: $MAVEN_REPOSITORY$/net/minidev/json-smart/2/json-smart-2.jar
-  - name: $MAVEN_REPOSITORY$/net/minidev/accessors-smart/2/accessors-smart-2.jar
-  reason: <- intellij.jsonpath
+  - name: intellij.jsonpath

plugins/kotlin/plugin/plugin-content.yaml

@@ -1,36 +1,24 @@
-- name: lib/amper.dependency.resolution.kotlin.base.scripting.jar
-  library: amper.dependency.resolution.kotlin.base.scripting
-  module: kotlin.base.scripting
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/amper/dependency-resolution-jvm/0/dependency-resolution-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/amper/concurrency-jvm/0/concurrency-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/org/slf4j/slf4j-api/2/slf4j-api-2.jar
-  - name: $MAVEN_REPOSITORY$/io/github/pdvrieze/xmlutil/serialization-jvm/0/serialization-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/io/github/pdvrieze/xmlutil/core-jvm/0/core-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/1/kotlinx-coroutines-core-1.jar
-- name: lib/completion-ranking-kotlin.jar
-  library: completion-ranking-kotlin
-  module: kotlin.ml-completion
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-kotlin/0/completion-ranking-kotlin-0.jar
 - name: lib/frontend-split/kotlin-frontend.jar
   modules:
   - name: kotlin.frontend
 - name: lib/jackson-dataformat-toml.jar
-  library: jackson-dataformat-toml
-  files:
-  - name: $MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2/jackson-dataformat-toml-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: jackson-dataformat-toml
+    files:
+    - name: $MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2/jackson-dataformat-toml-2.jar
+    reason: withProjectLibrary
 - name: lib/javax-inject.jar
-  library: javax-inject
-  files:
-  - name: $MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: javax-inject
+    files:
+    - name: $MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar
+    reason: withProjectLibrary
 - name: lib/jps/kotlin-jps-plugin.jar
-  library: kotlinc.kotlin-jps-plugin-classpath
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/2/kotlin-jps-plugin-classpath-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.kotlin-jps-plugin-classpath
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/2/kotlin-jps-plugin-classpath-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlin-base-jps.jar
   modules:
   - name: kotlin.base.jps
@@ -116,6 +104,14 @@
   - name: kotlin.base.project-structure
   - name: kotlin.base.external-build-system
   - name: kotlin.base.scripting
+    libraries:
+      amper.dependency.resolution.kotlin.base.scripting:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/amper/dependency-resolution-jvm/0/dependency-resolution-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/amper/concurrency-jvm/0/concurrency-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/org/slf4j/slf4j-api/2/slf4j-api-2.jar
+      - name: $MAVEN_REPOSITORY$/io/github/pdvrieze/xmlutil/serialization-jvm/0/serialization-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/io/github/pdvrieze/xmlutil/core-jvm/0/core-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-coroutines-core/1/kotlinx-coroutines-core-1.jar
   - name: kotlin.base.analysis-api-platform
   - name: kotlin.base.analysis
   - name: kotlin.base.code-insight
@@ -198,6 +194,9 @@
   - name: kotlin.scripting
   - name: kotlin.coverage
   - name: kotlin.ml-completion
+    libraries:
+      completion-ranking-kotlin:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-kotlin/0/completion-ranking-kotlin-0.jar
   - name: kotlin.copyright
   - name: kotlin.spellchecker
   - name: kotlin.jvm-decompiler
@@ -291,88 +290,100 @@
   - name: kotlin-ultimate.profiler
   - name: kotlin.plugin
 - name: lib/kotlinc.allopen-compiler-plugin.jar
-  library: kotlinc.allopen-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/2/allopen-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.allopen-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/2/allopen-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.android-extensions-compiler-plugin.jar
-  library: kotlinc.android-extensions-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/2/android-extensions-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.android-extensions-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/2/android-extensions-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.assignment-compiler-plugin.jar
-  library: kotlinc.assignment-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/assignment-compiler-plugin-for-ide/2/assignment-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.assignment-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/assignment-compiler-plugin-for-ide/2/assignment-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.compose-compiler-plugin.jar
-  library: kotlinc.compose-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/compose-compiler-plugin-for-ide/2/compose-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.compose-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/compose-compiler-plugin-for-ide/2/compose-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.js-plain-objects-compiler-plugin.jar
-  library: kotlinc.js-plain-objects-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/js-plain-objects-compiler-plugin-for-ide/2/js-plain-objects-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.js-plain-objects-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/js-plain-objects-compiler-plugin-for-ide/2/js-plain-objects-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.kotlin-compiler-common.jar
-  library: kotlinc.kotlin-compiler-common
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/2/kotlin-compiler-common-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.kotlin-compiler-common
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/2/kotlin-compiler-common-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.kotlin-compiler-fe10.jar
-  library: kotlinc.kotlin-compiler-fe10
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/2/kotlin-compiler-fe10-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.kotlin-compiler-fe10
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/2/kotlin-compiler-fe10-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.kotlin-compiler-ir.jar
-  library: kotlinc.kotlin-compiler-ir
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/2/kotlin-compiler-ir-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.kotlin-compiler-ir
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/2/kotlin-compiler-ir-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.kotlin-jps-common.jar
-  library: kotlinc.kotlin-jps-common
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-common-for-ide/2/kotlin-jps-common-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.kotlin-jps-common
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-common-for-ide/2/kotlin-jps-common-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.kotlinx-serialization-compiler-plugin.jar
-  library: kotlinc.kotlinx-serialization-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/2/kotlinx-serialization-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.kotlinx-serialization-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/2/kotlinx-serialization-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.lombok-compiler-plugin.jar
-  library: kotlinc.lombok-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/2/lombok-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.lombok-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/2/lombok-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.noarg-compiler-plugin.jar
-  library: kotlinc.noarg-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/2/noarg-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.noarg-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/2/noarg-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.parcelize-compiler-plugin.jar
-  library: kotlinc.parcelize-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/2/parcelize-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.parcelize-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/2/parcelize-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.sam-with-receiver-compiler-plugin.jar
-  library: kotlinc.sam-with-receiver-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/2/sam-with-receiver-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.sam-with-receiver-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/2/sam-with-receiver-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.scripting-compiler-plugin.jar
-  library: kotlinc.scripting-compiler-plugin
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/scripting-compiler-plugin-for-ide/2/scripting-compiler-plugin-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.scripting-compiler-plugin
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/scripting-compiler-plugin-for-ide/2/scripting-compiler-plugin-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/maven-artifact.jar
-  library: amper.dependency.resolution.kotlin.base.scripting
-  module: kotlin.base.scripting
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3/maven-artifact-3.jar
 - name: lib/vavr.jar
-  library: vavr
-  files:
-  - name: $MAVEN_REPOSITORY$/io/vavr/vavr/0/vavr-0.jar
-  - name: $MAVEN_REPOSITORY$/io/vavr/vavr-match/0/vavr-match-0.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: vavr
+    files:
+    - name: $MAVEN_REPOSITORY$/io/vavr/vavr/0/vavr-0.jar
+    - name: $MAVEN_REPOSITORY$/io/vavr/vavr-match/0/vavr-match-0.jar
+    reason: withProjectLibrary

plugins/kotlin/scripting-plugin/plugin-content.yaml

@@ -10,12 +10,14 @@
   - name: kotlin.jsr223
   - name: kotlin.scripting-plugin
 - name: lib/kotlinc.kotlin-compiler-common.jar
-  library: kotlinc.kotlin-compiler-common
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/2/kotlin-compiler-common-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.kotlin-compiler-common
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/2/kotlin-compiler-common-for-ide-2.jar
+    reason: withProjectLibrary
 - name: lib/kotlinc.kotlin-compiler-fe10.jar
-  library: kotlinc.kotlin-compiler-fe10
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/2/kotlin-compiler-fe10-for-ide-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: kotlinc.kotlin-compiler-fe10
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/2/kotlin-compiler-fe10-for-ide-2.jar
+    reason: withProjectLibrary

plugins/maven-model/plugin-content.yaml

@@ -1,8 +1,8 @@
-- name: lib/jetbrains-annotations-java5.jar
-  library: jetbrains-annotations-java5
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/annotations-java5/24/annotations-java5-24.jar
-  reason: <- intellij.maven.model
 - name: lib/maven-model.jar
+  projectLibraries:
+  - name: jetbrains-annotations-java5
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/annotations-java5/24/annotations-java5-24.jar
+    reason: <- intellij.maven.model
   modules:
   - name: intellij.maven.model

plugins/maven/plugin-content.yaml

@@ -3,68 +3,13 @@
   - name: intellij.maven.artifactResolver.m31
   - name: intellij.maven.artifactResolver.common
 - name: lib/intellij.maven.server.indexer/lib/apache.maven.archetype.catalog-no-trans-321.jar
-  library: apache.maven.archetype.catalog-no-trans:321
-  module: intellij.maven.server.indexer
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/archetype/archetype-catalog/3/archetype-catalog-3.jar
 - name: lib/intellij.maven.server.indexer/lib/apache.maven.archetype.common-no-trans-3.2.1.jar
-  library: apache.maven.archetype.common-no-trans:3.2.1
-  module: intellij.maven.server.indexer
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/archetype/archetype-common/3/archetype-common-3.jar
 - name: lib/intellij.maven.server.indexer/lib/apache.maven.core-3.8.3.jar
-  library: apache.maven.core:3.8.3
-  module: intellij.maven.server.indexer
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-core/3/maven-core-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-model/3/maven-model-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-settings/3/maven-settings-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-settings-builder/3/maven-settings-builder-3.jar
-  - name: $MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-sec-dispatcher/2/plexus-sec-dispatcher-2.jar
-  - name: $MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-cipher/2/plexus-cipher-2.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-builder-support/3/maven-builder-support-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-repository-metadata/3/maven-repository-metadata-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-artifact/3/maven-artifact-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-plugin-api/3/maven-plugin-api-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-model-builder/3/maven-model-builder-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/maven-resolver-provider/3/maven-resolver-provider-3.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-impl/1/maven-resolver-impl-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-api/1/maven-resolver-api-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-spi/1/maven-resolver-spi-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/resolver/maven-resolver-util/1/maven-resolver-util-1.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/shared/maven-shared-utils/3/maven-shared-utils-3.jar
-  - name: $MAVEN_REPOSITORY$/commons-io/commons-io/2/commons-io-2.jar
-  - name: $MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.plexus/0/org.eclipse.sisu.plexus-0.jar
-  - name: $MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1/javax.annotation-api-1.jar
-  - name: $MAVEN_REPOSITORY$/org/eclipse/sisu/org.eclipse.sisu.inject/0/org.eclipse.sisu.inject-0.jar
-  - name: $MAVEN_REPOSITORY$/com/google/inject/guice/4/guice-4.jar
-  - name: $MAVEN_REPOSITORY$/aopalliance/aopalliance/1/aopalliance-1.jar
-  - name: $MAVEN_REPOSITORY$/com/google/guava/guava/25/guava-25.jar
-  - name: $MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3/jsr305-3.jar
-  - name: $MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2/checker-compat-qual-2.jar
-  - name: $MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2/error_prone_annotations-2.jar
-  - name: $MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1/j2objc-annotations-1.jar
-  - name: $MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1/animal-sniffer-annotations-1.jar
-  - name: $MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar
-  - name: $MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-utils/3/plexus-utils-3.jar
-  - name: $MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-classworlds/2/plexus-classworlds-2.jar
-  - name: $MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-interpolation/1/plexus-interpolation-1.jar
-  - name: $MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-component-annotations/2/plexus-component-annotations-2.jar
-  - name: $MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3/commons-lang3-3.jar
-  - name: $MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1/slf4j-api-1.jar
 - name: lib/intellij.maven.server.indexer/lib/apache.maven.wagon.provider.api-3.5.2.jar
-  library: apache.maven.wagon.provider.api:3.5.2
-  module: intellij.maven.server.indexer
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/maven/wagon/wagon-provider-api/3/wagon-provider-api-3.jar
 - name: lib/maven-event-listener.jar
   modules:
   - name: intellij.maven.server.eventListener
 - name: lib/maven-indexer-api-rt.jar
-  library: jetbrains.idea.maven.indexer.api.rt
-  module: intellij.maven
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/idea/maven/maven-indexer-api-rt/2023/maven-indexer-api-rt-2023.jar
 - name: lib/maven-jps.jar
   modules:
   - name: intellij.maven.jps
@@ -79,6 +24,9 @@
   - name: intellij.idea.community.build.dependencies
   - name: intellij.maven.errorProne.compiler
   - name: intellij.maven
+    libraries:
+      plexus-archiver:
+      - name: $MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-archiver/4/plexus-archiver-4.jar
 - name: lib/maven3-server-common.jar
   modules:
   - name: intellij.maven.server.m3.common
@@ -90,9 +38,4 @@
   - name: intellij.maven.server.m36.impl
 - name: lib/maven40-server.jar
   modules:
-  - name: intellij.maven.server.m40
-- name: lib/plexus-archiver.jar
-  library: plexus-archiver
-  module: intellij.maven
-  files:
-  - name: $MAVEN_REPOSITORY$/org/codehaus/plexus/plexus-archiver/4/plexus-archiver-4.jar
+  - name: intellij.maven.server.m40

plugins/performanceTesting/core/plugin-content.yaml

@@ -1,25 +1,22 @@
-- name: lib/assertj-swing.jar
-  library: assertj-swing
-  files:
-  - name: $MAVEN_REPOSITORY$/org/assertj/assertj-swing/3/assertj-swing-3.jar
-  reason: <- intellij.performanceTesting.remoteDriver
-- name: lib/assertj.jar
-  library: assertJ
-  files:
-  - name: $MAVEN_REPOSITORY$/org/assertj/assertj-core/3/assertj-core-3.jar
-  - name: $MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1/byte-buddy-1.jar
-  reason: <- intellij.performanceTesting.remoteDriver
-- name: lib/github.oshi.core.jar
-  library: github.oshi.core
-  module: intellij.performanceTesting
-  files:
-  - name: $MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6/oshi-core-6.jar
 - name: lib/modules/intellij.performanceTesting.frontend.jar
   contentModules:
   - name: intellij.performanceTesting.frontend
 - name: lib/performanceTesting.jar
+  projectLibraries:
+  - name: assertJ
+    files:
+    - name: $MAVEN_REPOSITORY$/org/assertj/assertj-core/3/assertj-core-3.jar
+    - name: $MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1/byte-buddy-1.jar
+    reason: <- intellij.performanceTesting.remoteDriver
+  - name: assertj-swing
+    files:
+    - name: $MAVEN_REPOSITORY$/org/assertj/assertj-swing/3/assertj-swing-3.jar
+    reason: <- intellij.performanceTesting.remoteDriver
   modules:
   - name: intellij.performanceTesting
+    libraries:
+      github.oshi.core:
+      - name: $MAVEN_REPOSITORY$/com/github/oshi/oshi-core/6/oshi-core-6.jar
   contentModules:
   - name: intellij.performanceTesting.remoteDriver
   - name: intellij.performanceTesting.vcs

plugins/repository-search/plugin-content.yaml

@@ -1,23 +1,21 @@
-- name: lib/kotlinx-document-store-mvstore.jar
-  library: kotlinx-document-store-mvstore
-  files:
-  - name: $MAVEN_REPOSITORY$/com/github/lamba92/kotlinx-document-store-mvstore/0/kotlinx-document-store-mvstore-0.jar
-  - name: $MAVEN_REPOSITORY$/com/github/lamba92/kotlinx-document-store-core-jvm/0/kotlinx-document-store-core-jvm-0.jar
-  reason: <- intellij.repository.search
-- name: lib/ktor-client-logging.jar
-  library: ktor-client-logging
-  files:
-  - name: $MAVEN_REPOSITORY$/io/ktor/ktor-client-logging-jvm/3/ktor-client-logging-jvm-3.jar
-  reason: <- intellij.repository.search
-- name: lib/package-search-api-client.jar
-  library: package-search-api-client
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/packagesearch/packagesearch-api-client-jvm/3/packagesearch-api-client-jvm-3.jar
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/packagesearch/packagesearch-http-models-jvm/3/packagesearch-http-models-jvm-3.jar
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/packagesearch/packagesearch-api-models-jvm/3/packagesearch-api-models-jvm-3.jar
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/packagesearch/packagesearch-version-utils-jvm/3/packagesearch-version-utils-jvm-3.jar
-  - name: $MAVEN_REPOSITORY$/com/soywiz/korlibs/krypto/krypto-jvm/4/krypto-jvm-4.jar
-  reason: <- intellij.repository.search
 - name: lib/repository-search.jar
+  projectLibraries:
+  - name: kotlinx-document-store-mvstore
+    files:
+    - name: $MAVEN_REPOSITORY$/com/github/lamba92/kotlinx-document-store-mvstore/0/kotlinx-document-store-mvstore-0.jar
+    - name: $MAVEN_REPOSITORY$/com/github/lamba92/kotlinx-document-store-core-jvm/0/kotlinx-document-store-core-jvm-0.jar
+    reason: <- intellij.repository.search
+  - name: ktor-client-logging
+    files:
+    - name: $MAVEN_REPOSITORY$/io/ktor/ktor-client-logging-jvm/3/ktor-client-logging-jvm-3.jar
+    reason: <- intellij.repository.search
+  - name: package-search-api-client
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/packagesearch/packagesearch-api-client-jvm/3/packagesearch-api-client-jvm-3.jar
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/packagesearch/packagesearch-http-models-jvm/3/packagesearch-http-models-jvm-3.jar
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/packagesearch/packagesearch-api-models-jvm/3/packagesearch-api-models-jvm-3.jar
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/packagesearch/packagesearch-version-utils-jvm/3/packagesearch-version-utils-jvm-3.jar
+    - name: $MAVEN_REPOSITORY$/com/soywiz/korlibs/krypto/krypto-jvm/4/krypto-jvm-4.jar
+    reason: <- intellij.repository.search
   modules:
   - name: intellij.repository.search

plugins/search-everywhere-ml/plugin-content.yaml

@@ -1,11 +1,3 @@
-- name: lib/ai.grazie.emb.jar
-  library: ai.grazie.emb
-  module: intellij.searchEverywhereMl
-  files:
-  - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-emb-jvm/0/model-emb-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-text-jvm/0/model-text-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-common-jvm/0/model-common-jvm-0.jar
-  - name: $MAVEN_REPOSITORY$/ai/grazie/utils/utils-common-jvm/0/utils-common-jvm-0.jar
 - name: lib/modules/intellij.searchEverywhereMl.ranking.core.jar
   contentModules:
   - name: intellij.searchEverywhereMl.ranking.core
@@ -29,6 +21,12 @@
 - name: lib/searchEverywhereMl.jar
   modules:
   - name: intellij.searchEverywhereMl
+    libraries:
+      ai.grazie.emb:
+      - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-emb-jvm/0/model-emb-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-text-jvm/0/model-text-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/model/model-common-jvm/0/model-common-jvm-0.jar
+      - name: $MAVEN_REPOSITORY$/ai/grazie/utils/utils-common-jvm/0/utils-common-jvm-0.jar
   contentModules:
   - name: intellij.searchEverywhereMl.typos
   - name: intellij.searchEverywhereMl.ranking.ext

plugins/settings-repository/plugin-content.yaml

@@ -1,24 +1,18 @@
-- name: lib/apache.sshd.osgi.jar
-  library: apache.sshd.osgi
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/sshd/sshd-osgi/2/sshd-osgi-2.jar
-  reason: <- intellij.settingsRepository
-- name: lib/eclipse.jgit.ssh.apache.agent.jar
-  library: eclipse.jgit.ssh.apache.agent
-  module: intellij.settingsRepository
-  files:
-  - name: $MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit.ssh.apache.agent/6/org.eclipse.jgit.ssh.apache.agent-6.jar
-- name: lib/eclipse.jgit.ssh.apache.jar
-  library: eclipse.jgit.ssh.apache
-  module: intellij.settingsRepository
-  files:
-  - name: $MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit.ssh.apache/6/org.eclipse.jgit.ssh.apache-6.jar
-- name: lib/jetbrains.intellij.deps.eclipse.jgit.jar
-  library: jetbrains.intellij.deps.eclipse.jgit
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/org.eclipse.jgit/6/org.eclipse.jgit-6.jar
-  - name: $MAVEN_REPOSITORY$/com/googlecode/javaewah/JavaEWAH/1/JavaEWAH-1.jar
-  reason: <- intellij.settingsRepository
 - name: lib/settingsRepository.jar
+  projectLibraries:
+  - name: apache.sshd.osgi
+    files:
+    - name: $MAVEN_REPOSITORY$/org/apache/sshd/sshd-osgi/2/sshd-osgi-2.jar
+    reason: <- intellij.settingsRepository
+  - name: jetbrains.intellij.deps.eclipse.jgit
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/org.eclipse.jgit/6/org.eclipse.jgit-6.jar
+    - name: $MAVEN_REPOSITORY$/com/googlecode/javaewah/JavaEWAH/1/JavaEWAH-1.jar
+    reason: <- intellij.settingsRepository
   modules:
-  - name: intellij.settingsRepository
+  - name: intellij.settingsRepository
+    libraries:
+      eclipse.jgit.ssh.apache.agent:
+      - name: $MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit.ssh.apache.agent/6/org.eclipse.jgit.ssh.apache.agent-6.jar
+      eclipse.jgit.ssh.apache:
+      - name: $MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit.ssh.apache/6/org.eclipse.jgit.ssh.apache-6.jar

plugins/settings-sync/jba/plugin-content.yaml

@@ -1,15 +1,14 @@
-- name: lib/cloud-config-client.jar
-  library: cloud-config-client
-  files:
-  - name: $MAVEN_REPOSITORY$/com/jetbrains/cloudconfig/cloudconfig/2023/cloudconfig-2023.jar
-  reason: <- intellij.settingsSync
-- name: lib/jetbrains.intellij.deps.eclipse.jgit.jar
-  library: jetbrains.intellij.deps.eclipse.jgit
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/org.eclipse.jgit/6/org.eclipse.jgit-6.jar
-  - name: $MAVEN_REPOSITORY$/com/googlecode/javaewah/JavaEWAH/1/JavaEWAH-1.jar
-  reason: <- intellij.settingsSync.core
 - name: lib/settingsSync.jar
+  projectLibraries:
+  - name: cloud-config-client
+    files:
+    - name: $MAVEN_REPOSITORY$/com/jetbrains/cloudconfig/cloudconfig/2023/cloudconfig-2023.jar
+    reason: <- intellij.settingsSync
+  - name: jetbrains.intellij.deps.eclipse.jgit
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/org.eclipse.jgit/6/org.eclipse.jgit-6.jar
+    - name: $MAVEN_REPOSITORY$/com/googlecode/javaewah/JavaEWAH/1/JavaEWAH-1.jar
+    reason: <- intellij.settingsSync.core
   modules:
   - name: intellij.settingsSync
   - name: intellij.settingsSync.core

plugins/stats-collector/plugin-content.yaml

@@ -1,8 +1,6 @@
-- name: lib/completion-log-events.jar
-  library: completion-log-events
-  module: intellij.statsCollector
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0/completion-log-events-0.jar
 - name: lib/statsCollector.jar
   modules:
-  - name: intellij.statsCollector
+  - name: intellij.statsCollector
+    libraries:
+      completion-log-events:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-log-events/0/completion-log-events-0.jar

plugins/svn4idea/plugin-content.yaml

@@ -1,8 +1,8 @@
-- name: lib/sqlite.jar
-  library: sqlite
-  files:
-  - name: $MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3/sqlite-jdbc-3.jar
-  reason: <- intellij.vcs.svn
 - name: lib/vcs-svn.jar
+  projectLibraries:
+  - name: sqlite
+    files:
+    - name: $MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3/sqlite-jdbc-3.jar
+    reason: <- intellij.vcs.svn
   modules:
   - name: intellij.vcs.svn

plugins/tasks/tasks-core/plugin-content.yaml

@@ -1,37 +1,29 @@
-- name: lib/axis.jar
-  library: axis-1.4
-  module: intellij.tasks.core
-  files:
-  - name: $PROJECT_DIR$/community/plugins/tasks/tasks-core/lib/axis-1.jar
-  - name: $PROJECT_DIR$/community/plugins/tasks/tasks-core/lib/axis-jaxrpc-1.jar
-  - name: $PROJECT_DIR$/community/plugins/tasks/tasks-core/lib/wsdl4j-1.jar
-  - name: $PROJECT_DIR$/community/plugins/tasks/tasks-core/lib/axis-saaj-1.jar
-- name: lib/commons-discovery.jar
-  library: commons-discovery
-  module: intellij.tasks.core
-  files:
-  - name: $MAVEN_REPOSITORY$/commons-discovery/commons-discovery/0/commons-discovery-0.jar
-- name: lib/http-client.jar
-  library: http-client-3.1
-  module: intellij.tasks.compatibility
-  files:
-  - name: $PROJECT_DIR$/community/lib/commons-httpclient-3.jar
-- name: lib/jsonpath.jar
-  library: jsonpath
-  files:
-  - name: $MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2/json-path-2.jar
-  - name: $MAVEN_REPOSITORY$/net/minidev/json-smart/2/json-smart-2.jar
-  - name: $MAVEN_REPOSITORY$/net/minidev/accessors-smart/2/accessors-smart-2.jar
-  reason: <- intellij.tasks.core
 - name: lib/tasks-core.jar
+  projectLibraries:
+  - name: XmlRPC
+    files:
+    - name: $MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2/xmlrpc-2.jar
+    reason: <- intellij.tasks.jira
+  - name: jsonpath
+    files:
+    - name: $MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2/json-path-2.jar
+    - name: $MAVEN_REPOSITORY$/net/minidev/json-smart/2/json-smart-2.jar
+    - name: $MAVEN_REPOSITORY$/net/minidev/accessors-smart/2/accessors-smart-2.jar
+    reason: <- intellij.tasks.core
   modules:
   - name: intellij.tasks
   - name: intellij.tasks.compatibility
+    libraries:
+      http-client-3.1:
+      - name: $PROJECT_DIR$/community/lib/commons-httpclient-3.jar
   - name: intellij.tasks.jira
   - name: intellij.tasks.java
   - name: intellij.tasks.core
-- name: lib/xmlrpc.jar
-  library: XmlRPC
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2/xmlrpc-2.jar
-  reason: <- intellij.tasks.jira
+    libraries:
+      axis-1.4:
+      - name: $PROJECT_DIR$/community/plugins/tasks/tasks-core/lib/axis-1.jar
+      - name: $PROJECT_DIR$/community/plugins/tasks/tasks-core/lib/axis-jaxrpc-1.jar
+      - name: $PROJECT_DIR$/community/plugins/tasks/tasks-core/lib/wsdl4j-1.jar
+      - name: $PROJECT_DIR$/community/plugins/tasks/tasks-core/lib/axis-saaj-1.jar
+      commons-discovery:
+      - name: $MAVEN_REPOSITORY$/commons-discovery/commons-discovery/0/commons-discovery-0.jar

plugins/terminal/plugin-content.yaml

@@ -1,25 +1,18 @@
-- name: lib/completion-ranking-sh.jar
-  library: completion-ranking-sh
-  module: intellij.terminal
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-sh/0/completion-ranking-sh-0.jar
 - name: lib/modules/intellij.terminal.frontend.split.jar
   contentModules:
   - name: intellij.terminal.frontend.split
-- name: lib/terminal-completion-db-with-extensions.jar
-  library: terminal-completion-db-with-extensions
-  module: intellij.terminal
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/terminal/completion-db-with-extensions/0/completion-db-with-extensions-0.jar
-- name: lib/terminal-completion-spec.jar
-  library: terminal-completion-spec
-  module: intellij.terminal.completion
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/terminal/completion-spec/0/completion-spec-0.jar
 - name: lib/terminal.jar
   modules:
   - name: intellij.terminal
+    libraries:
+      terminal-completion-db-with-extensions:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/terminal/completion-db-with-extensions/0/completion-db-with-extensions-0.jar
+      completion-ranking-sh:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-sh/0/completion-ranking-sh-0.jar
   - name: intellij.terminal.completion
+    libraries:
+      terminal-completion-spec:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/terminal/completion-spec/0/completion-spec-0.jar
   contentModules:
   - name: intellij.terminal.backend
   - name: intellij.terminal.frontend

plugins/testng/plugin-content.yaml

@@ -5,9 +5,10 @@
   modules:
   - name: intellij.testng.rt
 - name: lib/testng.jar
-  library: TestNG
-  files:
-  - name: $MAVEN_REPOSITORY$/org/testng/testng/7/testng-7.jar
-  - name: $MAVEN_REPOSITORY$/com/beust/jcommander/1/jcommander-1.jar
-  - name: $MAVEN_REPOSITORY$/org/webjars/jquery/3/jquery-3.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: TestNG
+    files:
+    - name: $MAVEN_REPOSITORY$/org/testng/testng/7/testng-7.jar
+    - name: $MAVEN_REPOSITORY$/com/beust/jcommander/1/jcommander-1.jar
+    - name: $MAVEN_REPOSITORY$/org/webjars/jquery/3/jquery-3.jar
+    reason: withProjectLibrary

plugins/textmate/plugin-content.yaml

@@ -1,10 +1,10 @@
-- name: lib/joni.jar
-  library: joni
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jruby/joni/joni/2/joni-2.jar
-  - name: $MAVEN_REPOSITORY$/org/jruby/jcodings/jcodings/1/jcodings-1.jar
-  reason: <- intellij.textmate.joni
 - name: lib/textmate.jar
+  projectLibraries:
+  - name: joni
+    files:
+    - name: $MAVEN_REPOSITORY$/org/jruby/joni/joni/2/joni-2.jar
+    - name: $MAVEN_REPOSITORY$/org/jruby/jcodings/jcodings/1/jcodings-1.jar
+    reason: <- intellij.textmate.joni
   modules:
   - name: intellij.textmate
   - name: intellij.textmate.core

plugins/webp/plugin-content.yaml

@@ -1,8 +1,6 @@
-- name: lib/libwebp.jar.jar
-  library: libwebp.jar
-  module: intellij.webp
-  files:
-  - name: $PROJECT_DIR$/community/plugins/webp/lib/libwebp.jar
 - name: lib/webp.jar
   modules:
-  - name: intellij.webp
+  - name: intellij.webp
+    libraries:
+      libwebp.jar:
+      - name: $PROJECT_DIR$/community/plugins/webp/lib/libwebp.jar

plugins/xslt-debugger/plugin-content.yaml

@@ -1,28 +1,8 @@
 - name: lib/rmi-stubs.jar
-  library: RMI Stubs
-  module: intellij.xslt.debugger.rt
-  files:
-  - name: $PROJECT_DIR$/community/plugins/xslt-debugger/engine/lib/rmi-stubs.jar
 - name: lib/rt/saxon.jar
-  library: Saxon-6.5.5
-  module: intellij.xslt.debugger.impl.rt
-  files:
-  - name: $PROJECT_DIR$/community/plugins/xslt-debugger/engine/impl/lib/saxon.jar
 - name: lib/rt/saxon9he.jar
-  library: Saxon-9HE
-  module: intellij.xslt.debugger.impl.rt
-  files:
-  - name: $PROJECT_DIR$/community/plugins/xslt-debugger/engine/impl/lib/saxon9he.jar
 - name: lib/rt/serializer-2.7.3.jar
-  library: Serializer-2.7.3
-  module: intellij.xslt.debugger.impl.rt
-  files:
-  - name: $MAVEN_REPOSITORY$/xalan/serializer/2/serializer-2.jar
 - name: lib/rt/xalan-2.7.3.jar
-  library: Xalan-2.7.3
-  module: intellij.xslt.debugger.impl.rt
-  files:
-  - name: $MAVEN_REPOSITORY$/xalan/xalan/2/xalan-2.jar
 - name: lib/rt/xslt-debugger-impl-rt.jar
   modules:
   - name: intellij.xslt.debugger.impl.rt

python/pluginCore/plugin-content.yaml

@@ -1,38 +1,37 @@
-- name: lib/completion-ranking-python-with-full-line.jar
-  library: completion-ranking-python-with-full-line
-  module: intellij.python.community.impl
-  files:
-  - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-python-with-full-line/0/completion-ranking-python-with-full-line-0.jar
-- name: lib/io.github.z4kn4fein.semver.jvm.jar
-  library: io.github.z4kn4fein.semver.jvm
-  files:
-  - name: $MAVEN_REPOSITORY$/io/github/z4kn4fein/semver-jvm/2/semver-jvm-2.jar
-  reason: <- intellij.python.community.impl
-- name: lib/jetbrains.ml.models.python.imports.ranking.model.jar
-  library: jetbrains.ml.models.python.imports.ranking.model
-  files:
-  - name: $MAVEN_REPOSITORY$/com/jetbrains/ml/models/python-imports-ranking-model/nebulous-albatross/python-imports-ranking-model-nebulous-albatross.jar
-  reason: <- intellij.python.ml.features
-- name: lib/jsr305.jar
-  library: jsr305
-  files:
-  - name: $MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3/jsr305-3.jar
-  reason: <- intellij.python.community.impl
 - name: lib/libthrift.jar
-  library: libthrift
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/thrift/libthrift/0/libthrift-0.jar
-  reason: withProjectLibrary
-- name: lib/ml-completion-prev-exprs-models.jar
-  library: ml-completion-prev-exprs-models
-  module: intellij.python.community.impl
-  files:
-  - name: $MAVEN_REPOSITORY$/completion/ml/python/features/ml-completion-prev-exprs-models/1/ml-completion-prev-exprs-models-1.jar
+  projectLibraries:
+  - name: libthrift
+    files:
+    - name: $MAVEN_REPOSITORY$/org/apache/thrift/libthrift/0/libthrift-0.jar
+    reason: withProjectLibrary
 - name: lib/python-ce.jar
+  projectLibraries:
+  - name: io.github.z4kn4fein.semver.jvm
+    files:
+    - name: $MAVEN_REPOSITORY$/io/github/z4kn4fein/semver-jvm/2/semver-jvm-2.jar
+    reason: <- intellij.python.community.impl
+  - name: jetbrains.ml.models.python.imports.ranking.model
+    files:
+    - name: $MAVEN_REPOSITORY$/com/jetbrains/ml/models/python-imports-ranking-model/nebulous-albatross/python-imports-ranking-model-nebulous-albatross.jar
+    reason: <- intellij.python.ml.features
+  - name: jsr305
+    files:
+    - name: $MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3/jsr305-3.jar
+    reason: <- intellij.python.community.impl
+  - name: tuweni-toml
+    files:
+    - name: $MAVEN_REPOSITORY$/org/apache/tuweni/tuweni-toml/2/tuweni-toml-2.jar
+    - name: $MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4/antlr4-runtime-4.jar
+    reason: <- intellij.python.community.impl
   modules:
   - name: intellij.python.community
   - name: intellij.python.community.core.impl
   - name: intellij.python.community.impl
+    libraries:
+      ml-completion-prev-exprs-models:
+      - name: $MAVEN_REPOSITORY$/completion/ml/python/features/ml-completion-prev-exprs-models/1/ml-completion-prev-exprs-models-1.jar
+      completion-ranking-python-with-full-line:
+      - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/completion/completion-ranking-python-with-full-line/0/completion-ranking-python-with-full-line-0.jar
   - name: intellij.python.community.impl.poetry
   - name: intellij.python.community.impl.installer
   - name: intellij.python.community.impl.venv
@@ -68,14 +67,9 @@
   - name: intellij.python.ast
   - name: intellij.python.syntax
   - name: intellij.python.syntax.core
-- name: lib/tuweni-toml.jar
-  library: tuweni-toml
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/tuweni/tuweni-toml/2/tuweni-toml-2.jar
-  - name: $MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4/antlr4-runtime-4.jar
-  reason: <- intellij.python.community.impl
 - name: lib/xmlrpc.jar
-  library: XmlRPC
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2/xmlrpc-2.jar
-  reason: withProjectLibrary
+  projectLibraries:
+  - name: XmlRPC
+    files:
+    - name: $MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2/xmlrpc-2.jar
+    reason: withProjectLibrary