From 43fce3de0c655ef43234ecc912ea19856cf1fc56 Mon Sep 17 00:00:00 2001
From: Nikolay Chashnikov <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 9 Apr 2025 00:09:04 +0300
Subject: [PATCH] cleanup: use dependency on 'com.intellij.java' plugin instead
 of corresponding obsolete plugin alias

There is no need to use 'com.intellij.modules.java' plugin alias since Java was converted to a real plugin. This is also needed to fix UltimatePluginModelTest.

GitOrigin-RevId: d8a8d2016cc0f916e76614d4155e6d9c47c86eff
---
 plugins/IntelliLang/resources/META-INF/plugin.xml            | 2 +-
 plugins/ant/resources/META-INF/plugin.xml                    | 2 +-
 plugins/commander/resources/META-INF/plugin.xml              | 2 +-
 plugins/eclipse/resources/META-INF/plugin.xml                | 2 +-
 plugins/java-decompiler/plugin/resources/META-INF/plugin.xml | 2 +-
 plugins/java-i18n/resources/META-INF/plugin.xml              | 2 +-
 plugins/javaFX/resources/intellij.javaFX.xml                 | 2 +-
 plugins/kotlin/plugin/k2/resources/kotlin.plugin.k2.xml      | 2 +-
 plugins/lombok/src/main/resources/META-INF/plugin.xml        | 2 +-
 plugins/ml-local-models/resources/META-INF/plugin.xml        | 2 +-
 plugins/rareJavaRefactorings/resources/META-INF/plugin.xml   | 2 +-
 plugins/tasks/tasks-core/resources/META-INF/plugin.xml       | 2 +-
 plugins/testng/resources/META-INF/plugin.xml                 | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/IntelliLang/resources/META-INF/plugin.xml b/plugins/IntelliLang/resources/META-INF/plugin.xml
index 20cc4537bd25..79a43d6f01cb 100644
--- a/plugins/IntelliLang/resources/META-INF/plugin.xml
+++ b/plugins/IntelliLang/resources/META-INF/plugin.xml
@@ -18,7 +18,7 @@
    </description>
 
   <depends optional="true" config-file="intellilang-xpath-support.xml">XPathView</depends>
-  <depends optional="true" config-file="intellilang-java-support.xml">com.intellij.modules.java</depends>
+  <depends optional="true" config-file="intellilang-java-support.xml">com.intellij.java</depends>
   <depends optional="true" config-file="intellilang-xml-support.xml">com.intellij.modules.xml</depends>
 
   <extensionPoints>
diff --git a/plugins/ant/resources/META-INF/plugin.xml b/plugins/ant/resources/META-INF/plugin.xml
index c8e8a5f9813b..ea9472a3cecd 100644
--- a/plugins/ant/resources/META-INF/plugin.xml
+++ b/plugins/ant/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@ To use the <b>Ant</b> tool window, select <b>View > Tool Windows > Ant</b>.
   <vendor>JetBrains</vendor>
 
   <resource-bundle>messages.AntActionsBundle</resource-bundle>
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
   <depends>com.intellij.properties</depends>
 
   <extensionPoints>
diff --git a/plugins/commander/resources/META-INF/plugin.xml b/plugins/commander/resources/META-INF/plugin.xml
index c9e1d96d672a..f430c3202244 100644
--- a/plugins/commander/resources/META-INF/plugin.xml
+++ b/plugins/commander/resources/META-INF/plugin.xml
@@ -4,7 +4,7 @@
   <description>Provides a two-panel view for navigating and working with the project structure</description>
   <vendor>JetBrains</vendor>
   <resource-bundle>messages.CommanderBundle</resource-bundle>
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <selectInTarget implementation="com.intellij.ide.commander.CommanderSelectInTarget"/>
diff --git a/plugins/eclipse/resources/META-INF/plugin.xml b/plugins/eclipse/resources/META-INF/plugin.xml
index 803735463c48..420f2b9439ed 100644
--- a/plugins/eclipse/resources/META-INF/plugin.xml
+++ b/plugins/eclipse/resources/META-INF/plugin.xml
@@ -17,7 +17,7 @@
     </description>
 
   <vendor>JetBrains</vendor>
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
   <extensions defaultExtensionNs="com.intellij">
     <classpathStorageProvider implementation="org.jetbrains.idea.eclipse.config.EclipseClasspathStorageProvider"/>
     <workspaceModel.customModuleRootsSerializer implementation="org.jetbrains.idea.eclipse.config.EclipseModuleRootsSerializer"/>
diff --git a/plugins/java-decompiler/plugin/resources/META-INF/plugin.xml b/plugins/java-decompiler/plugin/resources/META-INF/plugin.xml
index 21a597ee386a..56f824f1827b 100644
--- a/plugins/java-decompiler/plugin/resources/META-INF/plugin.xml
+++ b/plugins/java-decompiler/plugin/resources/META-INF/plugin.xml
@@ -7,7 +7,7 @@
   </description>
   <vendor>JetBrains</vendor>
 
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
 
   <resource-bundle>messages.IdeaDecompilerBundle</resource-bundle>
 
