IJPL-209476 extract intellij.tasks.jira, fix xml-rpc bundling for python

GitOrigin-RevId: bcbd2885afc54f653403515f5f815da2ed32a6e3
2026-04-20 13:31:28 +07:00 · 2025-10-06 19:18:45 +02:00
parent 807be9b250
commit 641682ce04
37 changed files with 258 additions and 189 deletions
--- a/.idea/libraries/XStream.xml
+++ b/.idea/libraries/XStream.xml
@@ -1,31 +0,0 @@
-<component name="libraryTable">
-  <library name="XStream" type="repository">
-    <properties maven-id="com.thoughtworks.xstream:xstream:1.4.21">
-      <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21.jar">
-          <sha256sum>f56586f3de59ae2a49430acbc9f27942b8c5cebec9245c869fae7136733333ec</sha256sum>
-        </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2.jar">
-          <sha256sum>aeeee23a3303d811bca8790ea7f25b534314861c03cff36dafdcc2180969eb97</sha256sum>
-        </artifact>
-        <artifact url="file://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar">
-          <sha256sum>34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63</sha256sum>
-        </artifact>
-      </verification>
-      <exclude>
-        <dependency maven-id="xml-apis:xml-apis" />
-        <dependency maven-id="xerces:xercesImpl" />
-      </exclude>
-    </properties>
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
--- a/.idea/libraries/XmlRPC.xml
+++ b/.idea/libraries/XmlRPC.xml
@@ -1,18 +0,0 @@
-<component name="libraryTable">
-  <library name="XmlRPC" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.apache.ws.xmlrpc:xmlrpc:2.0.1">
-      <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1.jar">
-          <sha256sum>36efda6efee96e83602c9ba246db19bf4c5e733324390d2fa8213417d6b681e7</sha256sum>
-        </artifact>
-      </verification>
-    </properties>
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -683,6 +683,8 @@
      <module fileurl="file://$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" filepath="$PROJECT_DIR$/libraries/testng/intellij.libraries.testng.iml" />
      <module fileurl="file://$PROJECT_DIR$/libraries/winp/intellij.libraries.winp.iml" filepath="$PROJECT_DIR$/libraries/winp/intellij.libraries.winp.iml" />
      <module fileurl="file://$PROJECT_DIR$/libraries/xerces/intellij.libraries.xerces.iml" filepath="$PROJECT_DIR$/libraries/xerces/intellij.libraries.xerces.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/xml-rpc/intellij.libraries.xml.rpc.iml" filepath="$PROJECT_DIR$/libraries/xml-rpc/intellij.libraries.xml.rpc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/xstream/intellij.libraries.xstream.iml" filepath="$PROJECT_DIR$/libraries/xstream/intellij.libraries.xstream.iml" />
      <module fileurl="file://$PROJECT_DIR$/libraries/xz/intellij.libraries.xz.iml" filepath="$PROJECT_DIR$/libraries/xz/intellij.libraries.xz.iml" />
      <module fileurl="file://$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" filepath="$PROJECT_DIR$/plugins/lombok/intellij.lombok.iml" />
      <module fileurl="file://$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" filepath="$PROJECT_DIR$/plugins/lombok/generated/intellij.lombok.generated.iml" />
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -394,6 +394,8 @@ libraries/testcontainers
 libraries/testng
 libraries/winp
 libraries/xerces
+libraries/xml-rpc
+libraries/xstream
 libraries/xz
 notebooks/notebook-ui
 notebooks/visualization
--- a/lib/BUILD.bazel
+++ b/lib/BUILD.bazel
@@ -5241,6 +5241,40 @@ jvm_import(
  visibility = ["//visibility:public"]
 )

