From ace5ff3c8e04834ee6ef5d835d4dcb570aa39247 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 2 Apr 2025 16:27:58 +0200 Subject: [PATCH] IJ-CR-146078 IJPL-181726 more compact presentation of libs in content report GitOrigin-RevId: d4c3319240c4c9a868efcc4984839d013764e168 --- java/plugin/plugin-content.yaml | 107 ++++---- .../ProjectStructureMapping.kt | 94 +++++-- platform/testFramework/ui/plugin-content.yaml | 37 ++- plugins/coverage/plugin-content.yaml | 10 + .../intellij.devkit/plugin-content.yaml | 11 +- plugins/editorconfig/plugin-content.yaml | 11 +- plugins/gradle/plugin-content.yaml | 243 ++++++++---------- plugins/jsonpath/plugin-content.yaml | 15 +- plugins/kotlin/plugin/plugin-content.yaml | 186 ++++++-------- .../scripting-plugin/plugin-content.yaml | 18 +- plugins/maven-model/plugin-content.yaml | 11 +- plugins/maven/plugin-content.yaml | 55 ++++ plugins/svn4idea/plugin-content.yaml | 11 +- plugins/testng/plugin-content.yaml | 13 +- plugins/textmate/plugin-content.yaml | 13 +- plugins/xslt-debugger/plugin-content.yaml | 20 ++ python/pluginCore/plugin-content.yaml | 18 +- 17 files changed, 500 insertions(+), 373 deletions(-) diff --git a/java/plugin/plugin-content.yaml b/java/plugin/plugin-content.yaml index 6f11b796e2dd..19f73d4aa597 100644 --- a/java/plugin/plugin-content.yaml +++ b/java/plugin/plugin-content.yaml @@ -2,12 +2,15 @@ modules: - name: intellij.java.aetherDependencyResolver - 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 - projectLibraries: - - name: Eclipse - files: - - name: $PROJECT_DIR$/community/lib/ecj-4.jar - reason: withProjectLibrary + library: Eclipse + files: + - name: $PROJECT_DIR$/community/lib/ecj-4.jar + reason: withProjectLibrary - name: lib/frontend-split/java-frontend.jar modules: - name: intellij.java.frontend @@ -19,11 +22,6 @@ - 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 @@ -78,6 +76,10 @@ - name: intellij.java.performancePlugin - name: intellij.java.terminal - name: intellij.java.debugger.impl.backend + 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/javac2.jar modules: - name: intellij.java.compiler.antTasks @@ -85,17 +87,15 @@ - name: intellij.java.compiler.instrumentationUtil - name: intellij.java.compiler.instrumentationUtil.java8 - name: lib/jb-jdi.jar - projectLibraries: - - name: jb-jdi - files: - - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2/jb-jdi-2.jar - reason: withProjectLibrary + library: jb-jdi + files: + - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/jb-jdi/2/jb-jdi-2.jar + reason: withProjectLibrary - name: lib/jgoodies-common.jar - projectLibraries: - - name: jgoodies-common - files: - - name: $MAVEN_REPOSITORY$/com/jgoodies/jgoodies-common/1/jgoodies-common-1.jar - reason: withProjectLibrary + library: 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 @@ -106,27 +106,41 @@ qdox-java-parser: - name: $MAVEN_REPOSITORY$/com/thoughtworks/qdox/qdox/2/qdox-2.jar - name: lib/jps-javac-extension.jar - projectLibraries: - - name: jps-javac-extension - files: - - name: $MAVEN_REPOSITORY$/org/jetbrains/jps/jps-javac-extension/10/jps-javac-extension-10.jar - reason: withProjectLibrary + library: 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 - projectLibraries: - - name: kotlin-metadata - files: - - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-metadata-jvm/2/kotlin-metadata-jvm-2.jar - reason: withProjectLibrary + library: 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 @@ -146,17 +160,24 @@ contentModules: - name: intellij.jvm.analysis.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 - 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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/projectStructureMapping/ProjectStructureMapping.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/projectStructureMapping/ProjectStructureMapping.kt index f40aaae73c68..bd81df686390 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/projectStructureMapping/ProjectStructureMapping.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/projectStructureMapping/ProjectStructureMapping.kt @@ -1,4 +1,6 @@ // 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 @@ -55,16 +57,24 @@ private fun buildPluginContentReport(pluginToEntries: List, + fileEntries: List, buildPaths: BuildPaths, fieldName: String = "modules", writeReason: Boolean = true, + reasonFilter: (ModuleOutputEntry) -> Boolean = { true }, ) { var opened = false for (entry in fileEntries) { - if (entry !is ModuleOutputEntry) { + if (entry !is ModuleOutputEntry || !reasonFilter(entry)) { continue } @@ -201,11 +212,15 @@ private fun writeModuleItem(writer: JsonGenerator, entry: ModuleOutputEntry, wri } } -private fun writeModuleLibraries(fileEntries: Sequence, moduleName: String, writer: JsonGenerator, buildPaths: BuildPaths) { - val entriesGroupedByLibraryName = fileEntries - .filterIsInstance() - .filter { it.moduleName == moduleName } - .groupBy { it.libraryName } +private fun writeModuleLibraries(fileEntries: List, moduleName: String, writer: JsonGenerator, buildPaths: BuildPaths) { + val entriesGroupedByLibraryName = LinkedHashMap>() + for (entry in fileEntries) { + if (entry is ModuleLibraryFileEntry) { + if (entry.moduleName == moduleName) { + entriesGroupedByLibraryName.computeIfAbsent(entry.libraryName) { ArrayList() }.add(entry) + } + } + } if (entriesGroupedByLibraryName.isEmpty()) { return @@ -213,19 +228,46 @@ private fun writeModuleLibraries(fileEntries: Sequence, m writer.writeObjectFieldStart("libraries") for ((libName, entries) in entriesGroupedByLibraryName) { - 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() + writeFiles(writer = writer, entries = entries, buildPaths = buildPaths, arrayFieldName = libName) } writer.writeEndObject() } -private fun writeProjectLibs(entries: List, writer: JsonGenerator, buildPaths: BuildPaths) { +private fun writeSeparatePackedModuleLibrary(fileEntries: List, writer: JsonGenerator, buildPaths: BuildPaths) { + val entriesGroupedByLibraryName = LinkedHashMap>() + 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, + 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, writer: JsonGenerator, buildPaths: BuildPaths, isInner: Boolean) { // group by library val map = TreeMap> { o1, o2 -> o1.libraryName.compareTo(o2.libraryName) @@ -240,6 +282,14 @@ private fun writeProjectLibs(entries: List, 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() diff --git a/platform/testFramework/ui/plugin-content.yaml b/platform/testFramework/ui/plugin-content.yaml index eff2be859661..9a983e52a5c8 100644 --- a/platform/testFramework/ui/plugin-content.yaml +++ b/platform/testFramework/ui/plugin-content.yaml @@ -1,12 +1,37 @@ - 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 - 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 + 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 - name: lib/platform-testFramework-ui.jar modules: - name: intellij.platform.testFramework.ui \ No newline at end of file diff --git a/plugins/coverage/plugin-content.yaml b/plugins/coverage/plugin-content.yaml index a24baa2f7e7b..defa53bb4b59 100644 --- a/plugins/coverage/plugin-content.yaml +++ b/plugins/coverage/plugin-content.yaml @@ -1,4 +1,14 @@ - 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 diff --git a/plugins/devkit/intellij.devkit/plugin-content.yaml b/plugins/devkit/intellij.devkit/plugin-content.yaml index dfbfdb1791ed..42fbd71d584f 100644 --- a/plugins/devkit/intellij.devkit/plugin-content.yaml +++ b/plugins/devkit/intellij.devkit/plugin-content.yaml @@ -5,11 +5,6 @@ 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: @@ -30,4 +25,8 @@ - name: intellij.devkit.debugger - name: intellij.devkit.stacktrace - name: intellij.devkit.apiDump - - name: intellij.devkit.apiDump.lang \ No newline at end of file + - name: intellij.devkit.apiDump.lang + 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 \ No newline at end of file diff --git a/plugins/editorconfig/plugin-content.yaml b/plugins/editorconfig/plugin-content.yaml index eff811b1b2ba..a9dfa42f7287 100644 --- a/plugins/editorconfig/plugin-content.yaml +++ b/plugins/editorconfig/plugin-content.yaml @@ -1,8 +1,7 @@ - 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 \ No newline at end of file + - name: intellij.editorconfig.plugin + library: ec4j-core + files: + - name: $MAVEN_REPOSITORY$/org/ec4j/core/ec4j-core/0/ec4j-core-0.jar + reason: <- intellij.editorconfig.plugin \ No newline at end of file diff --git a/plugins/gradle/plugin-content.yaml b/plugins/gradle/plugin-content.yaml index fc584f075a00..076be1fdef80 100644 --- a/plugins/gradle/plugin-content.yaml +++ b/plugins/gradle/plugin-content.yaml @@ -1,165 +1,138 @@ - name: lib/ant/ant-antlr.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-antlr.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-antlr.jar + reason: withProjectLibrary - name: lib/ant/ant-apache-bcel.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-bcel.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-bcel.jar + reason: withProjectLibrary - name: lib/ant/ant-apache-bsf.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-bsf.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-bsf.jar + reason: withProjectLibrary - name: lib/ant/ant-apache-log4j.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-log4j.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-log4j.jar + reason: withProjectLibrary - name: lib/ant/ant-apache-oro.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-oro.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-oro.jar + reason: withProjectLibrary - name: lib/ant/ant-apache-regexp.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-regexp.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-regexp.jar + reason: withProjectLibrary - name: lib/ant/ant-apache-resolver.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-resolver.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-resolver.jar + reason: withProjectLibrary - name: lib/ant/ant-apache-xalan2.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-xalan2.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-apache-xalan2.jar + reason: withProjectLibrary - name: lib/ant/ant-commons-logging.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-commons-logging.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-commons-logging.jar + reason: withProjectLibrary - name: lib/ant/ant-commons-net.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-commons-net.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-commons-net.jar + reason: withProjectLibrary - name: lib/ant/ant-imageio.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-imageio.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-imageio.jar + reason: withProjectLibrary - name: lib/ant/ant-jai.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jai.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jai.jar + reason: withProjectLibrary - name: lib/ant/ant-jakartamail.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jakartamail.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jakartamail.jar + reason: withProjectLibrary - name: lib/ant/ant-javamail.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-javamail.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-javamail.jar + reason: withProjectLibrary - name: lib/ant/ant-jdepend.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jdepend.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jdepend.jar + reason: withProjectLibrary - name: lib/ant/ant-jmf.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jmf.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jmf.jar + reason: withProjectLibrary - name: lib/ant/ant-jsch.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jsch.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-jsch.jar + reason: withProjectLibrary - name: lib/ant/ant-junit.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junit.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junit.jar + reason: withProjectLibrary - name: lib/ant/ant-junit4.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junit4.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junit4.jar + reason: withProjectLibrary - name: lib/ant/ant-junitlauncher.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junitlauncher.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-junitlauncher.jar + reason: withProjectLibrary - name: lib/ant/ant-launcher.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-launcher.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-launcher.jar + reason: withProjectLibrary - name: lib/ant/ant-netrexx.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-netrexx.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-netrexx.jar + reason: withProjectLibrary - name: lib/ant/ant-swing.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-swing.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-swing.jar + reason: withProjectLibrary - name: lib/ant/ant-testutil.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-testutil.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-testutil.jar + reason: withProjectLibrary - name: lib/ant/ant-xz.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant-xz.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant-xz.jar + reason: withProjectLibrary - name: lib/ant/ant.jar - projectLibraries: - - name: Ant - files: - - name: $PROJECT_DIR$/community/lib/ant/lib/ant.jar - reason: withProjectLibrary + library: Ant + files: + - name: $PROJECT_DIR$/community/lib/ant/lib/ant.jar + reason: withProjectLibrary - name: lib/gradle-api-8.13.jar - projectLibraries: - - name: Gradle - files: - - name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/gradle-api/8/gradle-api-8.jar - reason: withProjectLibrary + library: 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 diff --git a/plugins/jsonpath/plugin-content.yaml b/plugins/jsonpath/plugin-content.yaml index 7b9fe4103d68..ca675a5b081b 100644 --- a/plugins/jsonpath/plugin-content.yaml +++ b/plugins/jsonpath/plugin-content.yaml @@ -1,10 +1,9 @@ - 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 \ No newline at end of file + - 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 \ No newline at end of file diff --git a/plugins/kotlin/plugin/plugin-content.yaml b/plugins/kotlin/plugin/plugin-content.yaml index 9cfe2a7166ef..af33a4b2f2f4 100644 --- a/plugins/kotlin/plugin/plugin-content.yaml +++ b/plugins/kotlin/plugin/plugin-content.yaml @@ -2,23 +2,20 @@ modules: - name: kotlin.frontend - name: lib/jackson-dataformat-toml.jar - projectLibraries: - - name: jackson-dataformat-toml - files: - - name: $MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2/jackson-dataformat-toml-2.jar - reason: withProjectLibrary + library: 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 - projectLibraries: - - name: javax-inject - files: - - name: $MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar - reason: withProjectLibrary + library: javax-inject + files: + - name: $MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar + reason: withProjectLibrary - name: lib/jps/kotlin-jps-plugin.jar - 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 + 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 - name: lib/kotlin-base-jps.jar modules: - name: kotlin.base.jps @@ -290,106 +287,93 @@ - name: kotlin-ultimate.profiler - name: kotlin.plugin - name: lib/kotlinc.allopen-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.android-extensions-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.assignment-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.compose-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.js-plain-objects-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.kotlin-compiler-common.jar - 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 + 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 - name: lib/kotlinc.kotlin-compiler-fe10.jar - 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 + 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 - name: lib/kotlinc.kotlin-compiler-ir.jar - 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 + 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 - name: lib/kotlinc.kotlin-dataframe-compiler-plugin.jar - projectLibraries: - - name: kotlinc.kotlin-dataframe-compiler-plugin - files: - - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dataframe-compiler-plugin-for-ide/2/kotlin-dataframe-compiler-plugin-for-ide-2.jar - reason: withProjectLibrary + library: kotlinc.kotlin-dataframe-compiler-plugin + files: + - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dataframe-compiler-plugin-for-ide/2/kotlin-dataframe-compiler-plugin-for-ide-2.jar + reason: withProjectLibrary - name: lib/kotlinc.kotlin-jps-common.jar - 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 + 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 - name: lib/kotlinc.kotlinx-serialization-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.lombok-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.noarg-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.parcelize-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.sam-with-receiver-compiler-plugin.jar - 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 + 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 - name: lib/kotlinc.scripting-compiler-plugin.jar - 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 + 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 - 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 - 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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/plugins/kotlin/scripting-plugin/plugin-content.yaml b/plugins/kotlin/scripting-plugin/plugin-content.yaml index 4c0d9a743f05..239823712509 100644 --- a/plugins/kotlin/scripting-plugin/plugin-content.yaml +++ b/plugins/kotlin/scripting-plugin/plugin-content.yaml @@ -10,14 +10,12 @@ - name: kotlin.jsr223 - name: kotlin.scripting-plugin - name: lib/kotlinc.kotlin-compiler-common.jar - 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 + 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 - name: lib/kotlinc.kotlin-compiler-fe10.jar - 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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/plugins/maven-model/plugin-content.yaml b/plugins/maven-model/plugin-content.yaml index 3b30d9cdf684..21bd10555164 100644 --- a/plugins/maven-model/plugin-content.yaml +++ b/plugins/maven-model/plugin-content.yaml @@ -1,8 +1,7 @@ - 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 \ No newline at end of file + - name: intellij.maven.model + library: jetbrains-annotations-java5 + files: + - name: $MAVEN_REPOSITORY$/org/jetbrains/annotations-java5/24/annotations-java5-24.jar + reason: <- intellij.maven.model \ No newline at end of file diff --git a/plugins/maven/plugin-content.yaml b/plugins/maven/plugin-content.yaml index d71fba6fb6be..2b2b56fd773a 100644 --- a/plugins/maven/plugin-content.yaml +++ b/plugins/maven/plugin-content.yaml @@ -3,13 +3,68 @@ - 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 diff --git a/plugins/svn4idea/plugin-content.yaml b/plugins/svn4idea/plugin-content.yaml index 353034439684..a26bf97940d7 100644 --- a/plugins/svn4idea/plugin-content.yaml +++ b/plugins/svn4idea/plugin-content.yaml @@ -1,8 +1,7 @@ - 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 \ No newline at end of file + - name: intellij.vcs.svn + library: sqlite + files: + - name: $MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3/sqlite-jdbc-3.jar + reason: <- intellij.vcs.svn \ No newline at end of file diff --git a/plugins/testng/plugin-content.yaml b/plugins/testng/plugin-content.yaml index 37194704951a..a45b661ec274 100644 --- a/plugins/testng/plugin-content.yaml +++ b/plugins/testng/plugin-content.yaml @@ -5,10 +5,9 @@ modules: - name: intellij.testng.rt - name: lib/testng.jar - 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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/plugins/textmate/plugin-content.yaml b/plugins/textmate/plugin-content.yaml index 579b4dfdeda6..99fd8a256021 100644 --- a/plugins/textmate/plugin-content.yaml +++ b/plugins/textmate/plugin-content.yaml @@ -1,13 +1,12 @@ - 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 reason: <- intellij.textmate - name: intellij.textmate.joni - reason: <- intellij.textmate \ No newline at end of file + reason: <- intellij.textmate + 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 \ No newline at end of file diff --git a/plugins/xslt-debugger/plugin-content.yaml b/plugins/xslt-debugger/plugin-content.yaml index a4deb389c1ba..e1fb213aea2c 100644 --- a/plugins/xslt-debugger/plugin-content.yaml +++ b/plugins/xslt-debugger/plugin-content.yaml @@ -1,8 +1,28 @@ - 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 diff --git a/python/pluginCore/plugin-content.yaml b/python/pluginCore/plugin-content.yaml index 89c004a17e86..676848d13db8 100644 --- a/python/pluginCore/plugin-content.yaml +++ b/python/pluginCore/plugin-content.yaml @@ -1,9 +1,8 @@ - name: lib/libthrift.jar - projectLibraries: - - name: libthrift - files: - - name: $MAVEN_REPOSITORY$/org/apache/thrift/libthrift/0/libthrift-0.jar - reason: withProjectLibrary + library: 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 @@ -68,8 +67,7 @@ - name: intellij.python.syntax - name: intellij.python.syntax.core - name: lib/xmlrpc.jar - projectLibraries: - - name: XmlRPC - files: - - name: $MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2/xmlrpc-2.jar - reason: withProjectLibrary \ No newline at end of file + library: XmlRPC + files: + - name: $MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2/xmlrpc-2.jar + reason: withProjectLibrary \ No newline at end of file