From b70b40637de735b2beabee2dc575134128eb7eb9 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 11 Jun 2026 19:21:47 +0200 Subject: [PATCH] IJPL-246783 Move Jackson Joda datatype into wrapper plugin Jackson Joda datatype depends on internal Jackson modules, so keep it in the JetBrains namespace instead of converting it to private unnamed plugin content. Register a small bundled wrapper plugin and remove the content module from the aggregate Jackson module set so products include it through normal plugin wiring. Update generated module-set descriptors and packaging snapshots to match. IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 IJ-MR-193195 IJ-MR-196957 IJ-MR-199124 IJ-MR-197441 IJ-MR-204135 IJ-MR-204674 IJ-MR-205883 GitOrigin-RevId: 960467a3f07d1fee9dc0bef31fcecf7b18251708 --- libraries/jackson/datatype-joda/BUILD.bazel | 12 ++---------- .../intellij.libraries.jackson.datatype.joda.iml | 1 - .../intellij.libraries.jackson.datatype.joda.xml | 13 +++++++------ .../intellij/build/productLayout/CoreModuleSets.kt | 1 - .../META-INF/intellij.moduleSets.core.platform.xml | 1 - .../META-INF/intellij.moduleSets.core.ide.xml | 1 - .../META-INF/intellij.moduleSets.core.lang.xml | 1 - .../intellij.moduleSets.essential.minimal.xml | 1 - .../META-INF/intellij.moduleSets.essential.xml | 1 - .../META-INF/intellij.moduleSets.ide.common.xml | 1 - .../intellij.moduleSets.libraries.jackson2.xml | 1 - .../intellij.moduleSets.libraries.platform.xml | 1 - 12 files changed, 9 insertions(+), 26 deletions(-) diff --git a/libraries/jackson/datatype-joda/BUILD.bazel b/libraries/jackson/datatype-joda/BUILD.bazel index a35f79df370f..afe0199dd44d 100644 --- a/libraries/jackson/datatype-joda/BUILD.bazel +++ b/libraries/jackson/datatype-joda/BUILD.bazel @@ -15,11 +15,7 @@ jvm_library( ), visibility = ["//visibility:public"], exports = ["@lib//:libraries-jackson-datatype-joda-jackson-datatype-joda"], - runtime_deps = [ - # do not sort, - "@lib//:libraries-jackson-datatype-joda-jackson-datatype-joda", - "//libraries/jackson/jackson", - ], + runtime_deps = ["@lib//:libraries-jackson-datatype-joda-jackson-datatype-joda"], ) jvm_library( @@ -33,11 +29,7 @@ jvm_library( module_name = "intellij.libraries.jackson.datatype.joda", visibility = ["//visibility:public"], exports = ["@lib//:libraries-jackson-datatype-joda-jackson-datatype-joda"], - runtime_deps = [ - # do not sort, - ":libraries-jackson-datatype-joda", - "//libraries/jackson/jackson:jackson_test_lib", - ], + runtime_deps = [":libraries-jackson-datatype-joda"], ) ### auto-generated section `build intellij.libraries.jackson.datatype.joda` end diff --git a/libraries/jackson/datatype-joda/intellij.libraries.jackson.datatype.joda.iml b/libraries/jackson/datatype-joda/intellij.libraries.jackson.datatype.joda.iml index dc0bba92c747..0e8e5a59b179 100644 --- a/libraries/jackson/datatype-joda/intellij.libraries.jackson.datatype.joda.iml +++ b/libraries/jackson/datatype-joda/intellij.libraries.jackson.datatype.joda.iml @@ -35,6 +35,5 @@ - \ No newline at end of file diff --git a/libraries/jackson/datatype-joda/resources/intellij.libraries.jackson.datatype.joda.xml b/libraries/jackson/datatype-joda/resources/intellij.libraries.jackson.datatype.joda.xml index f848860edf0e..68b7f4cc3850 100644 --- a/libraries/jackson/datatype-joda/resources/intellij.libraries.jackson.datatype.joda.xml +++ b/libraries/jackson/datatype-joda/resources/intellij.libraries.jackson.datatype.joda.xml @@ -1,7 +1,8 @@ - - - - - - + + \ No newline at end of file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt index 7ae656be34c4..2b7a106eaec7 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CoreModuleSets.kt @@ -153,7 +153,6 @@ object CoreModuleSets { module("intellij.libraries.jackson.dataformat.toml") module("intellij.libraries.jackson.datatype.jdk8") - module("intellij.libraries.jackson.datatype.joda") module("intellij.libraries.jackson.datatype.jsr310") embeddedModule("intellij.libraries.jackson.module.kotlin") diff --git a/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml b/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml index f69133bcf6a8..7946c30ef53c 100644 --- a/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml +++ b/platform/ide-core/resources/META-INF/intellij.moduleSets.core.platform.xml @@ -14,7 +14,6 @@ - diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml index 785be024f4d1..ffff8debcc2b 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.ide.xml @@ -15,7 +15,6 @@ - diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml index 314b0ed1488c..217e356ae7c6 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.core.lang.xml @@ -16,7 +16,6 @@ - diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml index 7fff4d92ce5f..bd76c933e284 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.minimal.xml @@ -17,7 +17,6 @@ - diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml index aba1f9c33c2e..2d2c70c97c62 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml @@ -18,7 +18,6 @@ - diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml index 0ad460ec70ee..81ab4cda4892 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml @@ -21,7 +21,6 @@ - diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.jackson2.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.jackson2.xml index 760f010ea793..7959aed2f85f 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.jackson2.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.jackson2.xml @@ -12,7 +12,6 @@ - diff --git a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml index 8a65a4f18cbb..ae02294d1da7 100644 --- a/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml +++ b/platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.platform.xml @@ -13,7 +13,6 @@ -