From 87a647c4b1af76206d57e475ef044db81a5c9875 Mon Sep 17 00:00:00 2001
From: Maria Filipanova <maria.filipanova@jetbrains.com>
Date: Wed, 9 Jul 2025 12:39:17 +0200
Subject: [PATCH] IJPL-185506: register images content modules in images,
 change xml dependency to module one

GitOrigin-RevId: d0b8f8abcef437642ae28e7e7f6496f99d6986b2
---
 .../resources/intellij.platform.images.backend.svg.xml       | 3 +--
 .../resources/intellij.platform.images.copyright.xml         | 1 -
 images/plugin-content.yaml                                   | 5 ++++-
 images/resources/META-INF/plugin.xml                         | 5 +++++
 .../platform-resources/src/META-INF/common-ide-modules.xml   | 2 --
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/images/backend.svg/resources/intellij.platform.images.backend.svg.xml b/images/backend.svg/resources/intellij.platform.images.backend.svg.xml
index 74556a811461..28fe8c1ef764 100644
--- a/images/backend.svg/resources/intellij.platform.images.backend.svg.xml
+++ b/images/backend.svg/resources/intellij.platform.images.backend.svg.xml
@@ -1,8 +1,7 @@
 <idea-plugin package="com.intellij.platform.images.backend.svg">
   <dependencies>
-    <plugin id="com.intellij.modules.xml"/>
+    <module name="intellij.xml.psi.impl"/>
     <plugin id="com.intellij.modules.lang"/>
-    <plugin id="com.intellij.platform.images"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <lang.parserDefinition language="SVG" implementationClass="com.intellij.platform.images.backend.svg.SvgParserDefinition"/>
diff --git a/images/intellij.platform.images.copyright/resources/intellij.platform.images.copyright.xml b/images/intellij.platform.images.copyright/resources/intellij.platform.images.copyright.xml
index f857a23d0481..c5520c13ab33 100644
--- a/images/intellij.platform.images.copyright/resources/intellij.platform.images.copyright.xml
+++ b/images/intellij.platform.images.copyright/resources/intellij.platform.images.copyright.xml
@@ -1,6 +1,5 @@
 <idea-plugin package="org.intellij.images.copyright">
   <dependencies>
-    <plugin id="com.intellij.platform.images"/>
     <plugin id="com.intellij.copyright"/>
   </dependencies>
 
diff --git a/images/plugin-content.yaml b/images/plugin-content.yaml
index 334c6197e253..0492cce77887 100644
--- a/images/plugin-content.yaml
+++ b/images/plugin-content.yaml
@@ -1,3 +1,6 @@
 - name: lib/platform-images.jar
   modules:
-  - name: intellij.platform.images
\ No newline at end of file
+  - name: intellij.platform.images
+  contentModules:
+  - name: intellij.platform.images.copyright
+  - name: intellij.platform.images.backend.svg
\ No newline at end of file
diff --git a/images/resources/META-INF/plugin.xml b/images/resources/META-INF/plugin.xml
index 90fd5bc3a8a6..deacd41d7968 100644
--- a/images/resources/META-INF/plugin.xml
+++ b/images/resources/META-INF/plugin.xml
@@ -10,6 +10,11 @@
     <plugin id="com.intellij.modules.lang"/>
   </dependencies>
 
+  <content>
+    <module name="intellij.platform.images.copyright"/>
+    <module name="intellij.platform.images.backend.svg"/>
+  </content>
+
   <extensions defaultExtensionNs="com.intellij">
     <fileEditorProvider implementation="org.intellij.images.editor.impl.ImageFileEditorProvider"/>
     <colorSettingsPage implementation="org.intellij.images.options.impl.ImageEditorColorSchemeSettings"/>
diff --git a/platform/platform-resources/src/META-INF/common-ide-modules.xml b/platform/platform-resources/src/META-INF/common-ide-modules.xml
index d0febd9bec6c..c2ddaaf4f057 100644
--- a/platform/platform-resources/src/META-INF/common-ide-modules.xml
+++ b/platform/platform-resources/src/META-INF/common-ide-modules.xml
@@ -2,8 +2,6 @@
   <xi:include href="/META-INF/essential-modules.xml"/>
 
   <content>
-    <module name="intellij.platform.images.copyright"/>
-    <module name="intellij.platform.images.backend.svg"/>
     <module name="intellij.platform.lvcs.impl"/>
     <module name="intellij.platform.smRunner.vcs"/>
     <module name="intellij.platform.collaborationTools"/>