diff --git a/.idea/modules.xml b/.idea/modules.xml index 6841771073d3..aad58607d8e7 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -643,6 +643,12 @@ + + + + + + @@ -650,6 +656,7 @@ + diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index af7613871a39..a0eb0b43cfc0 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -354,7 +354,13 @@ libraries/guava libraries/hamcrest libraries/hamcrest-more-matchers libraries/hash4j +libraries/icu4j libraries/io +libraries/ion +libraries/jackson/databind +libraries/jackson/jackson +libraries/jackson/jr-objects +libraries/jackson/module-kotlin libraries/junit4 libraries/junit5 libraries/junit5-launcher @@ -362,6 +368,7 @@ libraries/junit5-params libraries/junit5-pioneer libraries/kotlin-test libraries/kotlin-test-assertions-core-jvm +libraries/kotlinx/coroutines/slf4j libraries/kotlinx/serialization/core libraries/kotlinx/serialization/json libraries/ktor/client diff --git a/build/tasks/BUILD.bazel b/build/tasks/BUILD.bazel index dc97de65a065..6ae9b65f362f 100644 --- a/build/tasks/BUILD.bazel +++ b/build/tasks/BUILD.bazel @@ -15,8 +15,8 @@ jvm_library( "@lib//:fastutil-min", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", - "@lib//:jackson-jr-objects", - "@lib//:jackson", + "//libraries/jackson/jr-objects:libraries-jackson-jr-objects", + "//libraries/jackson/jackson", "@lib//:kotlinx-coroutines-core", "//platform/util/rt-java8", "//java/java-runtime:rt", @@ -53,8 +53,8 @@ jvm_library( "@lib//:fastutil-min", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", - "@lib//:jackson-jr-objects", - "@lib//:jackson", + "//libraries/jackson/jr-objects:libraries-jackson-jr-objects", + "//libraries/jackson/jackson", "@lib//:kotlinx-coroutines-core", "//platform/util/rt-java8", "//java/java-runtime:rt", diff --git a/build/tasks/intellij.idea.community.build.tasks.iml b/build/tasks/intellij.idea.community.build.tasks.iml index ac90a9d505e3..dea454b2df8a 100644 --- a/build/tasks/intellij.idea.community.build.tasks.iml +++ b/build/tasks/intellij.idea.community.build.tasks.iml @@ -38,8 +38,8 @@ - - + + diff --git a/java/compiler/impl/BUILD.bazel b/java/compiler/impl/BUILD.bazel index 8f2311845c36..2855cfe946c6 100644 --- a/java/compiler/impl/BUILD.bazel +++ b/java/compiler/impl/BUILD.bazel @@ -63,8 +63,8 @@ jvm_library( "@lib//:jps-javac-extension", "@lib//:netty-buffer", "@lib//:winp", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "@lib//:kotlinx-coroutines-core", "@lib//:kotlin-reflect", "@lib//:kryo5", diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml index 6a380a41e05d..0d9c9c42654e 100644 --- a/java/compiler/impl/intellij.java.compiler.impl.iml +++ b/java/compiler/impl/intellij.java.compiler.impl.iml @@ -63,8 +63,8 @@ - - + + diff --git a/java/execution/impl/BUILD.bazel b/java/execution/impl/BUILD.bazel index 244a4a85a7e1..877471c90aec 100644 --- a/java/execution/impl/BUILD.bazel +++ b/java/execution/impl/BUILD.bazel @@ -41,12 +41,12 @@ jvm_library( "//platform/external-system-api:externalSystem", "//platform/external-system-impl:externalSystem-impl", "//libraries/gson", - "@lib//:jackson", + "//libraries/jackson/jackson", "@lib//:miglayout-swing", "//platform/vcs-impl", "//platform/vcs-impl/lang", "//platform/util/nanoxml", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "//platform/xdebugger-impl:debugger-impl", "@lib//:fastutil-min", "//platform/statistics", diff --git a/java/execution/impl/intellij.java.execution.impl.iml b/java/execution/impl/intellij.java.execution.impl.iml index d3ad41667d0c..9b931e79efb8 100644 --- a/java/execution/impl/intellij.java.execution.impl.iml +++ b/java/execution/impl/intellij.java.execution.impl.iml @@ -35,12 +35,12 @@ - + - + diff --git a/java/idea-ui/BUILD.bazel b/java/idea-ui/BUILD.bazel index bd2325d5c35d..ff54c4a48547 100644 --- a/java/idea-ui/BUILD.bazel +++ b/java/idea-ui/BUILD.bazel @@ -63,8 +63,8 @@ jvm_library( "@lib//:slf4j-api", "//xml/xml-psi-api:psi", "@lib//:asm", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", ] ) ### auto-generated section `build intellij.java.ui` end diff --git a/java/idea-ui/intellij.java.ui.iml b/java/idea-ui/intellij.java.ui.iml index 35f02fbfcb7d..0678eeab4f61 100644 --- a/java/idea-ui/intellij.java.ui.iml +++ b/java/idea-ui/intellij.java.ui.iml @@ -58,7 +58,7 @@ - - + + \ No newline at end of file diff --git a/java/java-analysis-impl/BUILD.bazel b/java/java-analysis-impl/BUILD.bazel index d05498d85064..3ea47893c731 100644 --- a/java/java-analysis-impl/BUILD.bazel +++ b/java/java-analysis-impl/BUILD.bazel @@ -46,7 +46,7 @@ jvm_library( "//platform/util:util-ui", "@lib//:fastutil-min", "//platform/workspace/storage", - "@lib//:icu4j", + "//libraries/icu4j", "//platform/util/jdom", "//platform/workspace/jps", "//platform/backend/workspace", diff --git a/java/java-analysis-impl/intellij.java.analysis.impl.iml b/java/java-analysis-impl/intellij.java.analysis.impl.iml index 381114f22117..e16ac6472aa0 100644 --- a/java/java-analysis-impl/intellij.java.analysis.impl.iml +++ b/java/java-analysis-impl/intellij.java.analysis.impl.iml @@ -49,7 +49,7 @@ - + diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel index 981a8e0a7423..c9cf97ff5b7e 100644 --- a/java/java-tests/BUILD.bazel +++ b/java/java-tests/BUILD.bazel @@ -106,9 +106,9 @@ jvm_library( "//plugins/coverage", "//plugins/coverage:coverage_test_lib", "//platform/workspace/jps", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:stream_ex", "@lib//:kotlinx-coroutines-core", "//platform/statistics", diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml index f715006835b8..a34c56bdf150 100644 --- a/java/java-tests/intellij.java.tests.iml +++ b/java/java-tests/intellij.java.tests.iml @@ -83,9 +83,9 @@ - - - + + + diff --git a/json/backend/BUILD.bazel b/json/backend/BUILD.bazel index 7cc4e6718b6c..8e08e8123f16 100644 --- a/json/backend/BUILD.bazel +++ b/json/backend/BUILD.bazel @@ -41,15 +41,15 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/platform-util-io:ide-util-io", "@lib//:kotlinx-coroutines-core", - "@lib//:jackson-databind", - "@lib//:jackson", + "//libraries/jackson/databind", + "//libraries/jackson/jackson", "@lib//:jackson-dataformat-yaml", "@lib//:jetbrains-markdown", "//libraries/caffeine", "@lib//:stream_ex", "@lib//:kotlinx-collections-immutable", "//json", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//json/syntax", "//platform/syntax/syntax-psi:psi", "//platform/syntax/syntax-util:util", diff --git a/json/backend/intellij.json.backend.iml b/json/backend/intellij.json.backend.iml index f618f17c18b9..f734f5918868 100644 --- a/json/backend/intellij.json.backend.iml +++ b/json/backend/intellij.json.backend.iml @@ -37,15 +37,15 @@ - - + + - + diff --git a/libraries/aalto-xml/intellij.libraries.aalto.xml.iml b/libraries/aalto-xml/intellij.libraries.aalto.xml.iml index bb28bf07a9f8..36c491c97688 100644 --- a/libraries/aalto-xml/intellij.libraries.aalto.xml.iml +++ b/libraries/aalto-xml/intellij.libraries.aalto.xml.iml @@ -9,4 +9,4 @@ - + \ No newline at end of file diff --git a/libraries/caffeine/intellij.libraries.caffeine.iml b/libraries/caffeine/intellij.libraries.caffeine.iml index ed21bdfffd15..8eb500910b9e 100644 --- a/libraries/caffeine/intellij.libraries.caffeine.iml +++ b/libraries/caffeine/intellij.libraries.caffeine.iml @@ -9,4 +9,4 @@ - + \ No newline at end of file diff --git a/libraries/gson/intellij.libraries.gson.iml b/libraries/gson/intellij.libraries.gson.iml index 7f616ce81ab0..f23e5c426083 100644 --- a/libraries/gson/intellij.libraries.gson.iml +++ b/libraries/gson/intellij.libraries.gson.iml @@ -9,4 +9,4 @@ - + \ No newline at end of file diff --git a/libraries/icu4j/BUILD.bazel b/libraries/icu4j/BUILD.bazel new file mode 100644 index 000000000000..ca328b64d9cb --- /dev/null +++ b/libraries/icu4j/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.icu4j` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "icu4j_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "icu4j", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":icu4j_resources"], + exports = ["@lib//:icu4j"], + runtime_deps = ["@lib//:icu4j"] +) +### auto-generated section `build intellij.libraries.icu4j` end \ No newline at end of file diff --git a/libraries/icu4j/intellij.libraries.icu4j.iml b/libraries/icu4j/intellij.libraries.icu4j.iml new file mode 100644 index 000000000000..ff12d34f6682 --- /dev/null +++ b/libraries/icu4j/intellij.libraries.icu4j.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/icu4j/resources/intellij.libraries.icu4j.xml b/libraries/icu4j/resources/intellij.libraries.icu4j.xml new file mode 100644 index 000000000000..164f46cfcfb2 --- /dev/null +++ b/libraries/icu4j/resources/intellij.libraries.icu4j.xml @@ -0,0 +1,2 @@ + + diff --git a/libraries/ion/BUILD.bazel b/libraries/ion/BUILD.bazel new file mode 100644 index 000000000000..fbb9a643b874 --- /dev/null +++ b/libraries/ion/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.ion` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "ion_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "ion", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":ion_resources"], + exports = ["@lib//:ion"], + runtime_deps = ["@lib//:ion"] +) +### auto-generated section `build intellij.libraries.ion` end \ No newline at end of file diff --git a/libraries/ion/intellij.libraries.ion.iml b/libraries/ion/intellij.libraries.ion.iml new file mode 100644 index 000000000000..02c1d65953c7 --- /dev/null +++ b/libraries/ion/intellij.libraries.ion.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/ion/resources/intellij.libraries.ion.xml b/libraries/ion/resources/intellij.libraries.ion.xml new file mode 100644 index 000000000000..164f46cfcfb2 --- /dev/null +++ b/libraries/ion/resources/intellij.libraries.ion.xml @@ -0,0 +1,2 @@ + + diff --git a/libraries/jackson/databind/BUILD.bazel b/libraries/jackson/databind/BUILD.bazel new file mode 100644 index 000000000000..60b280a2edac --- /dev/null +++ b/libraries/jackson/databind/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.jackson.databind` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "databind_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "databind", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":databind_resources"], + exports = ["@lib//:jackson-databind"], + runtime_deps = ["@lib//:jackson-databind"] +) +### auto-generated section `build intellij.libraries.jackson.databind` end \ No newline at end of file diff --git a/libraries/jackson/databind/intellij.libraries.jackson.databind.iml b/libraries/jackson/databind/intellij.libraries.jackson.databind.iml new file mode 100644 index 000000000000..387969d33330 --- /dev/null +++ b/libraries/jackson/databind/intellij.libraries.jackson.databind.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/jackson/databind/resources/intellij.libraries.jackson.databind.xml b/libraries/jackson/databind/resources/intellij.libraries.jackson.databind.xml new file mode 100644 index 000000000000..164f46cfcfb2 --- /dev/null +++ b/libraries/jackson/databind/resources/intellij.libraries.jackson.databind.xml @@ -0,0 +1,2 @@ + + diff --git a/libraries/jackson/jackson/BUILD.bazel b/libraries/jackson/jackson/BUILD.bazel new file mode 100644 index 000000000000..dccea09a3f9c --- /dev/null +++ b/libraries/jackson/jackson/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.jackson` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "jackson_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "jackson", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":jackson_resources"], + exports = ["@lib//:jackson"], + runtime_deps = ["@lib//:jackson"] +) +### auto-generated section `build intellij.libraries.jackson` end \ No newline at end of file diff --git a/libraries/jackson/jackson/intellij.libraries.jackson.iml b/libraries/jackson/jackson/intellij.libraries.jackson.iml new file mode 100644 index 000000000000..e3a06dfada2a --- /dev/null +++ b/libraries/jackson/jackson/intellij.libraries.jackson.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/jackson/jackson/resources/intellij.libraries.jackson.xml b/libraries/jackson/jackson/resources/intellij.libraries.jackson.xml new file mode 100644 index 000000000000..164f46cfcfb2 --- /dev/null +++ b/libraries/jackson/jackson/resources/intellij.libraries.jackson.xml @@ -0,0 +1,2 @@ + + diff --git a/libraries/jackson/jr-objects/BUILD.bazel b/libraries/jackson/jr-objects/BUILD.bazel new file mode 100644 index 000000000000..4a2c55d62e83 --- /dev/null +++ b/libraries/jackson/jr-objects/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.jackson.jr.objects` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "libraries-jackson-jr-objects_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "libraries-jackson-jr-objects", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":libraries-jackson-jr-objects_resources"], + exports = ["@lib//:jackson-jr-objects"], + runtime_deps = ["@lib//:jackson-jr-objects"] +) +### auto-generated section `build intellij.libraries.jackson.jr.objects` end \ No newline at end of file diff --git a/libraries/jackson/jr-objects/intellij.libraries.jackson.jr.objects.iml b/libraries/jackson/jr-objects/intellij.libraries.jackson.jr.objects.iml new file mode 100644 index 000000000000..e6ed99fbb228 --- /dev/null +++ b/libraries/jackson/jr-objects/intellij.libraries.jackson.jr.objects.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/jackson/jr-objects/resources/intellij.libraries.jackson.jr.objects.xml b/libraries/jackson/jr-objects/resources/intellij.libraries.jackson.jr.objects.xml new file mode 100644 index 000000000000..164f46cfcfb2 --- /dev/null +++ b/libraries/jackson/jr-objects/resources/intellij.libraries.jackson.jr.objects.xml @@ -0,0 +1,2 @@ + + diff --git a/libraries/jackson/module-kotlin/BUILD.bazel b/libraries/jackson/module-kotlin/BUILD.bazel new file mode 100644 index 000000000000..4f173d5a78d9 --- /dev/null +++ b/libraries/jackson/module-kotlin/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.jackson.module.kotlin` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "libraries-jackson-module-kotlin_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "libraries-jackson-module-kotlin", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":libraries-jackson-module-kotlin_resources"], + exports = ["@lib//:jackson-module-kotlin"], + runtime_deps = ["@lib//:jackson-module-kotlin"] +) +### auto-generated section `build intellij.libraries.jackson.module.kotlin` end \ No newline at end of file diff --git a/libraries/jackson/module-kotlin/intellij.libraries.jackson.module.kotlin.iml b/libraries/jackson/module-kotlin/intellij.libraries.jackson.module.kotlin.iml new file mode 100644 index 000000000000..60f2b158ee22 --- /dev/null +++ b/libraries/jackson/module-kotlin/intellij.libraries.jackson.module.kotlin.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/jackson/module-kotlin/resources/intellij.libraries.jackson.module.kotlin.xml b/libraries/jackson/module-kotlin/resources/intellij.libraries.jackson.module.kotlin.xml new file mode 100644 index 000000000000..164f46cfcfb2 --- /dev/null +++ b/libraries/jackson/module-kotlin/resources/intellij.libraries.jackson.module.kotlin.xml @@ -0,0 +1,2 @@ + + diff --git a/libraries/kotlinx/coroutines/slf4j/BUILD.bazel b/libraries/kotlinx/coroutines/slf4j/BUILD.bazel new file mode 100644 index 000000000000..d037f6bd2c68 --- /dev/null +++ b/libraries/kotlinx/coroutines/slf4j/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.kotlinx.coroutines.slf4j` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "slf4j_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "slf4j", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":slf4j_resources"], + exports = ["@lib//:kotlinx-coroutines-slf4j"], + runtime_deps = ["@lib//:kotlinx-coroutines-slf4j"] +) +### auto-generated section `build intellij.libraries.kotlinx.coroutines.slf4j` end \ No newline at end of file diff --git a/libraries/kotlinx/coroutines/slf4j/intellij.libraries.kotlinx.coroutines.slf4j.iml b/libraries/kotlinx/coroutines/slf4j/intellij.libraries.kotlinx.coroutines.slf4j.iml new file mode 100644 index 000000000000..56fc82f1b93a --- /dev/null +++ b/libraries/kotlinx/coroutines/slf4j/intellij.libraries.kotlinx.coroutines.slf4j.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/kotlinx/coroutines/slf4j/resources/intellij.libraries.kotlinx.coroutines.slf4j.xml b/libraries/kotlinx/coroutines/slf4j/resources/intellij.libraries.kotlinx.coroutines.slf4j.xml new file mode 100644 index 000000000000..164f46cfcfb2 --- /dev/null +++ b/libraries/kotlinx/coroutines/slf4j/resources/intellij.libraries.kotlinx.coroutines.slf4j.xml @@ -0,0 +1,2 @@ + + diff --git a/libraries/replace-lib-with-module.js b/libraries/replace-lib-with-module.js index 27bc1b38a6b6..5ac2dd068aa2 100644 --- a/libraries/replace-lib-with-module.js +++ b/libraries/replace-lib-with-module.js @@ -105,7 +105,8 @@ const stats = { regular: 0, testScope: 0, testScopeExported: 0, - providedScope: 0 + providedScope: 0, + runtimeScope: 0 } }; @@ -177,6 +178,15 @@ function createReplacementPatterns(oldLib, newModule) { 'g' ), replacement: `` + }, + { + name: 'runtimeScope', + // + pattern: new RegExp( + ``, + 'g' + ), + replacement: `` } ]; } @@ -259,7 +269,8 @@ function main() { console.log(` TEST scope: ${stats.replacements.testScope}`); console.log(` TEST scope (exported): ${stats.replacements.testScopeExported}`); console.log(` PROVIDED scope: ${stats.replacements.providedScope}`); - console.log(` Total: ${stats.replacements.regular + stats.replacements.testScope + stats.replacements.testScopeExported + stats.replacements.providedScope}`); + console.log(` RUNTIME scope: ${stats.replacements.runtimeScope}`); + console.log(` Total: ${stats.replacements.regular + stats.replacements.testScope + stats.replacements.testScopeExported + stats.replacements.providedScope + stats.replacements.runtimeScope}`); if (config.dryRun) { console.log('\n⚠ DRY RUN MODE - No files were modified'); diff --git a/platform/analysis-impl/BUILD.bazel b/platform/analysis-impl/BUILD.bazel index 4bdbb3799a2b..ce073dfd24b0 100644 --- a/platform/analysis-impl/BUILD.bazel +++ b/platform/analysis-impl/BUILD.bazel @@ -42,9 +42,9 @@ jvm_library( "//platform/diagnostic/telemetry", "//platform/util/text-matching", "//platform/diagnostic", - "@lib//:jackson-databind", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/databind", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/util-class-loader:util-classLoader", ], exports = [ diff --git a/platform/analysis-impl/intellij.platform.analysis.impl.iml b/platform/analysis-impl/intellij.platform.analysis.impl.iml index ccd6569558cc..ef3ea5bd79f9 100644 --- a/platform/analysis-impl/intellij.platform.analysis.impl.iml +++ b/platform/analysis-impl/intellij.platform.analysis.impl.iml @@ -37,9 +37,9 @@ - - - + + + \ No newline at end of file diff --git a/platform/build-scripts/BUILD.bazel b/platform/build-scripts/BUILD.bazel index 1d72f398140a..ee6ee3176235 100644 --- a/platform/build-scripts/BUILD.bazel +++ b/platform/build-scripts/BUILD.bazel @@ -27,7 +27,7 @@ jvm_library( "@lib//:opentelemetry-semconv", "@lib//:kotlin-stdlib", "//aether-dependency-resolver", - "@lib//:jackson", + "//libraries/jackson/jackson", "//jps/model-impl", "//platform/util/xmlDom", "//jps/jps-builders:build", @@ -36,14 +36,14 @@ jvm_library( "//platform/runtime/repository", "//platform/testFramework/core", "//platform/util-class-loader:util-classLoader", - "@lib//:jackson-jr-objects", + "//libraries/jackson/jr-objects:libraries-jackson-jr-objects", "@lib//:fastutil-min", "//libraries/gson", "@lib//:protobuf", "//build/tasks", "//build/deps:dependencies", "//platform/util/jdom", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "@lib//:json-schema-validator", "//libraries/kotlinx/serialization/json", "@lib//:kotlinx-serialization-json-io", @@ -64,7 +64,7 @@ jvm_library( "@lib//:jackson-datatype-joda", "@lib//:http-client", "@lib//:ktor-serialization-kotlinx-json", - "@lib//:kotlinx-coroutines-slf4j", + "//libraries/kotlinx/coroutines/slf4j", "@lib//:ktor-client-content-negotiation", "@lib//:slf4j-api", "@lib//:platform-build_scripts-jetbrains-apple-notary-api-kotlin-client", @@ -77,7 +77,7 @@ jvm_library( "@lib//:jbr-api", "@lib//:kotlinx-serialization-protobuf", "@lib//:jackson-dataformat-yaml", - "@lib//:ion", + "//libraries/ion", "//platform/buildData", "//platform/boot", "//platform/ijent/buildConstants", @@ -101,7 +101,7 @@ jvm_library( "@lib//:jaxb-runtime", "@lib//:javax-activation", "@lib//:kotlin-reflect", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:snakeyaml", ] ) diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml index 7a627c481f11..2612d514eb80 100644 --- a/platform/build-scripts/intellij.platform.buildScripts.iml +++ b/platform/build-scripts/intellij.platform.buildScripts.iml @@ -40,7 +40,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -219,9 +219,9 @@ - + - + diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt index 901da9fec783..65205644c5b4 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt @@ -68,7 +68,6 @@ val CE_CLASS_VERSIONS: Map = mapOf( "lib/annotations.jar" to "1.8", "lib/util_rt.jar" to "1.8", "lib/util-8.jar" to "1.8", - "lib/guava.jar" to "1.8", "lib/external-system-rt.jar" to "1.8", "plugins/java-coverage/lib/java-coverage-rt.jar" to "1.8", "plugins/junit/lib/junit-rt.jar" to "1.8", diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt index 0e4f3a7066a8..3635100ad16c 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt @@ -167,10 +167,6 @@ internal suspend fun createPlatformLayout(projectLibrariesUsedByPlugins: SortedS // to ensure that package index will not report one more JAR in a search path "intellij.platform.bootstrap.coroutine", ), productLayout = productLayout, layout = layout) - // used by jdom - pack to the same JAR - // Space plugin uses it and bundles into IntelliJ IDEA, but not bundles into DataGrip, so, or Space plugin should bundle this lib, - // or IJ Platform. As it is a small library and consistency is important across other coroutine libs, bundle to IJ Platform. - layout.withProjectLibrary(libraryName = "kotlinx-coroutines-slf4j", LibraryPackMode.STANDALONE_SEPARATE_WITHOUT_VERSION_NAME) // https://jetbrains.team/p/ij/reviews/67104/timeline // https://youtrack.jetbrains.com/issue/IDEA-179784 diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt index 24ec20228b11..49d51e1908a6 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt @@ -28,10 +28,17 @@ private val LIBRARY_MODULE_NAMES: Set = setOf( "intellij.libraries.grpc.netty.shaded", "intellij.libraries.gson", "intellij.libraries.hamcrest", + "intellij.libraries.icu4j", + "intellij.libraries.ion", + "intellij.libraries.jackson", + "intellij.libraries.jackson.databind", + "intellij.libraries.jackson.jr.objects", + "intellij.libraries.jackson.module.kotlin", "intellij.libraries.junit4", "intellij.libraries.junit5", "intellij.libraries.kotlinTest", "intellij.libraries.kotlinTestAssertionsCoreJvm", + "intellij.libraries.kotlinx.coroutines.slf4j", "intellij.libraries.ktor.client", "intellij.libraries.ktor.client.cio", "intellij.libraries.ktor.io", diff --git a/platform/build-scripts/testFramework/BUILD.bazel b/platform/build-scripts/testFramework/BUILD.bazel index 397ef9c9d512..1be2cbd87587 100644 --- a/platform/build-scripts/testFramework/BUILD.bazel +++ b/platform/build-scripts/testFramework/BUILD.bazel @@ -22,7 +22,7 @@ jvm_library( "@lib//:grpc-core", "@lib//:grpc-protobuf", "@lib//:grpc-stub", - "@lib//:jackson-jr-objects", + "//libraries/jackson/jr-objects:libraries-jackson-jr-objects", "//platform/core-api:core", "//jps/model-api:model", "//platform/util", diff --git a/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml b/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml index 1a139bcd174f..88ad830a5d82 100644 --- a/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml +++ b/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml @@ -37,7 +37,7 @@ - + diff --git a/platform/built-in-server/BUILD.bazel b/platform/built-in-server/BUILD.bazel index dcda2db33d1f..56e49ec8fb1c 100644 --- a/platform/built-in-server/BUILD.bazel +++ b/platform/built-in-server/BUILD.bazel @@ -33,8 +33,8 @@ jvm_library( "@lib//:kotlin-stdlib", "@lib//:netty-codec-http", "@lib//:fastutil-min", - "@lib//:jackson", - "@lib//:jackson-jr-objects", + "//libraries/jackson/jackson", + "//libraries/jackson/jr-objects:libraries-jackson-jr-objects", "@lib//:netty-buffer", "//libraries/caffeine", "//platform/util/concurrency", diff --git a/platform/built-in-server/intellij.platform.builtInServer.impl.iml b/platform/built-in-server/intellij.platform.builtInServer.impl.iml index f9517c7da255..83d62012f40b 100644 --- a/platform/built-in-server/intellij.platform.builtInServer.impl.iml +++ b/platform/built-in-server/intellij.platform.builtInServer.impl.iml @@ -30,8 +30,8 @@ - - + + diff --git a/platform/diagnostic/startUpPerformanceReporter/BUILD.bazel b/platform/diagnostic/startUpPerformanceReporter/BUILD.bazel index e963292518a0..90fdf5f7e7d9 100644 --- a/platform/diagnostic/startUpPerformanceReporter/BUILD.bazel +++ b/platform/diagnostic/startUpPerformanceReporter/BUILD.bazel @@ -15,7 +15,7 @@ jvm_library( kotlinc_opts = ":custom_startUpPerformanceReporter", deps = [ "@lib//:kotlin-stdlib", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/core-api:core", "//platform/core-impl", "//platform/util-ex", diff --git a/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml b/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml index fcd19b69b335..c77387e21ef1 100644 --- a/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml +++ b/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml @@ -30,7 +30,7 @@ - + diff --git a/platform/diagnostic/telemetry-impl/BUILD.bazel b/platform/diagnostic/telemetry-impl/BUILD.bazel index cd8ae22db003..b1bf4493519f 100644 --- a/platform/diagnostic/telemetry-impl/BUILD.bazel +++ b/platform/diagnostic/telemetry-impl/BUILD.bazel @@ -24,7 +24,7 @@ jvm_library( resources = [":telemetry-impl_resources"], kotlinc_opts = ":custom_telemetry-impl", deps = [ - "@lib//:jackson", + "//libraries/jackson/jackson", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "@lib//:kotlin-stdlib", diff --git a/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml b/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml index a027cc34f389..c5e36c48b118 100644 --- a/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml +++ b/platform/diagnostic/telemetry-impl/intellij.platform.diagnostic.telemetry.impl.iml @@ -30,7 +30,7 @@ - + diff --git a/platform/diagnostic/telemetry.exporters/BUILD.bazel b/platform/diagnostic/telemetry.exporters/BUILD.bazel index d81a68e3f295..f0c5b4818f14 100644 --- a/platform/diagnostic/telemetry.exporters/BUILD.bazel +++ b/platform/diagnostic/telemetry.exporters/BUILD.bazel @@ -33,9 +33,9 @@ jvm_library( "//platform/util/http", "@lib//:kotlinx-coroutines-core", "//platform/util", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//libraries/kotlinx/serialization/core", "@lib//:kotlinx-serialization-protobuf", ] diff --git a/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml b/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml index 7d37cafa45ce..3909324b14a8 100644 --- a/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml +++ b/platform/diagnostic/telemetry.exporters/intellij.platform.diagnostic.telemetry.exporters.iml @@ -39,9 +39,9 @@ - - - + + + diff --git a/platform/diagnostic/telemetry/agent-extension/BUILD.bazel b/platform/diagnostic/telemetry/agent-extension/BUILD.bazel index de4bd9bfd593..faa2c97cc09b 100644 --- a/platform/diagnostic/telemetry/agent-extension/BUILD.bazel +++ b/platform/diagnostic/telemetry/agent-extension/BUILD.bazel @@ -18,9 +18,9 @@ jvm_library( "@lib//:opentelemetry", "@lib//:jetbrains-annotations", "@lib//:opentelemetry-exporter-otlp-common", - "@lib//:jackson", + "//libraries/jackson/jackson", "@lib//:io-opentelemetry-sdk-extension-autoconfigure-spi-provided", - "@lib//:jackson-databind", + "//libraries/jackson/databind", ] ) @@ -35,9 +35,9 @@ jvm_library( "@lib//:jetbrains-annotations", "@lib//:junit5", "@lib//:opentelemetry-exporter-otlp-common", - "@lib//:jackson", + "//libraries/jackson/jackson", "@lib//:io-opentelemetry-sdk-extension-autoconfigure-spi-provided", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "@lib//:kotlin-stdlib", ] ) diff --git a/platform/diagnostic/telemetry/agent-extension/intellij.platform.diagnostic.telemetry.agent.extension.iml b/platform/diagnostic/telemetry/agent-extension/intellij.platform.diagnostic.telemetry.agent.extension.iml index 27bbc8e307ad..93c4c33825af 100644 --- a/platform/diagnostic/telemetry/agent-extension/intellij.platform.diagnostic.telemetry.agent.extension.iml +++ b/platform/diagnostic/telemetry/agent-extension/intellij.platform.diagnostic.telemetry.agent.extension.iml @@ -29,9 +29,9 @@ - + - + \ No newline at end of file diff --git a/platform/ide-core-impl/BUILD.bazel b/platform/ide-core-impl/BUILD.bazel index 9470c5bc66a5..65300c1c1a25 100644 --- a/platform/ide-core-impl/BUILD.bazel +++ b/platform/ide-core-impl/BUILD.bazel @@ -25,7 +25,7 @@ jvm_library( "//platform/util/concurrency", "//platform/core-impl", "//platform/analysis-impl", - "@lib//:icu4j", + "//libraries/icu4j", "@lib//:fastutil-min", "//platform/editor-ui-api:editor-ui", "//platform/core-ui", diff --git a/platform/ide-core-impl/intellij.platform.ide.core.impl.iml b/platform/ide-core-impl/intellij.platform.ide.core.impl.iml index f2d299583679..a8b4e80ce339 100644 --- a/platform/ide-core-impl/intellij.platform.ide.core.impl.iml +++ b/platform/ide-core-impl/intellij.platform.ide.core.impl.iml @@ -19,7 +19,7 @@ - + diff --git a/platform/inspect/BUILD.bazel b/platform/inspect/BUILD.bazel index e31de33a6b8f..07cbe2efa6e3 100644 --- a/platform/inspect/BUILD.bazel +++ b/platform/inspect/BUILD.bazel @@ -36,9 +36,9 @@ jvm_library( "@lib//:snakeyaml", "//platform/ide-core-impl", "@lib//:kotlinx-coroutines-core", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "@lib//:jsoup", - "@lib//:jackson", + "//libraries/jackson/jackson", "//libraries/kotlinx/serialization/json", "//libraries/kotlinx/serialization/core", "//platform/backend/observation", @@ -79,9 +79,9 @@ jvm_library( "@lib//:snakeyaml", "//platform/ide-core-impl", "@lib//:kotlinx-coroutines-core", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "@lib//:jsoup", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//libraries/kotlinx/serialization/json", diff --git a/platform/inspect/intellij.platform.inspect.iml b/platform/inspect/intellij.platform.inspect.iml index 5ddd562fdeaa..cf293d3d6d4c 100644 --- a/platform/inspect/intellij.platform.inspect.iml +++ b/platform/inspect/intellij.platform.inspect.iml @@ -56,9 +56,9 @@ - + - + diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel index aef39fa8dfd8..8ef6268ff22c 100644 --- a/platform/lang-impl/BUILD.bazel +++ b/platform/lang-impl/BUILD.bazel @@ -67,9 +67,9 @@ jvm_library( "//platform/util", "//platform/service-container", "//platform/execution-impl", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:xz", "//platform/util/progress", "//platform/observable", @@ -192,9 +192,9 @@ jvm_library( "@lib//:jmock-legacy", "@lib//:jmock-junit4", "//platform/testFramework/extensions:testExtensions", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:xz", "@lib//:stream_ex", "@lib//:kotlinx-coroutines-core", diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml index 27b5df6ecd00..9050d91cb24b 100644 --- a/platform/lang-impl/intellij.platform.lang.impl.iml +++ b/platform/lang-impl/intellij.platform.lang.impl.iml @@ -75,9 +75,9 @@ - - - + + + diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml index ecf67ed73d42..9e92b08d0b96 100644 --- a/platform/lang-impl/intellij.platform.lang.tests.iml +++ b/platform/lang-impl/intellij.platform.lang.tests.iml @@ -67,9 +67,9 @@ - - - + + + diff --git a/platform/object-serializer/BUILD.bazel b/platform/object-serializer/BUILD.bazel index ba4088b03a12..ceb2b7d284c7 100644 --- a/platform/object-serializer/BUILD.bazel +++ b/platform/object-serializer/BUILD.bazel @@ -8,7 +8,7 @@ jvm_library( srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), deps = [ "@lib//:kotlin-stdlib", - "@lib//:ion", + "//libraries/ion", "//platform/util", "@lib//:kotlin-reflect", "//platform/util/jdom", @@ -32,7 +32,7 @@ jvm_library( associates = [":object-serializer"], deps = [ "@lib//:kotlin-stdlib", - "@lib//:ion", + "//libraries/ion", "//platform/util", "@lib//:kotlin-reflect", "//platform/util/jdom", @@ -93,7 +93,7 @@ jvm_library( "//platform/object-serializer:object-serializer_test_lib", "//platform/util-ex", "//platform/object-serializer:objectSerializer-annotations", - "@lib//:ion", + "//libraries/ion", "@lib//:fastutil-min", ] ) diff --git a/platform/object-serializer/intellij.platform.objectSerializer.iml b/platform/object-serializer/intellij.platform.objectSerializer.iml index cc1cf8e69ce6..a57df3e764e4 100644 --- a/platform/object-serializer/intellij.platform.objectSerializer.iml +++ b/platform/object-serializer/intellij.platform.objectSerializer.iml @@ -10,7 +10,7 @@ - + diff --git a/platform/object-serializer/intellij.platform.objectSerializer.tests.iml b/platform/object-serializer/intellij.platform.objectSerializer.tests.iml index 31af9e117e94..3f8b9f75c097 100644 --- a/platform/object-serializer/intellij.platform.objectSerializer.tests.iml +++ b/platform/object-serializer/intellij.platform.objectSerializer.tests.iml @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/platform/platform-api/BUILD.bazel b/platform/platform-api/BUILD.bazel index 1d4b825cc901..a34ad204c696 100644 --- a/platform/platform-api/BUILD.bazel +++ b/platform/platform-api/BUILD.bazel @@ -52,7 +52,7 @@ jvm_library( "//platform/ide-core", "//platform/util/text-matching", "//platform/diagnostic", - "@lib//:jackson", + "//libraries/jackson/jackson", "//libraries/caffeine", "//platform/progress/shared:ide-progress", "//platform/util/diff", diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml index 58b8d9a7e38a..8b9a3ebfb9db 100644 --- a/platform/platform-api/intellij.platform.ide.iml +++ b/platform/platform-api/intellij.platform.ide.iml @@ -34,7 +34,7 @@ - + diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel index 8a40d553c89f..b18fe88f019c 100644 --- a/platform/platform-impl/BUILD.bazel +++ b/platform/platform-impl/BUILD.bazel @@ -71,11 +71,11 @@ jvm_library( "@lib//:stream_ex", "@lib//:kotlinx-coroutines-core", "@lib//:netty-codec-http", - "@lib//:jackson", + "//libraries/jackson/jackson", "@lib//:java_compatibility", "@lib//:kotlin-reflect", - "@lib//:jackson-databind", - "@lib//:jackson-jr-objects", + "//libraries/jackson/databind", + "//libraries/jackson/jr-objects:libraries-jackson-jr-objects", "//platform/util:util-ui", "//platform/platform-util-io-impl:ide-util-io-impl", "//platform/util", @@ -97,7 +97,7 @@ jvm_library( "//libraries/caffeine", "@lib//:classgraph", "//platform/util/zip", - "@lib//:icu4j", + "//libraries/icu4j", "//platform/util/xmlDom", "//platform/ide-core-impl", "//platform/ide-core/plugins", @@ -230,11 +230,11 @@ jvm_library( "@lib//:stream_ex", "@lib//:kotlinx-coroutines-core", "@lib//:netty-codec-http", - "@lib//:jackson", + "//libraries/jackson/jackson", "@lib//:java_compatibility", "@lib//:kotlin-reflect", - "@lib//:jackson-databind", - "@lib//:jackson-jr-objects", + "//libraries/jackson/databind", + "//libraries/jackson/jr-objects:libraries-jackson-jr-objects", "//platform/util:util-ui", "//platform/platform-util-io-impl:ide-util-io-impl", "//platform/util", @@ -259,7 +259,7 @@ jvm_library( "//libraries/caffeine", "@lib//:classgraph", "//platform/util/zip", - "@lib//:icu4j", + "//libraries/icu4j", "//platform/util/xmlDom", "//platform/ide-core-impl", "//platform/ide-core/plugins", diff --git a/platform/platform-impl/initial-config-import/BUILD.bazel b/platform/platform-impl/initial-config-import/BUILD.bazel index 474a40a113ab..392ceb21f2e1 100644 --- a/platform/platform-impl/initial-config-import/BUILD.bazel +++ b/platform/platform-impl/initial-config-import/BUILD.bazel @@ -13,7 +13,7 @@ jvm_library( "//platform/core-impl", "//platform/projectModel-api:projectModel", "//platform/service-container", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/statistics", "//platform/core-ui", "//platform/ide-core/plugins", diff --git a/platform/platform-impl/initial-config-import/intellij.platform.ide.initialConfigImport.iml b/platform/platform-impl/initial-config-import/intellij.platform.ide.initialConfigImport.iml index 31f74cfd7f31..af5911bf21dd 100644 --- a/platform/platform-impl/initial-config-import/intellij.platform.ide.initialConfigImport.iml +++ b/platform/platform-impl/initial-config-import/intellij.platform.ide.initialConfigImport.iml @@ -13,7 +13,7 @@ - + diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml index dc8755cf9ad6..1c2cdd0bd06d 100644 --- a/platform/platform-impl/intellij.platform.ide.impl.iml +++ b/platform/platform-impl/intellij.platform.ide.impl.iml @@ -72,12 +72,12 @@ - + - - + + @@ -104,7 +104,7 @@ - + diff --git a/platform/platform-impl/update-checker/BUILD.bazel b/platform/platform-impl/update-checker/BUILD.bazel index 46b3404e0b66..45f68b756312 100644 --- a/platform/platform-impl/update-checker/BUILD.bazel +++ b/platform/platform-impl/update-checker/BUILD.bazel @@ -27,9 +27,9 @@ jvm_library( "//platform/platform-util-io:ide-util-io", "//platform/ide-core/plugins", "//platform/util/jdom", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/ide-core-impl", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "@lib//:kotlinx-coroutines-core", "//platform/platform-impl/initial-config-import", "//libraries/kotlinx/serialization/core", diff --git a/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml b/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml index ccdfacbe9607..53e3dfe0f904 100644 --- a/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml +++ b/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml @@ -43,9 +43,9 @@ - + - + diff --git a/platform/platform-resources/src/META-INF/essential-libs.xml b/platform/platform-resources/src/META-INF/essential-libs.xml index 2e43436e8ed8..610f24c3ae7d 100644 --- a/platform/platform-resources/src/META-INF/essential-libs.xml +++ b/platform/platform-resources/src/META-INF/essential-libs.xml @@ -11,5 +11,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel index a40789a97d2f..6875aa33a115 100644 --- a/platform/platform-tests/BUILD.bazel +++ b/platform/platform-tests/BUILD.bazel @@ -94,7 +94,7 @@ jvm_library( "@lib//:netty-buffer", "@lib//:lz4-java", "//libraries/caffeine", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/core-ui", "//platform/code-style-impl:codeStyle-impl", "//platform/statistics/uploader", @@ -112,7 +112,7 @@ jvm_library( "//platform/testFramework/junit5:junit5_test_lib", "@lib//:objenesis", "//platform/testFramework/impl", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "@lib//:kotlin-reflect", "//platform/util:util-ui", "@lib//:hamcrest", diff --git a/platform/platform-tests/eel-helper/BUILD.bazel b/platform/platform-tests/eel-helper/BUILD.bazel index 724cbf38a788..5ba0b47386d7 100644 --- a/platform/platform-tests/eel-helper/BUILD.bazel +++ b/platform/platform-tests/eel-helper/BUILD.bazel @@ -15,9 +15,9 @@ jvm_library( resources = [":eel-helper_resources"], deps = [ "@lib//:kotlin-stdlib", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", + "//libraries/jackson/databind", "@lib//:kotlin-reflect", "//platform/util-rt", "@lib//:jetbrains-annotations", diff --git a/platform/platform-tests/eel-helper/intellij.platform.eelHelper.iml b/platform/platform-tests/eel-helper/intellij.platform.eelHelper.iml index f413f2b2ece8..4c61b9beb866 100644 --- a/platform/platform-tests/eel-helper/intellij.platform.eelHelper.iml +++ b/platform/platform-tests/eel-helper/intellij.platform.eelHelper.iml @@ -9,9 +9,9 @@ - - - + + + diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml index bb22d851da22..3bae1025a849 100644 --- a/platform/platform-tests/intellij.platform.tests.iml +++ b/platform/platform-tests/intellij.platform.tests.iml @@ -80,7 +80,7 @@ - + @@ -97,7 +97,7 @@ - + diff --git a/platform/platform-util-io-impl/BUILD.bazel b/platform/platform-util-io-impl/BUILD.bazel index 13f554d27624..193a6024c7f7 100644 --- a/platform/platform-util-io-impl/BUILD.bazel +++ b/platform/platform-util-io-impl/BUILD.bazel @@ -16,7 +16,7 @@ jvm_library( "//platform/util", "@lib//:proxy-vole", "@lib//:jna", - "@lib//:jackson", + "//libraries/jackson/jackson", ], exports = ["//platform/platform-util-io:ide-util-io"], runtime_deps = ["@lib//:rhino"] diff --git a/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml b/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml index 396a2f1016b2..46a34ff6701b 100644 --- a/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml +++ b/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/platform/polySymbols/BUILD.bazel b/platform/polySymbols/BUILD.bazel index fd7a6c955817..e30af937b354 100644 --- a/platform/polySymbols/BUILD.bazel +++ b/platform/polySymbols/BUILD.bazel @@ -22,9 +22,9 @@ jvm_library( "//platform/core-ui", "//platform/editor-ui-ex:editor-ex", "//platform/core-api:core", - "@lib//:jackson-databind", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/databind", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:fastutil-min", "@lib//:commons-compress", "@lib//:jetbrains-markdown", @@ -54,10 +54,10 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/usageView", "//platform/refactoring", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "//platform/analysis-impl", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:fastutil-min", "@lib//:commons-compress", "@lib//:jetbrains-markdown", @@ -92,10 +92,10 @@ jvm_library( "//platform/core-api:core", "//platform/usageView", "//platform/refactoring", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "//platform/analysis-impl", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:fastutil-min", "@lib//:commons-compress", "@lib//:jetbrains-markdown", diff --git a/platform/polySymbols/intellij.platform.polySymbols.iml b/platform/polySymbols/intellij.platform.polySymbols.iml index e0165aff7a06..b29158ea0e16 100644 --- a/platform/polySymbols/intellij.platform.polySymbols.iml +++ b/platform/polySymbols/intellij.platform.polySymbols.iml @@ -19,9 +19,9 @@ - - - + + + diff --git a/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml b/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml index 46c87196ef72..4270605117b7 100644 --- a/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml +++ b/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml @@ -19,10 +19,10 @@ - + - - + + diff --git a/platform/polySymbols/intellij.platform.polySymbols.tests.iml b/platform/polySymbols/intellij.platform.polySymbols.tests.iml index a567688aa2f0..fc4566fe6078 100644 --- a/platform/polySymbols/intellij.platform.polySymbols.tests.iml +++ b/platform/polySymbols/intellij.platform.polySymbols.tests.iml @@ -19,10 +19,10 @@ - + - - + + diff --git a/platform/remoteDev-util/BUILD.bazel b/platform/remoteDev-util/BUILD.bazel index df780eca5c0a..bb4e738c0e3c 100644 --- a/platform/remoteDev-util/BUILD.bazel +++ b/platform/remoteDev-util/BUILD.bazel @@ -29,8 +29,8 @@ jvm_library( "@lib//:bouncy-castle-pgp", "//platform/platform-impl:ide-impl", "@lib//:miglayout-swing", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//platform/rd-platform-community:rd-community", "//platform/statistics", "//libraries/gson", @@ -80,8 +80,8 @@ jvm_library( "@lib//:bouncy-castle-pgp", "//platform/platform-impl:ide-impl", "@lib//:miglayout-swing", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//platform/rd-platform-community:rd-community", "//platform/statistics", "//platform/statistics:statistics_test_lib", diff --git a/platform/remoteDev-util/intellij.remoteDev.util.iml b/platform/remoteDev-util/intellij.remoteDev.util.iml index 5be06362463c..75589ad5d45b 100644 --- a/platform/remoteDev-util/intellij.remoteDev.util.iml +++ b/platform/remoteDev-util/intellij.remoteDev.util.iml @@ -47,8 +47,8 @@ - - + + diff --git a/platform/script-debugger/backend/BUILD.bazel b/platform/script-debugger/backend/BUILD.bazel index 3313fd79fa48..1b9ac88e2412 100644 --- a/platform/script-debugger/backend/BUILD.bazel +++ b/platform/script-debugger/backend/BUILD.bazel @@ -26,6 +26,7 @@ jvm_library( "//platform/util/concurrency", "//platform/platform-util-netty:ide-util-netty", "//platform/ide-core-impl", + "//libraries/gson", "//platform/util-ex", ] ) diff --git a/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml b/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml index f0a16ac99ced..4c8cd2db4dec 100644 --- a/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml +++ b/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml @@ -20,6 +20,7 @@ + \ No newline at end of file diff --git a/platform/script-debugger/protocol/protocol-reader-runtime/BUILD.bazel b/platform/script-debugger/protocol/protocol-reader-runtime/BUILD.bazel index cec3b689d3e7..454aea97e3f0 100644 --- a/platform/script-debugger/protocol/protocol-reader-runtime/BUILD.bazel +++ b/platform/script-debugger/protocol/protocol-reader-runtime/BUILD.bazel @@ -15,14 +15,13 @@ jvm_library( resources = [":protocol-reader-runtime_resources"], deps = [ "@lib//:kotlin-stdlib", - "@lib//:gson", + "//libraries/gson", "//platform/util", "//platform/platform-impl:ide-impl", "@lib//:netty-codec-http", "@lib//:fastutil-min", "@lib//:netty-buffer", ], - exports = ["@lib//:gson"], runtime_deps = ["//platform/backend"] ) ### auto-generated section `build intellij.platform.scriptDebugger.protocolReaderRuntime` end \ No newline at end of file diff --git a/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml b/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml index 9842aa1e5757..79ec505bc334 100644 --- a/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml +++ b/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml @@ -9,7 +9,7 @@ - + diff --git a/platform/settings-local/BUILD.bazel b/platform/settings-local/BUILD.bazel index 472655639531..5a22dfe43ba8 100644 --- a/platform/settings-local/BUILD.bazel +++ b/platform/settings-local/BUILD.bazel @@ -38,7 +38,7 @@ jvm_library( "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "@lib//:mvstore", - "@lib//:jackson", + "//libraries/jackson/jackson", "@lib//:platform-settings-local-jackson-dataformat-cbor", "//platform/util/jdom", "//platform/util/xmlDom", @@ -74,12 +74,12 @@ jvm_library( "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "@lib//:mvstore", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", "//platform/core-impl", "@lib//:platform-settings-local-jackson-dataformat-cbor", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "@lib//:jackson-dataformat-yaml", "//platform/util/jdom", "//platform/util/xmlDom", diff --git a/platform/settings-local/intellij.platform.settings.local.iml b/platform/settings-local/intellij.platform.settings.local.iml index fae46d1d3ad1..f34f5d1337ef 100644 --- a/platform/settings-local/intellij.platform.settings.local.iml +++ b/platform/settings-local/intellij.platform.settings.local.iml @@ -47,7 +47,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/platform/settings-sync-core/BUILD.bazel b/platform/settings-sync-core/BUILD.bazel index 5e4aa10bddf6..48d54b851b85 100644 --- a/platform/settings-sync-core/BUILD.bazel +++ b/platform/settings-sync-core/BUILD.bazel @@ -34,9 +34,9 @@ jvm_library( "//platform/util/jdom", "//platform/core-ui", "//platform/ide-core-impl", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "//platform/statistics", @@ -86,9 +86,9 @@ jvm_library( "//platform/util/jdom", "//platform/core-ui", "//platform/ide-core-impl", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "@lib//:kotlinx-coroutines-test", diff --git a/platform/settings-sync-core/intellij.settingsSync.core.iml b/platform/settings-sync-core/intellij.settingsSync.core.iml index c60b44bd5d65..17acbf4023ae 100644 --- a/platform/settings-sync-core/intellij.settingsSync.core.iml +++ b/platform/settings-sync-core/intellij.settingsSync.core.iml @@ -53,9 +53,9 @@ - - - + + + diff --git a/platform/statistics/BUILD.bazel b/platform/statistics/BUILD.bazel index 58ea187e1edf..d05b31e87d8d 100644 --- a/platform/statistics/BUILD.bazel +++ b/platform/statistics/BUILD.bazel @@ -33,9 +33,9 @@ jvm_library( "//platform/ide-core", "//platform/ide-core/plugins", "//platform/projectModel-api:projectModel", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:kotlin-reflect", "@lib//:kotlinx-coroutines-core", "//libraries/kotlinx/serialization/json", @@ -78,9 +78,9 @@ jvm_library( "//platform/ide-core", "//platform/ide-core/plugins", "//platform/projectModel-api:projectModel", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:kotlin-reflect", "@lib//:kotlinx-coroutines-core", "@lib//:junit5", diff --git a/platform/statistics/config/BUILD.bazel b/platform/statistics/config/BUILD.bazel index dfee8634d06a..4e7874c7279b 100644 --- a/platform/statistics/config/BUILD.bazel +++ b/platform/statistics/config/BUILD.bazel @@ -10,9 +10,9 @@ jvm_library( "@lib//:jetbrains-annotations", "@lib//:kotlin-stdlib", "@lib//:kotlin-reflect", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", ] ) ### auto-generated section `build intellij.platform.statistics.config` end \ No newline at end of file diff --git a/platform/statistics/config/intellij.platform.statistics.config.iml b/platform/statistics/config/intellij.platform.statistics.config.iml index 94c094f050da..fe1b7cd2a6a9 100644 --- a/platform/statistics/config/intellij.platform.statistics.config.iml +++ b/platform/statistics/config/intellij.platform.statistics.config.iml @@ -10,8 +10,8 @@ - - - + + + \ No newline at end of file diff --git a/platform/statistics/devkit/BUILD.bazel b/platform/statistics/devkit/BUILD.bazel index a38419f08549..cc80b064cc42 100644 --- a/platform/statistics/devkit/BUILD.bazel +++ b/platform/statistics/devkit/BUILD.bazel @@ -32,8 +32,8 @@ jvm_library( "//platform/core-ui", "//platform/statistics/uploader", "@lib//:kotlinx-coroutines-core", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//platform/util/jdom", ] ) @@ -65,8 +65,8 @@ jvm_library( "//platform/core-ui", "//platform/statistics/uploader", "@lib//:kotlinx-coroutines-core", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//platform/util/jdom", ] ) diff --git a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml index 9a75c3a0a582..90d044d8dd5b 100644 --- a/platform/statistics/devkit/intellij.platform.statistics.devkit.iml +++ b/platform/statistics/devkit/intellij.platform.statistics.devkit.iml @@ -28,8 +28,8 @@ - - + + \ No newline at end of file diff --git a/platform/statistics/envTests/BUILD.bazel b/platform/statistics/envTests/BUILD.bazel index 93e98cdf6e1d..494c8acde2dd 100644 --- a/platform/statistics/envTests/BUILD.bazel +++ b/platform/statistics/envTests/BUILD.bazel @@ -26,8 +26,8 @@ jvm_library( "@lib//:com-jetbrains-fus-reporting-configuration", "//platform/core-ui", "//platform/statistics/uploader", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "@lib//:com-jetbrains-fus-reporting-connection-client", "@lib//:com-jetbrains-fus-reporting-serialization-kotlin", ] diff --git a/platform/statistics/envTests/intellij.platform.statistics.envTests.iml b/platform/statistics/envTests/intellij.platform.statistics.envTests.iml index 7f9c8879c815..6b86363b5b97 100644 --- a/platform/statistics/envTests/intellij.platform.statistics.envTests.iml +++ b/platform/statistics/envTests/intellij.platform.statistics.envTests.iml @@ -18,8 +18,8 @@ - - + + diff --git a/platform/statistics/intellij.platform.statistics.iml b/platform/statistics/intellij.platform.statistics.iml index a0e0b71d217d..b47e7c4760e2 100644 --- a/platform/statistics/intellij.platform.statistics.iml +++ b/platform/statistics/intellij.platform.statistics.iml @@ -28,9 +28,9 @@ - - - + + + diff --git a/platform/statistics/uploader/BUILD.bazel b/platform/statistics/uploader/BUILD.bazel index 4839dff971d3..b7abc397eed2 100644 --- a/platform/statistics/uploader/BUILD.bazel +++ b/platform/statistics/uploader/BUILD.bazel @@ -17,9 +17,9 @@ jvm_library( "@lib//:jetbrains-annotations", "@lib//:kotlin-stdlib", "//platform/statistics/config", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:com-jetbrains-fus-reporting-model", "@lib//:com-jetbrains-fus-reporting-serialization-kotlin", "@lib//:com-jetbrains-fus-reporting-configuration", diff --git a/platform/statistics/uploader/intellij.platform.statistics.uploader.iml b/platform/statistics/uploader/intellij.platform.statistics.uploader.iml index 508dbc128786..9ecf4c918754 100644 --- a/platform/statistics/uploader/intellij.platform.statistics.uploader.iml +++ b/platform/statistics/uploader/intellij.platform.statistics.uploader.iml @@ -11,9 +11,9 @@ - - - + + + diff --git a/platform/testFramework/BUILD.bazel b/platform/testFramework/BUILD.bazel index 131af2999277..18b6d68cfd0c 100644 --- a/platform/testFramework/BUILD.bazel +++ b/platform/testFramework/BUILD.bazel @@ -129,11 +129,11 @@ jvm_library( "@lib//:assert_j", "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", - "@lib//:kotlinx-coroutines-slf4j", + "//libraries/kotlinx/coroutines/slf4j", "@lib//:http-client", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:okhttp", "//java/java-runtime:rt", "//libraries/junit4", diff --git a/platform/testFramework/core/BUILD.bazel b/platform/testFramework/core/BUILD.bazel index 34c854c09f0b..bca598add4a8 100644 --- a/platform/testFramework/core/BUILD.bazel +++ b/platform/testFramework/core/BUILD.bazel @@ -28,9 +28,9 @@ jvm_library( "//java/java-runtime:rt", "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:http-client", "@lib//:kotlinx-collections-immutable", "//platform/testFramework/teamCity", diff --git a/platform/testFramework/core/intellij.platform.testFramework.core.iml b/platform/testFramework/core/intellij.platform.testFramework.core.iml index d02e4ec5c2a5..d06d03451b7a 100644 --- a/platform/testFramework/core/intellij.platform.testFramework.core.iml +++ b/platform/testFramework/core/intellij.platform.testFramework.core.iml @@ -18,9 +18,9 @@ - - - + + + diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml index 4e7cfeb33358..d6d6e84bf761 100644 --- a/platform/testFramework/intellij.platform.testFramework.iml +++ b/platform/testFramework/intellij.platform.testFramework.iml @@ -17,11 +17,11 @@ - + - - - + + + diff --git a/platform/threadDumpParser/BUILD.bazel b/platform/threadDumpParser/BUILD.bazel index a2680a110e7d..61d6d4e97b42 100644 --- a/platform/threadDumpParser/BUILD.bazel +++ b/platform/threadDumpParser/BUILD.bazel @@ -10,8 +10,8 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/util", "//platform/platform-impl:ide-impl", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", ] ) @@ -28,8 +28,8 @@ jvm_library( "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "@lib//:junit4", ] ) diff --git a/platform/threadDumpParser/intellij.platform.threadDumpParser.iml b/platform/threadDumpParser/intellij.platform.threadDumpParser.iml index 453916e9b4e8..5ed9816002ea 100644 --- a/platform/threadDumpParser/intellij.platform.threadDumpParser.iml +++ b/platform/threadDumpParser/intellij.platform.threadDumpParser.iml @@ -13,8 +13,8 @@ - - + + \ No newline at end of file diff --git a/platform/tips-of-the-day/BUILD.bazel b/platform/tips-of-the-day/BUILD.bazel index db13f7b14e81..a301657ceecb 100644 --- a/platform/tips-of-the-day/BUILD.bazel +++ b/platform/tips-of-the-day/BUILD.bazel @@ -24,8 +24,8 @@ jvm_library( "//platform/core-ui", "@lib//:jsoup", "@lib//:fastutil-min", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//platform/ide-core-impl", "@lib//:kotlinx-coroutines-core", "//libraries/kotlinx/serialization/core", diff --git a/platform/tips-of-the-day/intellij.platform.tips.iml b/platform/tips-of-the-day/intellij.platform.tips.iml index 5c4a35835adb..f7be5e34ca9f 100644 --- a/platform/tips-of-the-day/intellij.platform.tips.iml +++ b/platform/tips-of-the-day/intellij.platform.tips.iml @@ -40,8 +40,8 @@ - - + + diff --git a/platform/usageView-impl/BUILD.bazel b/platform/usageView-impl/BUILD.bazel index 89fb5453ba1b..b21b59c9d351 100644 --- a/platform/usageView-impl/BUILD.bazel +++ b/platform/usageView-impl/BUILD.bazel @@ -8,7 +8,7 @@ jvm_library( srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), deps = [ "@lib//:fastutil-min", - "@lib//:jackson", + "//libraries/jackson/jackson", "@lib//:kotlinx-coroutines-core", "//platform/code-style-api:codeStyle", "//platform/lang-core", diff --git a/platform/usageView-impl/intellij.platform.usageView.impl.iml b/platform/usageView-impl/intellij.platform.usageView.impl.iml index 639d4a33e14a..fba7da1a408b 100644 --- a/platform/usageView-impl/intellij.platform.usageView.impl.iml +++ b/platform/usageView-impl/intellij.platform.usageView.impl.iml @@ -8,7 +8,7 @@ - + diff --git a/platform/xdebugger-impl/BUILD.bazel b/platform/xdebugger-impl/BUILD.bazel index fb6c01599591..615737b3a264 100644 --- a/platform/xdebugger-impl/BUILD.bazel +++ b/platform/xdebugger-impl/BUILD.bazel @@ -62,8 +62,8 @@ jvm_library( "//platform/editor-ui-ex:editor-ex", "//platform/platform-impl/ui", "//platform/refactoring", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//platform/kernel/shared:kernel", "//platform/platform-impl/internal", "//libraries/kotlinx/serialization/core", @@ -122,8 +122,8 @@ jvm_library( "@lib//:assert_j", "//platform/platform-impl/ui", "//platform/refactoring", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//platform/kernel/shared:kernel", "//platform/platform-impl/internal", "//libraries/kotlinx/serialization/core", diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml index ebf4853fd276..264621a9c926 100644 --- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml +++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml @@ -71,8 +71,8 @@ - - + + diff --git a/plugins/built-in-help/BUILD.bazel b/plugins/built-in-help/BUILD.bazel index 19bd2df87e41..a4cac964f5fd 100644 --- a/plugins/built-in-help/BUILD.bazel +++ b/plugins/built-in-help/BUILD.bazel @@ -38,9 +38,9 @@ jvm_library( "@lib//:netty-buffer", "//platform/platform-util-io:ide-util-io", "//platform/platform-util-netty:ide-util-netty", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", ] ) ### auto-generated section `build intellij.builtInHelp` end \ No newline at end of file diff --git a/plugins/built-in-help/intellij.builtInHelp.iml b/plugins/built-in-help/intellij.builtInHelp.iml index 1ff734f39263..68c87decb095 100644 --- a/plugins/built-in-help/intellij.builtInHelp.iml +++ b/plugins/built-in-help/intellij.builtInHelp.iml @@ -32,8 +32,8 @@ - - - + + + \ No newline at end of file diff --git a/plugins/compilation-charts/BUILD.bazel b/plugins/compilation-charts/BUILD.bazel index e192b2a9ebda..1c4e9c374eda 100644 --- a/plugins/compilation-charts/BUILD.bazel +++ b/plugins/compilation-charts/BUILD.bazel @@ -25,9 +25,9 @@ jvm_library( "//platform/lang-api:lang", "//platform/lang-core", "//platform/lang-impl", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:rd-core", "@lib//:rd-swing", "@lib//:kotlinx-coroutines-core", diff --git a/plugins/compilation-charts/intellij.compilation.charts.iml b/plugins/compilation-charts/intellij.compilation.charts.iml index 45c985e79aea..705bc6290d76 100644 --- a/plugins/compilation-charts/intellij.compilation.charts.iml +++ b/plugins/compilation-charts/intellij.compilation.charts.iml @@ -19,9 +19,9 @@ - - - + + + diff --git a/plugins/completion-ml-ranking/BUILD.bazel b/plugins/completion-ml-ranking/BUILD.bazel index 170d07f33a23..a7dd01cba585 100644 --- a/plugins/completion-ml-ranking/BUILD.bazel +++ b/plugins/completion-ml-ranking/BUILD.bazel @@ -27,8 +27,8 @@ jvm_library( "//platform/core-ui", "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline", "//libraries/caffeine", - "@lib//:jackson-jr-objects", - "@lib//:jackson", + "//libraries/jackson/jr-objects:libraries-jackson-jr-objects", + "//libraries/jackson/jackson", "//libraries/kotlinx/serialization/json", "//libraries/kotlinx/serialization/core", "@lib//:kotlin-reflect", diff --git a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml index b305adcf3ba2..d0ec7196545a 100644 --- a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml +++ b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml @@ -43,8 +43,8 @@ - - + + diff --git a/plugins/configuration-script/BUILD.bazel b/plugins/configuration-script/BUILD.bazel index a37819e5f58e..668a9b2aa079 100644 --- a/plugins/configuration-script/BUILD.bazel +++ b/plugins/configuration-script/BUILD.bazel @@ -64,7 +64,7 @@ jvm_library( "//platform/configuration-store-impl:configurationStore-impl", "//platform/object-serializer", "//platform/object-serializer:object-serializer_test_lib", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/service-container", "//platform/service-container:service-container_test_lib", "@lib//:snakeyaml-engine", diff --git a/plugins/configuration-script/intellij.configurationScript.iml b/plugins/configuration-script/intellij.configurationScript.iml index 859b70a65e80..601cb1b68c78 100644 --- a/plugins/configuration-script/intellij.configurationScript.iml +++ b/plugins/configuration-script/intellij.configurationScript.iml @@ -30,7 +30,7 @@ - + diff --git a/plugins/evaluation-plugin/core/BUILD.bazel b/plugins/evaluation-plugin/core/BUILD.bazel index 3a64d4087e2f..ae1b7f3d26fb 100644 --- a/plugins/evaluation-plugin/core/BUILD.bazel +++ b/plugins/evaluation-plugin/core/BUILD.bazel @@ -22,7 +22,7 @@ jvm_library( "@lib//:commons-text", "//platform/core-api:core", "//tools/intellij.tools.ide.metrics.collector:ide-metrics-collector", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "//platform/statistics", "//platform/util", "//platform/extensions", diff --git a/plugins/evaluation-plugin/core/intellij.evaluationPlugin.core.iml b/plugins/evaluation-plugin/core/intellij.evaluationPlugin.core.iml index 06dd85864359..107bc3ef1d19 100644 --- a/plugins/evaluation-plugin/core/intellij.evaluationPlugin.core.iml +++ b/plugins/evaluation-plugin/core/intellij.evaluationPlugin.core.iml @@ -16,7 +16,7 @@ - + diff --git a/plugins/git4idea/BUILD.bazel b/plugins/git4idea/BUILD.bazel index 76fdb4dd44e3..709fc75da186 100644 --- a/plugins/git4idea/BUILD.bazel +++ b/plugins/git4idea/BUILD.bazel @@ -66,8 +66,8 @@ jvm_library( "//platform/util", "@lib//:ini4j", "//platform/diff-impl", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//libraries/gson", "@lib//:xz", "@lib//:stream_ex", @@ -170,8 +170,8 @@ jvm_library( "//platform/tasks-platform-api:tasks", "@lib//:assert_j", "//platform/diff-impl", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//libraries/gson", "@lib//:xz", "@lib//:stream_ex", diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml index 8c04bfc87f0c..821a09b7978e 100644 --- a/plugins/git4idea/intellij.vcs.git.iml +++ b/plugins/git4idea/intellij.vcs.git.iml @@ -81,8 +81,8 @@ - - + + diff --git a/plugins/github/github-core/BUILD.bazel b/plugins/github/github-core/BUILD.bazel index b6333a5204aa..7aac98be8d87 100644 --- a/plugins/github/github-core/BUILD.bazel +++ b/plugins/github/github-core/BUILD.bazel @@ -43,7 +43,7 @@ jvm_library( "//platform/vcs-impl", "//platform/platform-impl:ide-impl", "//platform/util", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/dvcs-impl:vcs-dvcs-impl", "//platform/dvcs-api:vcs-dvcs", "//xml/impl", @@ -54,8 +54,8 @@ jvm_library( "//platform/credential-store-ui:credentialStore-ui", "//platform/lang-impl", "@lib//:miglayout-swing", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/editor-ui-api:editor-ui", "//platform/diff-impl", "//platform/statistics", @@ -109,7 +109,7 @@ jvm_library( "//platform/vcs-impl:vcs-impl_test_lib", "//platform/platform-impl:ide-impl", "//platform/util", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/dvcs-impl:vcs-dvcs-impl", "//platform/dvcs-impl:vcs-dvcs-impl_test_lib", "//platform/dvcs-api:vcs-dvcs", @@ -126,8 +126,8 @@ jvm_library( "//platform/credential-store-ui:credentialStore-ui", "//platform/lang-impl", "@lib//:miglayout-swing", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/editor-ui-api:editor-ui", "//platform/diff-impl", "//platform/statistics", diff --git a/plugins/github/github-core/intellij.vcs.github.iml b/plugins/github/github-core/intellij.vcs.github.iml index 5c6809d3a392..9eec1d10bae3 100644 --- a/plugins/github/github-core/intellij.vcs.github.iml +++ b/plugins/github/github-core/intellij.vcs.github.iml @@ -47,7 +47,7 @@ - + @@ -61,8 +61,8 @@ - - + + diff --git a/plugins/gitlab/gitlab-core/BUILD.bazel b/plugins/gitlab/gitlab-core/BUILD.bazel index dfa0c05e8156..278ea2cad07b 100644 --- a/plugins/gitlab/gitlab-core/BUILD.bazel +++ b/plugins/gitlab/gitlab-core/BUILD.bazel @@ -48,10 +48,10 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/dvcs-impl:vcs-dvcs-impl", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "//plugins/git4idea:vcs-git", "//plugins/git4idea/shared", "//platform/vcs-log/impl", @@ -99,11 +99,11 @@ jvm_library( "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", "@lib//:kotlinc-kotlinx-serialization-compiler-plugin-provided", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/dvcs-impl:vcs-dvcs-impl", "//platform/dvcs-impl:vcs-dvcs-impl_test_lib", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "@lib//:junit4", "@lib//:kotlinx-coroutines-test", "@lib//:assert_j", diff --git a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml index a1ef7c18f375..fef6a27723c5 100644 --- a/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml +++ b/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml @@ -53,10 +53,10 @@ - - + + - + diff --git a/plugins/gradle/BUILD.bazel b/plugins/gradle/BUILD.bazel index 45a4aa44c9e7..cd968fc460fb 100644 --- a/plugins/gradle/BUILD.bazel +++ b/plugins/gradle/BUILD.bazel @@ -46,7 +46,7 @@ jvm_library( "@lib//:gradle", "//libraries/gson", "//platform/object-serializer:objectSerializer-annotations", - "@lib//:ion", + "//libraries/ion", "@lib//:stream_ex", "//platform/statistics", "@lib//:fastutil-min", diff --git a/plugins/gradle/gradle-declarative-sync/BUILD.bazel b/plugins/gradle/gradle-declarative-sync/BUILD.bazel index 5ed91ac780ee..41c0e2f77c15 100644 --- a/plugins/gradle/gradle-declarative-sync/BUILD.bazel +++ b/plugins/gradle/gradle-declarative-sync/BUILD.bazel @@ -26,8 +26,8 @@ jvm_library( "//android/gradle-dsl", "//android/gradle-dsl-flags", "//platform/backend/workspace", - "@lib//:jackson-databind", - "@lib//:jackson", + "//libraries/jackson/databind", + "//libraries/jackson/jackson", ] ) ### auto-generated section `build intellij.gradle.declarativeSync` end diff --git a/plugins/gradle/gradle-declarative-sync/intellij.gradle.declarativeSync.iml b/plugins/gradle/gradle-declarative-sync/intellij.gradle.declarativeSync.iml index 6040346cf8eb..c2bc597d8be6 100644 --- a/plugins/gradle/gradle-declarative-sync/intellij.gradle.declarativeSync.iml +++ b/plugins/gradle/gradle-declarative-sync/intellij.gradle.declarativeSync.iml @@ -20,7 +20,7 @@ - - + + \ No newline at end of file diff --git a/plugins/gradle/intellij.gradle.iml b/plugins/gradle/intellij.gradle.iml index 5d2d7520a88e..33a1ee2e8787 100644 --- a/plugins/gradle/intellij.gradle.iml +++ b/plugins/gradle/intellij.gradle.iml @@ -34,7 +34,7 @@ - + diff --git a/plugins/gradle/tooling-extension-impl/BUILD.bazel b/plugins/gradle/tooling-extension-impl/BUILD.bazel index aeec7cd1bf23..e4873b08e6b2 100644 --- a/plugins/gradle/tooling-extension-impl/BUILD.bazel +++ b/plugins/gradle/tooling-extension-impl/BUILD.bazel @@ -31,7 +31,7 @@ jvm_library( "@lib//:gradle", "//libraries/gson", "//platform/object-serializer:objectSerializer-annotations", - "@lib//:ion", + "//libraries/ion", "//platform/util-rt", "@lib//:slf4j-api", "@lib//:slf4j-jdk14", @@ -77,7 +77,7 @@ jvm_library( "@lib//:assert_j", "@lib//:gradle-tooling_extension-tests-io-github-classgraph-classgraph-4-8-87", "@lib//:gradle-tooling_extension-tests-org-jeasy-easy-random-core-4-2-0", - "@lib//:ion", + "//libraries/ion", "//platform/core-api:core", "//platform/lang-core", "//platform/projectModel-api:projectModel", diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml index a6ca8f1ee0ef..308840f70b65 100644 --- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml +++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.impl.iml @@ -33,7 +33,7 @@ - + diff --git a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml index deeb646968ff..70c45d39f318 100644 --- a/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml +++ b/plugins/gradle/tooling-extension-impl/intellij.gradle.toolingExtension.tests.iml @@ -74,7 +74,7 @@ - + diff --git a/plugins/grazie/src/BUILD.bazel b/plugins/grazie/src/BUILD.bazel index c8504cde4fa7..924f10d5e5bb 100644 --- a/plugins/grazie/src/BUILD.bazel +++ b/plugins/grazie/src/BUILD.bazel @@ -15,9 +15,9 @@ jvm_library( resources = [":core_resources"], deps = [ "@lib//:kotlin-stdlib", - "@lib//:jackson-module-kotlin", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "@lib//:slf4j-api", "@lib//:slf4j-jdk14", "@lib//:commons-logging", diff --git a/plugins/grazie/src/intellij.grazie.core.iml b/plugins/grazie/src/intellij.grazie.core.iml index e09174c9db74..7760d28230d7 100644 --- a/plugins/grazie/src/intellij.grazie.core.iml +++ b/plugins/grazie/src/intellij.grazie.core.iml @@ -9,9 +9,9 @@ - - - + + + diff --git a/plugins/ide-startup/importSettings/BUILD.bazel b/plugins/ide-startup/importSettings/BUILD.bazel index de85dbc790bd..bca7e8256969 100644 --- a/plugins/ide-startup/importSettings/BUILD.bazel +++ b/plugins/ide-startup/importSettings/BUILD.bazel @@ -33,8 +33,8 @@ jvm_library( "//platform/util-class-loader:util-classLoader", "//platform/util/jdom", "//platform/statistics", - "@lib//:jackson-databind", - "@lib//:jackson", + "//libraries/jackson/databind", + "//libraries/jackson/jackson", "//platform/observable", "@lib//:miglayout-swing", "//libraries/kotlinx/serialization/json", @@ -78,8 +78,8 @@ jvm_library( "//platform/util/jdom", "//platform/statistics", "//platform/statistics:statistics_test_lib", - "@lib//:jackson-databind", - "@lib//:jackson", + "//libraries/jackson/databind", + "//libraries/jackson/jackson", "//platform/observable", "@lib//:miglayout-swing", "//libraries/kotlinx/serialization/json", diff --git a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml index d5822297e9b3..907b755ccb32 100644 --- a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml +++ b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml @@ -50,8 +50,8 @@ - - + + diff --git a/plugins/java-i18n/BUILD.bazel b/plugins/java-i18n/BUILD.bazel index 2fb02ac58618..24f4e0c98933 100644 --- a/plugins/java-i18n/BUILD.bazel +++ b/plugins/java-i18n/BUILD.bazel @@ -42,7 +42,7 @@ jvm_library( "//jvm/jvm-analysis-api:analysis", "@lib//:stream_ex", "//platform/core-ui", - "@lib//:icu4j", + "//libraries/icu4j", "@lib//:fastutil-min", "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", @@ -98,7 +98,7 @@ jvm_library( "//jvm/jvm-analysis-api:analysis", "@lib//:stream_ex", "//platform/core-ui", - "@lib//:icu4j", + "//libraries/icu4j", "@lib//:fastutil-min", "//java/java-impl-refactorings:impl-refactorings", "//platform/util/jdom", diff --git a/plugins/java-i18n/intellij.java.i18n.iml b/plugins/java-i18n/intellij.java.i18n.iml index a446a9ecdb03..f001964e3e98 100644 --- a/plugins/java-i18n/intellij.java.i18n.iml +++ b/plugins/java-i18n/intellij.java.i18n.iml @@ -44,7 +44,7 @@ - + diff --git a/plugins/kotlin/performance-tests/BUILD.bazel b/plugins/kotlin/performance-tests/BUILD.bazel index 792603a771fe..be482d238673 100644 --- a/plugins/kotlin/performance-tests/BUILD.bazel +++ b/plugins/kotlin/performance-tests/BUILD.bazel @@ -78,9 +78,9 @@ jvm_library( "//platform/vcs-impl:vcs-impl_test_lib", "//plugins/gradle:gradle-common", "//plugins/kotlin/performance-tests/performance-test-utils:performance-test-utils_test_lib", - "@lib//:jackson-databind", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/databind", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:okhttp", "//plugins/kotlin/j2k/shared/tests:tests_test_lib", "//plugins/kotlin/j2k/shared", diff --git a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml index 3e8eea9d2bfe..422b54e24648 100644 --- a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml +++ b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml @@ -63,9 +63,9 @@ - - - + + + diff --git a/plugins/kotlin/performance-tests/performance-test-utils/BUILD.bazel b/plugins/kotlin/performance-tests/performance-test-utils/BUILD.bazel index da00652a5ef2..9c776aa619d9 100644 --- a/plugins/kotlin/performance-tests/performance-test-utils/BUILD.bazel +++ b/plugins/kotlin/performance-tests/performance-test-utils/BUILD.bazel @@ -57,9 +57,9 @@ jvm_library( "//platform/vcs-impl", "//platform/vcs-impl:vcs-impl_test_lib", "//plugins/gradle:gradle-common", - "@lib//:jackson-databind", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/databind", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:okhttp", ], runtime_deps = ["//plugins/kotlin/compiler-plugins/lombok/gradle"] diff --git a/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml b/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml index 040e4aa9b145..49f1d5724c18 100644 --- a/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml +++ b/plugins/kotlin/performance-tests/performance-test-utils/kotlin.performance-tests.performance-test-utils.iml @@ -49,9 +49,9 @@ - - - + + + \ No newline at end of file diff --git a/plugins/kotlin/project-wizard/gradle/BUILD.bazel b/plugins/kotlin/project-wizard/gradle/BUILD.bazel index c6356e7637a8..bdea89a39766 100644 --- a/plugins/kotlin/project-wizard/gradle/BUILD.bazel +++ b/plugins/kotlin/project-wizard/gradle/BUILD.bazel @@ -36,9 +36,9 @@ jvm_library( "//plugins/kotlin/base/project-structure", "//plugins/kotlin/base/util", "//plugins/kotlin/gradle/gradle-tooling/impl", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "@lib//:jackson-dataformat-toml", - "@lib//:jackson", + "//libraries/jackson/jackson", ] ) ### auto-generated section `build kotlin.project-wizard.gradle` end \ No newline at end of file diff --git a/plugins/kotlin/project-wizard/gradle/kotlin.project-wizard.gradle.iml b/plugins/kotlin/project-wizard/gradle/kotlin.project-wizard.gradle.iml index f8904e0eed7e..7a7ce6b58b28 100644 --- a/plugins/kotlin/project-wizard/gradle/kotlin.project-wizard.gradle.iml +++ b/plugins/kotlin/project-wizard/gradle/kotlin.project-wizard.gradle.iml @@ -30,8 +30,8 @@ - + - + \ No newline at end of file diff --git a/plugins/markdown/core/BUILD.bazel b/plugins/markdown/core/BUILD.bazel index 0522ff47a706..b934e69d1cc0 100644 --- a/plugins/markdown/core/BUILD.bazel +++ b/plugins/markdown/core/BUILD.bazel @@ -42,9 +42,9 @@ jvm_library( "@lib//:jetbrains-markdown", "//platform/platform-util-io:ide-util-io", "//platform/platform-util-netty:ide-util-netty", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/execution-impl", "@lib//:miglayout-swing", "//platform/platform-api:ide", diff --git a/plugins/markdown/core/intellij.markdown.iml b/plugins/markdown/core/intellij.markdown.iml index 94eafa3569f5..6002fb9066ed 100644 --- a/plugins/markdown/core/intellij.markdown.iml +++ b/plugins/markdown/core/intellij.markdown.iml @@ -62,9 +62,9 @@ - - - + + + diff --git a/plugins/performanceTesting/commands-model/BUILD.bazel b/plugins/performanceTesting/commands-model/BUILD.bazel index ba961f4aa42b..9f2c2d2ea082 100644 --- a/plugins/performanceTesting/commands-model/BUILD.bazel +++ b/plugins/performanceTesting/commands-model/BUILD.bazel @@ -9,9 +9,9 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "@lib//:kotlin-reflect", - "@lib//:jackson-module-kotlin", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", ] ) ### auto-generated section `build intellij.tools.ide.performanceTesting.commands` end \ No newline at end of file diff --git a/plugins/performanceTesting/commands-model/intellij.tools.ide.performanceTesting.commands.iml b/plugins/performanceTesting/commands-model/intellij.tools.ide.performanceTesting.commands.iml index 8b5947238cc9..b24984922854 100644 --- a/plugins/performanceTesting/commands-model/intellij.tools.ide.performanceTesting.commands.iml +++ b/plugins/performanceTesting/commands-model/intellij.tools.ide.performanceTesting.commands.iml @@ -9,8 +9,8 @@ - - - + + + \ No newline at end of file diff --git a/plugins/performanceTesting/core/BUILD.bazel b/plugins/performanceTesting/core/BUILD.bazel index 48aaedddeb15..a117ad2e0d03 100644 --- a/plugins/performanceTesting/core/BUILD.bazel +++ b/plugins/performanceTesting/core/BUILD.bazel @@ -30,11 +30,11 @@ jvm_library( "//platform/projectModel-api:projectModel", "//platform/platform-impl/concurrency", "//platform/usageView", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/refactoring", "//platform/analysis-impl", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "//platform/editor-ui-ex:editor-ex", "//platform/ide-core-impl", "//platform/core-ui", @@ -90,11 +90,11 @@ jvm_library( "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/usageView", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/refactoring", "//platform/analysis-impl", - "@lib//:jackson-databind", + "//libraries/jackson/databind", "//platform/editor-ui-ex:editor-ex", "//platform/ide-core-impl", "//platform/core-ui", diff --git a/plugins/performanceTesting/core/intellij.performanceTesting.iml b/plugins/performanceTesting/core/intellij.performanceTesting.iml index d37c2859876d..41831e10736b 100644 --- a/plugins/performanceTesting/core/intellij.performanceTesting.iml +++ b/plugins/performanceTesting/core/intellij.performanceTesting.iml @@ -26,11 +26,11 @@ - - + + - + diff --git a/plugins/performanceTesting/event-bus/BUILD.bazel b/plugins/performanceTesting/event-bus/BUILD.bazel index 3a56e73a4524..78b27287b7ed 100644 --- a/plugins/performanceTesting/event-bus/BUILD.bazel +++ b/plugins/performanceTesting/event-bus/BUILD.bazel @@ -16,9 +16,9 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", + "//libraries/jackson/databind", "@lib//:kotlin-reflect", ] ) @@ -32,9 +32,9 @@ jvm_library( "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", "@lib//:junit5", - "@lib//:jackson", - "@lib//:jackson-module-kotlin", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", + "//libraries/jackson/databind", "@lib//:kotlin-reflect", ] ) diff --git a/plugins/performanceTesting/event-bus/intellij.tools.ide.starter.bus.iml b/plugins/performanceTesting/event-bus/intellij.tools.ide.starter.bus.iml index 8b787c91c44b..3cd0831b7044 100644 --- a/plugins/performanceTesting/event-bus/intellij.tools.ide.starter.bus.iml +++ b/plugins/performanceTesting/event-bus/intellij.tools.ide.starter.bus.iml @@ -12,9 +12,9 @@ - - - + + + \ No newline at end of file diff --git a/plugins/repository-search/BUILD.bazel b/plugins/repository-search/BUILD.bazel index 96efd70e9b2f..6be972316f63 100644 --- a/plugins/repository-search/BUILD.bazel +++ b/plugins/repository-search/BUILD.bazel @@ -46,7 +46,7 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", - "@lib//:kotlinx-coroutines-slf4j", + "//libraries/kotlinx/coroutines/slf4j", "//libraries/io", "//libraries/ktor/client", "@lib//:package-search-api-client", @@ -84,7 +84,7 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "//libraries/kotlinx/serialization/core", "//libraries/kotlinx/serialization/json", - "@lib//:kotlinx-coroutines-slf4j", + "//libraries/kotlinx/coroutines/slf4j", "@lib//:ktor-client-mock", "@lib//:kotlinx-coroutines-test", "//libraries/io", diff --git a/plugins/repository-search/intellij.repository.search.iml b/plugins/repository-search/intellij.repository.search.iml index 851799625176..b2d8d4ccae0d 100644 --- a/plugins/repository-search/intellij.repository.search.iml +++ b/plugins/repository-search/intellij.repository.search.iml @@ -49,7 +49,7 @@ - + diff --git a/plugins/search-everywhere-ml/ranking/core/BUILD.bazel b/plugins/search-everywhere-ml/ranking/core/BUILD.bazel index f0030307d9eb..0ec8e16cbddc 100644 --- a/plugins/search-everywhere-ml/ranking/core/BUILD.bazel +++ b/plugins/search-everywhere-ml/ranking/core/BUILD.bazel @@ -15,9 +15,9 @@ jvm_library( resources = [":core_resources"], deps = [ "@lib//:kotlin-stdlib", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/analysis-api:analysis", "//platform/util/concurrency", "//platform/core-api:core", @@ -57,9 +57,9 @@ jvm_library( associates = [":core"], deps = [ "@lib//:kotlin-stdlib", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/analysis-api:analysis", "//platform/util/concurrency", "//platform/util/concurrency:concurrency_test_lib", diff --git a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml index 96576662fc4a..1a8556547498 100644 --- a/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml +++ b/plugins/search-everywhere-ml/ranking/core/intellij.searchEverywhereMl.ranking.core.iml @@ -10,9 +10,9 @@ - - - + + + diff --git a/plugins/settings-repository/BUILD.bazel b/plugins/settings-repository/BUILD.bazel index 7bb26eb615c3..a591fe1b4674 100644 --- a/plugins/settings-repository/BUILD.bazel +++ b/plugins/settings-repository/BUILD.bazel @@ -33,8 +33,8 @@ jvm_library( "//platform/util/progress", "//platform/credential-store-ui:credentialStore-ui", "//platform/core-impl", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "@lib//:kotlinx-coroutines-core", "//platform/vcs-api:vcs", "//platform/statistics", diff --git a/plugins/settings-repository/intellij.settingsRepository.iml b/plugins/settings-repository/intellij.settingsRepository.iml index 82cbbac841a5..34e9cc84162d 100644 --- a/plugins/settings-repository/intellij.settingsRepository.iml +++ b/plugins/settings-repository/intellij.settingsRepository.iml @@ -65,8 +65,8 @@ - - + + diff --git a/plugins/textmate/BUILD.bazel b/plugins/textmate/BUILD.bazel index 6838fd460c07..2b2537b78a96 100644 --- a/plugins/textmate/BUILD.bazel +++ b/plugins/textmate/BUILD.bazel @@ -26,8 +26,8 @@ jvm_library( "//plugins/textmate/joni", "//platform/core-ui", "//platform/editor-ui-ex:editor-ex", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//platform/platform-impl:ide-impl", "//libraries/kotlinx/serialization/core", "//platform/code-style-impl:codeStyle-impl", diff --git a/plugins/textmate/intellij.textmate.iml b/plugins/textmate/intellij.textmate.iml index 48dec2454d09..0738e990c7d8 100644 --- a/plugins/textmate/intellij.textmate.iml +++ b/plugins/textmate/intellij.textmate.iml @@ -42,8 +42,8 @@ - - + + diff --git a/python/BUILD.bazel b/python/BUILD.bazel index 8c769fac2bc5..4dc0c97117d8 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -311,8 +311,8 @@ jvm_library( "//libraries/kotlinx/serialization/json", "//libraries/kotlinx/serialization/core", "@lib//:jackson-dataformat-yaml", - "@lib//:jackson", - "@lib//:jackson-databind", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", "//python/python-core-impl:community-core-impl", "//platform/core-api:core", "//python/python-psi-api:psi", @@ -330,7 +330,7 @@ jvm_library( "@lib//:kotlinx-datetime-jvm", "//platform/platform-impl/remote", "//platform/platform-impl/ui", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//python/poetry", "//python/installer", "//platform/eel", diff --git a/python/huggingFace/BUILD.bazel b/python/huggingFace/BUILD.bazel index 574d8d50622d..ee5694973cc1 100644 --- a/python/huggingFace/BUILD.bazel +++ b/python/huggingFace/BUILD.bazel @@ -16,9 +16,9 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "@lib//:gradle", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/analysis-api:analysis", "//platform/core-api:core", "//platform/core-impl", diff --git a/python/huggingFace/intellij.python.community.impl.huggingFace.iml b/python/huggingFace/intellij.python.community.impl.huggingFace.iml index 3f23b1a0acbb..d5627d9cb4a3 100644 --- a/python/huggingFace/intellij.python.community.impl.huggingFace.iml +++ b/python/huggingFace/intellij.python.community.impl.huggingFace.iml @@ -11,9 +11,9 @@ - - - + + + diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml index 0d70a586f593..3d877b87d640 100644 --- a/python/intellij.python.community.impl.iml +++ b/python/intellij.python.community.impl.iml @@ -130,8 +130,8 @@ - - + + @@ -167,7 +167,7 @@ - + diff --git a/python/python-sdk/BUILD.bazel b/python/python-sdk/BUILD.bazel index 5ba485bcb65a..1ff5e3ad59d1 100644 --- a/python/python-sdk/BUILD.bazel +++ b/python/python-sdk/BUILD.bazel @@ -42,9 +42,9 @@ jvm_library( "//platform/remote-core", "@lib//:jna", "//libraries/caffeine", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/progress/shared:ide-progress", "//platform/eel-provider", "//python/impl.helperLocator:community-helpersLocator", @@ -83,9 +83,9 @@ jvm_library( "@lib//:jna", "@lib//:junit4", "//libraries/caffeine", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/progress/shared:ide-progress", "@lib//:junit5", "//platform/eel-provider", diff --git a/python/python-sdk/intellij.python.sdk.iml b/python/python-sdk/intellij.python.sdk.iml index ffc5bf40027c..ad1dc8d20fb2 100644 --- a/python/python-sdk/intellij.python.sdk.iml +++ b/python/python-sdk/intellij.python.sdk.iml @@ -33,9 +33,9 @@ - - - + + + diff --git a/tools/intellij.tools.ide.metrics.benchmark/BUILD.bazel b/tools/intellij.tools.ide.metrics.benchmark/BUILD.bazel index e1c96d564972..4c3d705834c3 100644 --- a/tools/intellij.tools.ide.metrics.benchmark/BUILD.bazel +++ b/tools/intellij.tools.ide.metrics.benchmark/BUILD.bazel @@ -21,9 +21,9 @@ jvm_library( resources = [":ide-metrics-benchmark_resources"], deps = [ "@lib//:kotlin-stdlib", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/core-api:core", "//platform/diagnostic/telemetry", "//tools/intellij.tools.ide.metrics.collector:ide-metrics-collector", @@ -43,9 +43,9 @@ jvm_library( associates = [":ide-metrics-benchmark"], deps = [ "@lib//:kotlin-stdlib", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/core-api:core", "//platform/diagnostic/telemetry", "//platform/diagnostic/telemetry:telemetry_test_lib", diff --git a/tools/intellij.tools.ide.metrics.benchmark/intellij.tools.ide.metrics.benchmark.iml b/tools/intellij.tools.ide.metrics.benchmark/intellij.tools.ide.metrics.benchmark.iml index 5cadf2087600..6487fa03ebaf 100644 --- a/tools/intellij.tools.ide.metrics.benchmark/intellij.tools.ide.metrics.benchmark.iml +++ b/tools/intellij.tools.ide.metrics.benchmark/intellij.tools.ide.metrics.benchmark.iml @@ -11,9 +11,9 @@ - - - + + + diff --git a/tools/intellij.tools.ide.metrics.collector/BUILD.bazel b/tools/intellij.tools.ide.metrics.collector/BUILD.bazel index be73bd8f920f..4b69ffdde7f3 100644 --- a/tools/intellij.tools.ide.metrics.collector/BUILD.bazel +++ b/tools/intellij.tools.ide.metrics.collector/BUILD.bazel @@ -22,10 +22,10 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/core-api:core", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/util", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//platform/diagnostic/telemetry", "//platform/diagnostic/telemetry.exporters", "@lib//:opentelemetry", @@ -47,10 +47,10 @@ jvm_library( deps = [ "@lib//:kotlin-stdlib", "//platform/core-api:core", - "@lib//:jackson", + "//libraries/jackson/jackson", "//platform/util", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "@lib//:kotlin-test-assertions-core-jvm", "@lib//:junit5", "//libraries/mockito", diff --git a/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml b/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml index cd4f129e899c..37cc0f5d93dd 100644 --- a/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml +++ b/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml @@ -33,10 +33,10 @@ - + - - + + diff --git a/xml/tests/BUILD.bazel b/xml/tests/BUILD.bazel index a3e9145baa88..ef2a9043f194 100644 --- a/xml/tests/BUILD.bazel +++ b/xml/tests/BUILD.bazel @@ -57,7 +57,7 @@ jvm_library( "//platform/core-ui", "@lib//:assert_j", "//libraries/guava", - "@lib//:jackson", + "//libraries/jackson/jackson", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", "//platform/polySymbols:polySymbols-testFramework", diff --git a/xml/tests/intellij.xml.tests.iml b/xml/tests/intellij.xml.tests.iml index 255e2fb4d853..bb9ac84cf452 100644 --- a/xml/tests/intellij.xml.tests.iml +++ b/xml/tests/intellij.xml.tests.iml @@ -42,7 +42,7 @@ - + diff --git a/xml/xml-psi-impl/BUILD.bazel b/xml/xml-psi-impl/BUILD.bazel index 7c42c5bb1cbb..9937ad912631 100644 --- a/xml/xml-psi-impl/BUILD.bazel +++ b/xml/xml-psi-impl/BUILD.bazel @@ -38,9 +38,9 @@ jvm_library( "@lib//:xml-resolver", "//platform/util:util-ui", "@lib//:fastutil-min", - "@lib//:jackson", - "@lib//:jackson-databind", - "@lib//:jackson-module-kotlin", + "//libraries/jackson/jackson", + "//libraries/jackson/databind", + "//libraries/jackson/module-kotlin:libraries-jackson-module-kotlin", "//libraries/caffeine", "//platform/util/jdom", "//platform/markdown-utils", diff --git a/xml/xml-psi-impl/intellij.xml.psi.impl.iml b/xml/xml-psi-impl/intellij.xml.psi.impl.iml index 7431f47aa649..fa88c95df9fe 100644 --- a/xml/xml-psi-impl/intellij.xml.psi.impl.iml +++ b/xml/xml-psi-impl/intellij.xml.psi.impl.iml @@ -26,9 +26,9 @@ - - - + + +