diff --git a/plugins/java-i18n/resources/META-INF/plugin.xml b/plugins/java-i18n/resources/META-INF/plugin.xml
index 91eec7759257..f23a5a507965 100644
--- a/plugins/java-i18n/resources/META-INF/plugin.xml
+++ b/plugins/java-i18n/resources/META-INF/plugin.xml
@@ -5,7 +5,7 @@
   <vendor>JetBrains</vendor>
 
   <depends>com.intellij.properties</depends>
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
   <depends>com.intellij.modules.platform</depends>
 
   <description>
diff --git a/plugins/javaFX/resources/intellij.javaFX.xml b/plugins/javaFX/resources/intellij.javaFX.xml
index 05c5c63e1ba2..edc09653b4c2 100644
--- a/plugins/javaFX/resources/intellij.javaFX.xml
+++ b/plugins/javaFX/resources/intellij.javaFX.xml
@@ -1,6 +1,6 @@
 <idea-plugin>
   <dependencies>
-    <plugin id="com.intellij.modules.java"/>
+    <plugin id="com.intellij.java"/>
   </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/kotlin/plugin/k2/resources/kotlin.plugin.k2.xml b/plugins/kotlin/plugin/k2/resources/kotlin.plugin.k2.xml
index c530c649981a..2aacf7595ce6 100644
--- a/plugins/kotlin/plugin/k2/resources/kotlin.plugin.k2.xml
+++ b/plugins/kotlin/plugin/k2/resources/kotlin.plugin.k2.xml
@@ -3,7 +3,7 @@
   <module value="com.intellij.modules.kotlin.k2"/>
 
   <dependencies>
-    <plugin id="com.intellij.modules.java"/>
+    <plugin id="com.intellij.java"/>
     <plugin id="com.intellij.modules.java-capable"/>
   </dependencies>
 
diff --git a/plugins/lombok/src/main/resources/META-INF/plugin.xml b/plugins/lombok/src/main/resources/META-INF/plugin.xml
index 8f924e94b125..f9a9a8222809 100644
--- a/plugins/lombok/src/main/resources/META-INF/plugin.xml
+++ b/plugins/lombok/src/main/resources/META-INF/plugin.xml
@@ -45,7 +45,7 @@
 
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.platform</depends>
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceImplementation="de.plushnikov.intellij.plugin.lombokconfig.ConfigDiscovery"/>
diff --git a/plugins/ml-local-models/resources/META-INF/plugin.xml b/plugins/ml-local-models/resources/META-INF/plugin.xml
index d820425d387b..6d657669c4d3 100644
--- a/plugins/ml-local-models/resources/META-INF/plugin.xml
+++ b/plugins/ml-local-models/resources/META-INF/plugin.xml
@@ -27,5 +27,5 @@
 
   </extensions>
 
-  <depends optional="true" config-file="intellij.ml.models.local.java.xml">com.intellij.modules.java</depends>
+  <depends optional="true" config-file="intellij.ml.models.local.java.xml">com.intellij.java</depends>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/rareJavaRefactorings/resources/META-INF/plugin.xml b/plugins/rareJavaRefactorings/resources/META-INF/plugin.xml
index 9750a513edfe..186b05d11545 100644
--- a/plugins/rareJavaRefactorings/resources/META-INF/plugin.xml
+++ b/plugins/rareJavaRefactorings/resources/META-INF/plugin.xml
@@ -2,7 +2,7 @@
   <id>com.intellij.java.rareRefactorings</id>
   <name>Additional Java Refactorings</name>
   <category>Refactorings Tools</category>
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
   <depends>com.intellij.modules.platform</depends>
   <description>
     Provides the "Convert Raw Types to Generics", "Remove Middle Man", "Replace Temp with Query" and "Wrap Method Return Value" refactorings
diff --git a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
index f8e91b7b3a73..13b1289d8da6 100644
--- a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
@@ -17,7 +17,7 @@
     <plugin id="com.intellij.modules.xml" />
     <module name="intellij.platform.vcs.impl"/>
   </dependencies>
-  <depends optional="true" config-file="java-contexts.xml">com.intellij.modules.java</depends>
+  <depends optional="true" config-file="java-contexts.xml">com.intellij.java</depends>
   <!--
     Optional dependency on XPath plugin for syntax highlighting in GenericRepository configuration dialog
     see com.intellij.tasks.generic.ResponseType.XML
diff --git a/plugins/testng/resources/META-INF/plugin.xml b/plugins/testng/resources/META-INF/plugin.xml
index 7b8e308652fa..e15b31ed0e9e 100644
--- a/plugins/testng/resources/META-INF/plugin.xml
+++ b/plugins/testng/resources/META-INF/plugin.xml
@@ -8,7 +8,7 @@
     ]]></description>
   <category>Test Tools</category>
   <vendor>JetBrains</vendor>
-  <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.java</depends>
 
   <depends optional="true" config-file="testng-intellilang.xml">org.intellij.intelliLang</depends>
   <resource-bundle>messages.TestngBundle</resource-bundle>