+jvm_import(
+  name = "libraries-xml-rpc-xml-rpc",
+  jar = "@org_apache_ws_xmlrpc-xmlrpc-2_0_1_http//file",
+  source_jar = "@org_apache_ws_xmlrpc-xmlrpc-2_0_1_http//file",
+  visibility = ["//visibility:public"]
+)
+
+java_library(
+  name = "libraries-xstream-xstream",
+  exports = [
+    ":com_thoughtworks_xstream-xstream-1_4_21_http_import",
+    ":io_github_x-stream-mxparser-1_2_2_http_import",
+    ":xmlpull-xmlpull-1_1_3_1_http_import",
+  ],
+  visibility = ["//visibility:public"]
+)
+
+jvm_import(
+  name = "com_thoughtworks_xstream-xstream-1_4_21_http_import",
+  jar = "@com_thoughtworks_xstream-xstream-1_4_21_http//file",
+  source_jar = "@com_thoughtworks_xstream-xstream-1_4_21_http//file"
+)
+
+jvm_import(
+  name = "io_github_x-stream-mxparser-1_2_2_http_import",
+  jar = "@io_github_x-stream-mxparser-1_2_2_http//file",
+  source_jar = "@io_github_x-stream-mxparser-1_2_2_http//file"
+)
+
+jvm_import(
+  name = "xmlpull-xmlpull-1_1_3_1_http_import",
+  jar = "@xmlpull-xmlpull-1_1_3_1_http//file"
+)
+
 jvm_import(
  name = "libthrift",
  jar = "@org_apache_thrift-libthrift-0_19_0_http//file",
@@ -9540,33 +9574,6 @@ jvm_import(
  visibility = ["//visibility:public"]
 )

-java_library(
-  name = "x_stream",
-  exports = [
-    ":com_thoughtworks_xstream-xstream-1_4_21_http_import",
-    ":io_github_x-stream-mxparser-1_2_2_http_import",
-    ":xmlpull-xmlpull-1_1_3_1_http_import",
-  ],
-  visibility = ["//visibility:public"]
-)
-
-jvm_import(
-  name = "com_thoughtworks_xstream-xstream-1_4_21_http_import",
-  jar = "@com_thoughtworks_xstream-xstream-1_4_21_http//file",
-  source_jar = "@com_thoughtworks_xstream-xstream-1_4_21_http//file"
-)
-
-jvm_import(
-  name = "io_github_x-stream-mxparser-1_2_2_http_import",
-  jar = "@io_github_x-stream-mxparser-1_2_2_http//file",
-  source_jar = "@io_github_x-stream-mxparser-1_2_2_http//file"
-)
-
-jvm_import(
-  name = "xmlpull-xmlpull-1_1_3_1_http_import",
-  jar = "@xmlpull-xmlpull-1_1_3_1_http//file"
-)
-
 jvm_import(
  name = "xml-resolver",
  jar = "@xml-resolver-xml-resolver-1_2_http//file",
@@ -9602,13 +9609,6 @@ jvm_import(
  source_jar = "@org_apache_logging_log4j-log4j-api-2_20_0_http//file"
 )

-jvm_import(
-  name = "xml_r_p_c",
-  jar = "@org_apache_ws_xmlrpc-xmlrpc-2_0_1_http//file",
-  source_jar = "@org_apache_ws_xmlrpc-xmlrpc-2_0_1_http//file",
-  visibility = ["//visibility:public"]
-)
-
 jvm_import(
  name = "xslt-debugger-impl-rt-_serializer-2-7-3",
  jar = "@xalan-serializer-2_7_3_http//file",
--- a/lib/MODULE.bazel
+++ b/lib/MODULE.bazel
@@ -7524,6 +7524,55 @@ http_file(
  downloaded_file_path = "xercesImpl-2.12.2-sources.jar"
 )

+http_file(
+  name = "org_apache_ws_xmlrpc-xmlrpc-2_0_1_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1.jar",
+  sha256 = "36efda6efee96e83602c9ba246db19bf4c5e733324390d2fa8213417d6b681e7",
+  downloaded_file_path = "xmlrpc-2.0.1.jar"
+)
+
+http_file(
+  name = "org_apache_ws_xmlrpc-xmlrpc-2_0_1-sources_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1-sources.jar",
+  sha256 = "34d3755800c35568aab53447c576d3ab8fb63e6e9df32d6acb1fe7187bf5383c",
+  downloaded_file_path = "xmlrpc-2.0.1-sources.jar"
+)
+
+http_file(
+  name = "com_thoughtworks_xstream-xstream-1_4_21_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21.jar",
+  sha256 = "f56586f3de59ae2a49430acbc9f27942b8c5cebec9245c869fae7136733333ec",
+  downloaded_file_path = "xstream-1.4.21.jar"
+)
+
+http_file(
+  name = "io_github_x-stream-mxparser-1_2_2_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2.jar",
+  sha256 = "aeeee23a3303d811bca8790ea7f25b534314861c03cff36dafdcc2180969eb97",
+  downloaded_file_path = "mxparser-1.2.2.jar"
+)
+
+http_file(
+  name = "xmlpull-xmlpull-1_1_3_1_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar",
+  sha256 = "34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63",
+  downloaded_file_path = "xmlpull-1.1.3.1.jar"
+)
+
+http_file(
+  name = "com_thoughtworks_xstream-xstream-1_4_21-sources_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21-sources.jar",
+  sha256 = "c9ebc3613b053588aab70e2381951761e24ed94af3dae20df207c32a4fc14dbe",
+  downloaded_file_path = "xstream-1.4.21-sources.jar"
+)
+
+http_file(
+  name = "io_github_x-stream-mxparser-1_2_2-sources_http",
+  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2-sources.jar",
+  sha256 = "b2e72350ce8b2f287c0cd435a338c17705f9047857c52a709e223af2f5cbb0de",
+  downloaded_file_path = "mxparser-1.2.2-sources.jar"
+)
+
 http_file(
  name = "org_apache_thrift-libthrift-0_19_0_http",
  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/apache/thrift/libthrift/0.19.0/libthrift-0.19.0.jar",
@@ -13985,41 +14034,6 @@ http_file(
  downloaded_file_path = "workspace-model-codegen-0.0.9.jar"
 )

-http_file(
-  name = "com_thoughtworks_xstream-xstream-1_4_21_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21.jar",
-  sha256 = "f56586f3de59ae2a49430acbc9f27942b8c5cebec9245c869fae7136733333ec",
-  downloaded_file_path = "xstream-1.4.21.jar"
-)
-
-http_file(
-  name = "io_github_x-stream-mxparser-1_2_2_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2.jar",
-  sha256 = "aeeee23a3303d811bca8790ea7f25b534314861c03cff36dafdcc2180969eb97",
-  downloaded_file_path = "mxparser-1.2.2.jar"
-)
-
-http_file(
-  name = "xmlpull-xmlpull-1_1_3_1_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar",
-  sha256 = "34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63",
-  downloaded_file_path = "xmlpull-1.1.3.1.jar"
-)
-
-http_file(
-  name = "com_thoughtworks_xstream-xstream-1_4_21-sources_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21-sources.jar",
-  sha256 = "c9ebc3613b053588aab70e2381951761e24ed94af3dae20df207c32a4fc14dbe",
-  downloaded_file_path = "xstream-1.4.21-sources.jar"
-)
-
-http_file(
-  name = "io_github_x-stream-mxparser-1_2_2-sources_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2-sources.jar",
-  sha256 = "b2e72350ce8b2f287c0cd435a338c17705f9047857c52a709e223af2f5cbb0de",
-  downloaded_file_path = "mxparser-1.2.2-sources.jar"
-)
-
 http_file(
  name = "xml-resolver-xml-resolver-1_2_http",
  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar",
@@ -14076,20 +14090,6 @@ http_file(
  downloaded_file_path = "log4j-api-2.20.0-sources.jar"
 )

-http_file(
-  name = "org_apache_ws_xmlrpc-xmlrpc-2_0_1_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1.jar",
-  sha256 = "36efda6efee96e83602c9ba246db19bf4c5e733324390d2fa8213417d6b681e7",
-  downloaded_file_path = "xmlrpc-2.0.1.jar"
-)
-
-http_file(
-  name = "org_apache_ws_xmlrpc-xmlrpc-2_0_1-sources_http",
-  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1-sources.jar",
-  sha256 = "34d3755800c35568aab53447c576d3ab8fb63e6e9df32d6acb1fe7187bf5383c",
-  downloaded_file_path = "xmlrpc-2.0.1-sources.jar"
-)
-
 http_file(
  name = "xalan-serializer-2_7_3_http",
  url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/xalan/serializer/2.7.3/serializer-2.7.3.jar",
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -121,6 +121,7 @@ private val LIBRARY_MODULE_NAMES: Set<String> = setOf(
 After creating the module, run the following tests to ensure project structure consistency:

 - **`IdeaUltimatePluginStructureTest`** - Verifies the plugin structure for IDEA Ultimate
+- **`IdeaUltimatePluginModuleDependenciesTest`** - Verifies the plugin structure for IDEA Ultimate
 - **`CommunityProjectConsistencyTest`** - Verifies community project consistency

 ## Examples
--- a/libraries/xml-rpc/BUILD.bazel
+++ b/libraries/xml-rpc/BUILD.bazel
@@ -0,0 +1,18 @@
+### auto-generated section `build intellij.libraries.xml.rpc` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "xml-rpc_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "xml-rpc",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":xml-rpc_resources"],
+  exports = ["@lib//:libraries-xml-rpc-xml-rpc"],
+  runtime_deps = ["@lib//:libraries-xml-rpc-xml-rpc"]
+)
+### auto-generated section `build intellij.libraries.xml.rpc` end
--- a/libraries/xml-rpc/intellij.libraries.xml.rpc.iml
+++ b/libraries/xml-rpc/intellij.libraries.xml.rpc.iml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" exported="">
+      <library name="xml-rpc" type="repository">
+        <properties include-transitive-deps="false" maven-id="org.apache.ws.xmlrpc:xmlrpc:2.0.1">
+          <verification>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1.jar">
+              <sha256sum>36efda6efee96e83602c9ba246db19bf4c5e733324390d2fa8213417d6b681e7</sha256sum>
+            </artifact>
+          </verification>
+        </properties>
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+  </component>
+</module>
--- a/libraries/xml-rpc/resources/intellij.libraries.xml.rpc.xml
+++ b/libraries/xml-rpc/resources/intellij.libraries.xml.rpc.xml
@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>
--- a/libraries/xstream/BUILD.bazel
+++ b/libraries/xstream/BUILD.bazel
@@ -0,0 +1,18 @@
+### auto-generated section `build intellij.libraries.xstream` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "xstream_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "xstream",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":xstream_resources"],
+  exports = ["@lib//:libraries-xstream-xstream"],
+  runtime_deps = ["@lib//:libraries-xstream-xstream"]
+)
+### auto-generated section `build intellij.libraries.xstream` end
--- a/libraries/xstream/intellij.libraries.xstream.iml
+++ b/libraries/xstream/intellij.libraries.xstream.iml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library" exported="">
+      <library name="xstream" type="repository">
+        <properties maven-id="com.thoughtworks.xstream:xstream:1.4.21">
+          <verification>
+            <artifact url="file://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21.jar">
+              <sha256sum>f56586f3de59ae2a49430acbc9f27942b8c5cebec9245c869fae7136733333ec</sha256sum>
+            </artifact>
+            <artifact url="file://$MAVEN_REPOSITORY$/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2.jar">
+              <sha256sum>aeeee23a3303d811bca8790ea7f25b534314861c03cff36dafdcc2180969eb97</sha256sum>
+            </artifact>
+            <artifact url="file://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar">
+              <sha256sum>34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63</sha256sum>
+            </artifact>
+          </verification>
+          <exclude>
+            <dependency maven-id="xml-apis:xml-apis" />
+            <dependency maven-id="xerces:xercesImpl" />
+          </exclude>
+        </properties>
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.21/xstream-1.4.21-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+  </component>
+</module>
--- a/libraries/xstream/resources/intellij.libraries.xstream.xml
+++ b/libraries/xstream/resources/intellij.libraries.xstream.xml
@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
@@ -1334,7 +1334,7 @@ object CommunityLibraryLicenses {
      .apache("https://svn.jetbrains.org/idea/Trunk/bundled/WebServices/resources/lib/xmlbeans-2.3.0/xmlbeans.LICENSE")
      .suppliedByPersons("Cezar Andrei", "Radu Preotiuc", "Radu Preotiuc", "Wing Yew Poon", "Jacob Danner", "POI Team"),

-    LibraryLicense("XmlRPC", libraryName = "XmlRPC", url = "https://ws.apache.org/xmlrpc/xmlrpc2/")
+    LibraryLicense("XmlRPC", libraryName = "xml-rpc", url = "https://ws.apache.org/xmlrpc/xmlrpc2/")
      .apache("https://ws.apache.org/xmlrpc/xmlrpc2/license.html")
      .suppliedByPersons(
        "Daniel Rall", "Jon Scott Stevens", "John Wilson",
@@ -1343,7 +1343,7 @@ object CommunityLibraryLicenses {
        "Leonard Richarson", "Hannes Wallnoefer"
      ),

-    LibraryLicense("XStream", libraryName = "XStream", url = "https://x-stream.github.io/")
+    LibraryLicense("XStream", libraryName = "xstream", url = "https://x-stream.github.io/")
      .newBsd("https://x-stream.github.io/license.html")
      .suppliedByOrganizations("XStream Committers"),

--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
@@ -75,7 +75,6 @@ object CommunityRepositoryModules {
      spec.directoryName = "tasks"
      spec.withModule("intellij.tasks")
      spec.withModule("intellij.tasks.compatibility")
-      spec.withModule("intellij.tasks.jira")
      spec.withModule("intellij.tasks.java")
    },
    pluginAuto(listOf("intellij.xslt.debugger")) { spec ->
--- 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
@@ -57,6 +57,8 @@ private val LIBRARY_MODULE_NAMES: Set<String> = setOf(
  "intellij.libraries.rhino",
  "intellij.libraries.testng",
  "intellij.libraries.winp",
+  "intellij.libraries.xml.rpc",
+  "intellij.libraries.xstream",
  "intellij.libraries.xz",
  "intellij.libraries.dokka",
  "intellij.libraries.guava",
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt
@@ -1,8 +1,6 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.intellij.build.python

-import kotlinx.collections.immutable.PersistentList
-import kotlinx.collections.immutable.persistentListOf
 import org.jetbrains.intellij.build.impl.PluginLayout
 import org.jetbrains.intellij.build.io.copyDir
 import java.nio.file.Files
--- a/platform/lang-impl/BUILD.bazel
+++ b/platform/lang-impl/BUILD.bazel
@@ -59,7 +59,7 @@ jvm_library(
    "@lib//:commons-logging",
    "//platform/diff-impl",
    "//platform/built-in-server-api:builtInServer",
-    "@lib//:x_stream",
+    "//libraries/xstream",
    "//libraries/miglayout-swing",
    "//platform/ide-core/plugins",
    "@lib//:jna",
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -67,7 +67,7 @@
    <orderEntry type="library" name="commons-logging" level="project" />
    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
    <orderEntry type="module" module-name="intellij.platform.builtInServer" />
-    <orderEntry type="library" name="XStream" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.xstream" />
    <orderEntry type="module" module-name="intellij.libraries.miglayout.swing" />
    <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
    <orderEntry type="library" name="jna" level="project" />
--- a/platform/platform-resources/src/META-INF/essential-libs.xml
+++ b/platform/platform-resources/src/META-INF/essential-libs.xml
@@ -34,6 +34,9 @@
    <module name="intellij.libraries.proxy.vole" loading="embedded"/>
    <module name="intellij.libraries.rhino" loading="embedded"/>
    <module name="intellij.libraries.winp" loading="embedded"/>
+    <module name="intellij.libraries.xstream" loading="embedded"/>
    <module name="intellij.libraries.xz" loading="embedded"/>
+    <!-- todo fix python -->
+    <module name="intellij.libraries.xml.rpc" loading="embedded"/>
  </content>
 </idea-plugin>
--- a/plugins/gradle/java/BUILD.bazel
+++ b/plugins/gradle/java/BUILD.bazel
@@ -52,7 +52,7 @@ jvm_library(
    "//libraries/gson",
    "//jps/jps-builders:build",
    "//plugins/gradle/tooling-extension-impl:toolingExtension-impl",
-    "@lib//:x_stream",
+    "//libraries/xstream",
    "//plugins/groovy/groovy-psi:psi",
    "//java/execution/openapi:java-execution",
    "//plugins/maven",
--- a/plugins/gradle/java/intellij.gradle.java.iml
+++ b/plugins/gradle/java/intellij.gradle.java.iml
@@ -48,7 +48,7 @@
    <orderEntry type="module" module-name="intellij.libraries.gson" />
    <orderEntry type="module" module-name="intellij.platform.jps.build" />
    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
-    <orderEntry type="library" name="XStream" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.xstream" />
    <orderEntry type="module" module-name="intellij.groovy.psi" />
    <orderEntry type="module" module-name="intellij.java.execution" />
    <orderEntry type="module" module-name="intellij.maven" />
--- a/plugins/tasks/tasks-core/BUILD.bazel
+++ b/plugins/tasks/tasks-core/BUILD.bazel
@@ -24,7 +24,7 @@ jvm_library(
    "//platform/lang-impl",
    "//platform/vcs-impl",
    "//plugins/tasks/tasks-core/lib:axis-1-4",
-    "@lib//:xml_r_p_c",
+    "//libraries/xml-rpc",
    "//libraries/gson",
    "//xml/impl",
    "//platform/core-api:core",
--- a/plugins/tasks/tasks-core/intellij.tasks.core.iml
+++ b/plugins/tasks/tasks-core/intellij.tasks.core.iml
@@ -30,7 +30,7 @@
        <SOURCES />
      </library>
    </orderEntry>
-    <orderEntry type="library" name="XmlRPC" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.xml.rpc" />
    <orderEntry type="module" module-name="intellij.libraries.gson" />
    <orderEntry type="module" module-name="intellij.xml.impl" />
    <orderEntry type="module" module-name="intellij.platform.core" />
--- a/plugins/tasks/tasks-core/jira/BUILD.bazel
+++ b/plugins/tasks/tasks-core/jira/BUILD.bazel
@@ -24,7 +24,7 @@ jvm_library(
    "//platform/lang-impl",
    "//platform/tasks-platform-impl:tasks-impl",
    "//plugins/tasks/tasks-api:tasks",
-    "@lib//:xml_r_p_c",
+    "//libraries/xml-rpc",
    "//libraries/gson",
    "//platform/core-ui",
    "//platform/util/jdom",
--- a/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml
+++ b/plugins/tasks/tasks-core/jira/intellij.tasks.jira.iml
@@ -19,7 +19,7 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.tasks.impl" />
    <orderEntry type="module" module-name="intellij.tasks" />
-    <orderEntry type="library" name="XmlRPC" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.xml.rpc" />
    <orderEntry type="module" module-name="intellij.libraries.gson" />
    <orderEntry type="module" module-name="intellij.platform.core.ui" />
    <orderEntry type="module" module-name="intellij.platform.util.jdom" />
--- a/plugins/tasks/tasks-core/jira/resources/intellij.tasks.jira.xml
+++ b/plugins/tasks/tasks-core/jira/resources/intellij.tasks.jira.xml
@@ -0,0 +1,26 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.libraries.gson"/>
+    <module name="intellij.libraries.xml.rpc"/>
+    <module name="intellij.platform.tasks.impl"/>
+  </dependencies>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <!-- JQL support -->
+    <fileType name="JQL" implementationClass="com.intellij.tasks.jira.jql.JqlFileType" fieldName="INSTANCE" language="JQL"
+              extensions="jql"/>
+    <lang.parserDefinition language="JQL"
+                           implementationClass="com.intellij.tasks.jira.jql.JqlParserDefinition"/>
+    <lang.syntaxHighlighterFactory language="JQL" implementationClass="com.intellij.tasks.jira.jql.JqlHighlighterFactory"/>
+    <lang.braceMatcher language="JQL" implementationClass="com.intellij.tasks.jira.jql.JqlBraceMatcher"/>
+    <completion.contributor language="JQL"
+                            implementationClass="com.intellij.tasks.jira.jql.codeinsight.JqlCompletionContributor"/>
+    <annotator language="JQL" implementationClass="com.intellij.tasks.jira.jql.codeinsight.JqlAnnotator"/>
+
+    <registryKey key="tasks.jira.use.rest.api.version" defaultValue="" restartRequired="true"
+                 description="Use &quot;2&quot; for REST API version 2,
+                              &quot;3&quot; for REST API version 3 in Cloud, leave empty for autodetection (legacy non-REST API included)"/>
+
+    <tasks.repositoryType implementation="com.intellij.tasks.jira.JiraRepositoryType"/>
+  </extensions>
+</idea-plugin>
--- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlFileType.java
+++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlFileType.java
@@ -8,10 +8,7 @@ import org.jetbrains.annotations.NotNull;

 import javax.swing.*;

-/**
- * @author Mikhail Golubev
- */
-public final class JqlFileType extends LanguageFileType {
+final class JqlFileType extends LanguageFileType {
  public static final LanguageFileType INSTANCE = new JqlFileType();
  public static final String DEFAULT_EXTENSION = "jql";

--- a/plugins/tasks/tasks-core/plugin-content.yaml
+++ b/plugins/tasks/tasks-core/plugin-content.yaml
@@ -23,15 +23,12 @@
  - name: $MAVEN_REPOSITORY$/net/minidev/json-smart/2/json-smart-2.jar
  - name: $MAVEN_REPOSITORY$/net/minidev/accessors-smart/2/accessors-smart-2.jar
  reason: <- intellij.tasks.core
+- name: lib/modules/intellij.tasks.jira.jar
+  contentModules:
+  - name: intellij.tasks.jira
 - name: lib/tasks-core.jar
  modules:
  - name: intellij.tasks
  - name: intellij.tasks.compatibility
-  - name: intellij.tasks.jira
  - name: intellij.tasks.java
-  - name: intellij.tasks.core
- name: lib/xmlrpc.jar
-  library: XmlRPC
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2/xmlrpc-2.jar
-  reason: <- intellij.tasks.jira
+  - name: intellij.tasks.core
--- a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
@@ -13,12 +13,16 @@
 ]]></description>
  <vendor>JetBrains</vendor>

+  <content>
+    <module name="intellij.tasks.jira"/>
+  </content>
  <dependencies>
    <plugin id="com.intellij.modules.xml" />
    <module name="intellij.platform.vcs.impl"/>
    <module name="intellij.platform.tasks.impl"/>
    <module name="intellij.regexp"/>
  </dependencies>
+
  <depends optional="true" config-file="java-contexts.xml">com.intellij.java</depends>
  <!--
    Optional dependency on XPath plugin for syntax highlighting in GenericRepository configuration dialog
@@ -117,7 +121,6 @@

    <lang.documentationProvider language="TEXT" implementationClass="com.intellij.tasks.doc.TaskDocumentationProvider"/>

-    <tasks.repositoryType implementation="com.intellij.tasks.jira.JiraRepositoryType"/>
    <tasks.repositoryType implementation="com.intellij.tasks.youtrack.YouTrackRepositoryType"/>
    <tasks.repositoryType implementation="com.intellij.tasks.lighthouse.LighthouseRepositoryType"/>
    <tasks.repositoryType implementation="com.intellij.tasks.pivotal.PivotalTrackerRepositoryType"/>
@@ -130,16 +133,6 @@
    <tasks.repositoryType implementation="com.intellij.tasks.gitlab.GitlabRepositoryType"/>
    <tasks.repositoryType implementation="com.intellij.tasks.bugzilla.BugzillaRepositoryType"/>

-    <!-- JQL support -->
-    <fileType name="JQL" implementationClass="com.intellij.tasks.jira.jql.JqlFileType" fieldName="INSTANCE" language="JQL" extensions="jql" />
-    <lang.parserDefinition language="JQL"
-                           implementationClass="com.intellij.tasks.jira.jql.JqlParserDefinition"/>
-    <lang.syntaxHighlighterFactory language="JQL" implementationClass="com.intellij.tasks.jira.jql.JqlHighlighterFactory"/>
-    <lang.braceMatcher language="JQL" implementationClass="com.intellij.tasks.jira.jql.JqlBraceMatcher"/>
-    <completion.contributor language="JQL"
-                            implementationClass="com.intellij.tasks.jira.jql.codeinsight.JqlCompletionContributor"/>
-    <annotator language="JQL" implementationClass="com.intellij.tasks.jira.jql.codeinsight.JqlAnnotator"/>
-
    <checkinHandlerFactory implementation="com.intellij.tasks.impl.TaskCheckinHandlerFactory"/>
    <!-- YouTrack support -->
    <!--<annotator language="TEXT" implementationClass="com.intellij.tasks.youtrack.lang.YouTrackHighlightingAnnotator"/>-->
@@ -155,9 +148,5 @@
    <statistics.counterUsagesCollector implementationClass="com.intellij.tasks.impl.TaskManagementUsageCollector"/>
    <statistics.projectUsagesCollector implementation="com.intellij.tasks.impl.TaskManagementConfigurationCollector"/>
    <statistics.projectUsagesCollector implementation="com.intellij.tasks.core.fus.TasksStateCollector"/>
-
-    <registryKey key="tasks.jira.use.rest.api.version" defaultValue="" restartRequired="true"
-                 description="Use &quot;2&quot; for REST API version 2,
-                              &quot;3&quot; for REST API version 3 in Cloud, leave empty for autodetection (legacy non-REST API included)"/>
  </extensions>
 </idea-plugin>
--- a/plugins/tasks/tasks-tests/BUILD.bazel
+++ b/plugins/tasks/tasks-tests/BUILD.bazel
@@ -31,7 +31,7 @@ jvm_library(
    "//java/testFramework",
    "//platform/vcs-impl",
    "//platform/vcs-impl:vcs-impl_test_lib",
-    "@lib//:xml_r_p_c",
+    "//libraries/xml-rpc",
    "//java/debugger/openapi:java-debugger",
    "//plugins/xslt-debugger",
    "//platform/xdebugger-impl:debugger-impl",
--- a/plugins/tasks/tasks-tests/intellij.tasks.tests.iml
+++ b/plugins/tasks/tasks-tests/intellij.tasks.tests.iml
@@ -22,7 +22,7 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.dvcs.impl" />
    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
-    <orderEntry type="library" name="XmlRPC" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.xml.rpc" />
    <orderEntry type="module" module-name="intellij.spellchecker" scope="RUNTIME" />
    <orderEntry type="module" module-name="intellij.java.debugger" />
    <orderEntry type="module" module-name="intellij.xslt.debugger" />
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -263,7 +263,6 @@ jvm_library(
    "//platform/indexing-impl",
    "//python:python-pydev",
    "//platform/observable",
-    "@lib//:xml_r_p_c",
    "//platform/xdebugger-api:debugger",
    "//RegExpSupport:regexp",
    "//platform/editor-ui-ex:editor-ex",
@@ -278,7 +277,7 @@ jvm_library(
    "//libraries/kotlin-reflect",
    "//libraries/gson",
    "//platform/vcs-api:vcs",
-    "@lib//:x_stream",
+    "//libraries/xstream",
    "@lib//:libthrift",
    "@lib//:slf4j-api",
    "@lib//:slf4j-jdk14",
@@ -621,12 +620,12 @@ jvm_library(
  deps = [
    "//platform/core-api:core",
    "//platform/xdebugger-api:debugger",
-    "@lib//:xml_r_p_c",
+    "//libraries/xml-rpc",
    "//libraries/guava",
    "//platform/editor-ui-api:editor-ui",
    "//platform/util",
    "@lib//:kotlin-stdlib",
-    "@lib//:x_stream",
+    "//libraries/xstream",
    "//platform/util:util-ui",
    "//python/python-psi-api:psi",
    "//platform/util/concurrency",
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -59,7 +59,6 @@
    <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
    <orderEntry type="module" module-name="intellij.python.pydev" />
    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
-    <orderEntry type="library" name="XmlRPC" level="project" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
    <orderEntry type="module" module-name="intellij.regexp" exported="" />
    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
@@ -74,7 +73,7 @@
    <orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" />
    <orderEntry type="module" module-name="intellij.libraries.gson" />
    <orderEntry type="module" module-name="intellij.platform.vcs" />
-    <orderEntry type="library" name="XStream" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.xstream" />
    <orderEntry type="module" module-name="intellij.python.helpers" scope="RUNTIME" />
    <orderEntry type="library" name="libthrift" level="project" />
    <orderEntry type="library" name="slf4j-api" level="project" />
--- a/python/intellij.python.pydev.iml
+++ b/python/intellij.python.pydev.iml
@@ -10,12 +10,12 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="intellij.platform.core" />
    <orderEntry type="module" module-name="intellij.platform.debugger" />
-    <orderEntry type="library" name="XmlRPC" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.xml.rpc" />
    <orderEntry type="module" module-name="intellij.libraries.guava" />
    <orderEntry type="module" module-name="intellij.platform.editor.ui" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="XStream" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.xstream" />
    <orderEntry type="module" module-name="intellij.platform.util.ui" />
    <orderEntry type="module" module-name="intellij.python.psi" />
    <orderEntry type="module" module-name="intellij.platform.concurrency" />
--- a/python/pluginCore/plugin-content.yaml
+++ b/python/pluginCore/plugin-content.yaml
@@ -39,10 +39,6 @@
  - name: intellij.python.community.impl.installer
 - name: lib/modules/intellij.python.community.impl.jar
  projectLibraries:
-  - name: XmlRPC
-    files:
-    - name: $MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2/xmlrpc-2.jar
-    reason: <- intellij.python.community.impl
  - name: jackson-dataformat-yaml
    files:
    - name: $MAVEN_REPOSITORY$/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2/jackson-dataformat-yaml-2.jar
@@ -146,10 +142,6 @@
 - name: lib/modules/intellij.python.pydev.jar
  contentModules:
  - name: intellij.python.pydev
-  library: XmlRPC
-  files:
-  - name: $MAVEN_REPOSITORY$/org/apache/ws/xmlrpc/xmlrpc/2/xmlrpc-2.jar
-  reason: <- intellij.python.pydev
 - name: lib/modules/intellij.python.pyproject.jar
  contentModules:
  - name: intellij.python.pyproject
--- a/python/pydevSrc/resources/intellij.python.pydev.xml
+++ b/python/pydevSrc/resources/intellij.python.pydev.xml
@@ -2,5 +2,6 @@
  <dependencies>
    <module name="intellij.python.psi"/>
    <module name="intellij.python.syntax.core"/>
+    <module name="intellij.libraries.xml.rpc"/>
  </dependencies>
 </idea-plugin>