From 9225dc896a50f4dc2c212ac1f7860b0b4db829f9 Mon Sep 17 00:00:00 2001
From: Dmitry Kichinsky <dmitry.kichinsky@jetbrains.com>
Date: Sat, 14 Feb 2026 21:43:52 +0100
Subject: [PATCH] [gradle] IDEA-357140 Migrate Gradle Java Plugin descriptors
 to V2: main module

GitOrigin-RevId: a06b3fa9db020288336ea31ec1817653bcdf3deb
---
 .idea/modules.xml                             |  1 +
 build/bazel-generated-file-list.txt           |  1 +
 .../intellij/build/BaseIdeaProperties.kt      |  2 +-
 .../build/CommunityRepositoryModules.kt       |  2 +-
 .../resources/intellij.devkit.gradle.xml      |  6 +--
 .../resources/intellij.gradle.java.maven.xml  |  5 +-
 .../resources/intellij.gradle.analysis.xml    |  6 +--
 .../intellij.gradle.java.groovy.ml.xml        |  6 +--
 .../resources/intellij.gradle.java.groovy.xml |  6 +--
 .../intellij.gradle.java.groovy.toml.xml      |  6 +--
 .../intellij.gradle.java.performance.xml      |  6 +--
 plugins/gradle/java/plugin/BUILD.bazel        | 16 +++++++
 .../plugin/intellij.gradle.java.plugin.iml    | 11 +++++
 .../java/{ => plugin}/plugin-content.yaml     |  4 +-
 .../java/plugin/resources/META-INF/plugin.xml | 36 ++++++++++++++
 .../resources/META-INF/pluginIcon.svg         |  0
 .../resources/META-INF/pluginIcon_dark.svg    |  0
 .../intellij.gradle.java.properties.xml       |  2 +-
 .../plugin.xml => intellij.gradle.java.xml}   | 47 ++++++-------------
 .../resources/intellij.gradle.java.toml.xml   |  6 +--
 ...ellij.kotlin.gradle.codeInsight.common.xml |  6 +--
 ...llij.kotlin.gradle.codeInsight.toml.k2.xml |  6 +--
 ...ntellij.kotlin.gradle.codeInsight.toml.xml |  8 ++--
 .../kotlin.gradle.gradle-java.k1.xml          |  5 +-
 .../resources/intellij.kotlin.gradle.java.xml |  6 ++-
 .../resources/kotlin.gradle.gradle-java.xml   | 10 ++--
 .../intellij.kotlin.gradle.scripting.xml      |  6 +--
 .../intellij.kotlin.projectWizard.gradle.xml  |  6 +--
 28 files changed, 140 insertions(+), 82 deletions(-)
 create mode 100644 plugins/gradle/java/plugin/BUILD.bazel
 create mode 100644 plugins/gradle/java/plugin/intellij.gradle.java.plugin.iml
 rename plugins/gradle/java/{ => plugin}/plugin-content.yaml (93%)
 create mode 100644 plugins/gradle/java/plugin/resources/META-INF/plugin.xml
 rename plugins/gradle/java/{ => plugin}/resources/META-INF/pluginIcon.svg (100%)
 rename plugins/gradle/java/{ => plugin}/resources/META-INF/pluginIcon_dark.svg (100%)
 rename plugins/gradle/java/resources/{META-INF/plugin.xml => intellij.gradle.java.xml} (90%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 5a96ce98734f..c0c940940287 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -468,6 +468,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/groovy/toml/intellij.gradle.java.groovy.toml.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/groovy/toml/intellij.gradle.java.groovy.toml.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle-maven/intellij.gradle.java.maven.iml" filepath="$PROJECT_DIR$/plugins/gradle-maven/intellij.gradle.java.maven.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/performance/intellij.gradle.java.performance.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/performance/intellij.gradle.java.performance.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/plugin/intellij.gradle.java.plugin.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/plugin/intellij.gradle.java.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/properties/intellij.gradle.java.properties.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/properties/intellij.gradle.java.properties.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.tests.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/intellij.gradle.java.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/java/toml/intellij.gradle.java.toml.iml" filepath="$PROJECT_DIR$/plugins/gradle/java/toml/intellij.gradle.java.toml.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 3c5d22c6b55f..771d5a298787 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -1005,6 +1005,7 @@ plugins/gradle/java/groovy
 plugins/gradle/java/groovy/ml
 plugins/gradle/java/groovy/toml
 plugins/gradle/java/performance
+plugins/gradle/java/plugin
 plugins/gradle/java/properties
 plugins/gradle/java/toml
 plugins/gradle/jps-plugin
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 c1a3963603da..bee94727339d 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
@@ -29,7 +29,7 @@ val IDEA_BUNDLED_PLUGINS: PersistentList<String> = DEFAULT_BUNDLED_PLUGINS + per
   "intellij.gradle.plugin",
   "intellij.android.gradle.declarative.lang.ide",
   "intellij.android.gradle.dsl",
-  "intellij.gradle.java",
+  "intellij.gradle.java.plugin",
   "intellij.vcs.git",
   "intellij.vcs.git.commit.modal",
   "intellij.vcs.github",
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
index 059e24d1a0f1..141249668f7c 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt
@@ -184,7 +184,7 @@ object CommunityRepositoryModules {
       spec.withProjectLibrary("Gradle", LibraryPackMode.STANDALONE_SEPARATE)
       spec.withProjectLibrary("Ant", "ant", LibraryPackMode.STANDALONE_SEPARATE)
     },
-    pluginAuto(listOf("intellij.gradle.java", "intellij.gradle.jps")) {
+    pluginAuto(listOf("intellij.gradle.java.plugin", "intellij.gradle.java", "intellij.gradle.jps")) {
       it.excludeProjectLibrary("Ant")
       it.excludeProjectLibrary("Gradle")
     },
diff --git a/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml b/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml
index bf39237d41e0..a4d0f66ae189 100644
--- a/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml
+++ b/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml
@@ -1,10 +1,10 @@
 <idea-plugin package="org.jetbrains.idea.devkit.gradle">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <plugin id="org.jetbrains.plugins.gradle"/>
     <module name="intellij.devkit.core"/>
-    <!-- endregion -->
+    <module name="intellij.gradle.java"/>
   </dependencies>
+  <!-- endregion -->
   <extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
     <frameworkSupport implementation="org.jetbrains.idea.devkit.gradle.GradleIntellijPluginFrameworkSupportProvider"/>
     <kotlinDslFrameworkSupport implementation="org.jetbrains.idea.devkit.gradle.KdslGradleIntellijPluginFrameworkSupportProvider"/>
diff --git a/plugins/gradle-maven/resources/intellij.gradle.java.maven.xml b/plugins/gradle-maven/resources/intellij.gradle.java.maven.xml
index 50ea2e28a8d2..65b368952d26 100644
--- a/plugins/gradle-maven/resources/intellij.gradle.java.maven.xml
+++ b/plugins/gradle-maven/resources/intellij.gradle.java.maven.xml
@@ -1,12 +1,13 @@
 <idea-plugin>
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <plugin id="org.jetbrains.idea.reposearch"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="org.intellij.groovy"/>
     <plugin id="org.jetbrains.idea.maven"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.gradle.java.groovy"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="org.jetbrains.idea.maven">
     <repositoryProvider implementation="org.jetbrains.plugins.gradle.integrations.maven.GradleMavenRepositoryProvider"/>
diff --git a/plugins/gradle/intellij.gradle.analysis/resources/intellij.gradle.analysis.xml b/plugins/gradle/intellij.gradle.analysis/resources/intellij.gradle.analysis.xml
index f5d41bb67e05..ea816802a0f9 100644
--- a/plugins/gradle/intellij.gradle.analysis/resources/intellij.gradle.analysis.xml
+++ b/plugins/gradle/intellij.gradle.analysis/resources/intellij.gradle.analysis.xml
@@ -1,10 +1,10 @@
 <idea-plugin>
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="org.jetbrains.idea.gradle.dsl"/>
-    <plugin id="org.jetbrains.plugins.gradle"/>
-    <!-- endregion -->
+    <module name="intellij.gradle.java"/>
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="org.jetbrains.plugins.gradle">
     <externallyHandledExtensions implementation="org.jetbrains.plugins.gradle.service.resolve.static.GradleDslVersionCatalogHandler"/>
diff --git a/plugins/gradle/java/groovy/ml/resources/intellij.gradle.java.groovy.ml.xml b/plugins/gradle/java/groovy/ml/resources/intellij.gradle.java.groovy.ml.xml
index e749956f886d..dcda3f7c3f17 100644
--- a/plugins/gradle/java/groovy/ml/resources/intellij.gradle.java.groovy.ml.xml
+++ b/plugins/gradle/java/groovy/ml/resources/intellij.gradle.java.groovy.ml.xml
@@ -1,12 +1,12 @@
 <idea-plugin>
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="com.intellij.completion.ml.ranking"/>
-    <plugin id="org.jetbrains.plugins.gradle"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.gradle.java.groovy"/>
     <module name="intellij.java.psi"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij">
     <completion.ml.contextFeatures language="Groovy" implementationClass="com.intellij.gradle.java.groovy.ml.GradleGroovyContextFeatureProvider"/>
diff --git a/plugins/gradle/java/groovy/resources/intellij.gradle.java.groovy.xml b/plugins/gradle/java/groovy/resources/intellij.gradle.java.groovy.xml
index 18babb167c46..7729e6f40cab 100644
--- a/plugins/gradle/java/groovy/resources/intellij.gradle.java.groovy.xml
+++ b/plugins/gradle/java/groovy/resources/intellij.gradle.java.groovy.xml
@@ -1,8 +1,8 @@
 <idea-plugin visibility="public">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="org.intellij.groovy"/>
-    <plugin id="org.jetbrains.plugins.gradle"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.java.compiler.impl"/>
     <module name="intellij.java.execution"/>
     <module name="intellij.java.execution.impl"/>
@@ -11,8 +11,8 @@
     <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.properties.psi"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
   <extensionPoints>
     <extensionPoint qualifiedName="org.jetbrains.plugins.gradle.resolve.contributor" interface="com.intellij.gradle.java.groovy.service.resolve.GradleMethodContextContributor"
                     dynamic="true"/>
diff --git a/plugins/gradle/java/groovy/toml/resources/intellij.gradle.java.groovy.toml.xml b/plugins/gradle/java/groovy/toml/resources/intellij.gradle.java.groovy.toml.xml
index c566b8ef7d56..47b1a10ead23 100644
--- a/plugins/gradle/java/groovy/toml/resources/intellij.gradle.java.groovy.toml.xml
+++ b/plugins/gradle/java/groovy/toml/resources/intellij.gradle.java.groovy.toml.xml
@@ -1,14 +1,14 @@
 <idea-plugin>
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <plugin id="org.jetbrains.plugins.gradle"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.gradle.java.groovy"/>
     <module name="intellij.gradle.java.toml"/>
     <module name="intellij.java.psi"/>
     <module name="intellij.platform.uast"/>
     <module name="intellij.toml.core"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij">
     <gotoDeclarationHandler implementation="com.intellij.gradle.java.groovy.toml.service.GradleVersionCatalogTomlAwareGotoDeclarationHandler"/>
diff --git a/plugins/gradle/java/performance/resources/intellij.gradle.java.performance.xml b/plugins/gradle/java/performance/resources/intellij.gradle.java.performance.xml
index 7d54aa837ea3..fbc5e8bd0fa0 100644
--- a/plugins/gradle/java/performance/resources/intellij.gradle.java.performance.xml
+++ b/plugins/gradle/java/performance/resources/intellij.gradle.java.performance.xml
@@ -1,12 +1,12 @@
 <idea-plugin visibility="internal">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <plugin id="org.jetbrains.idea.maven"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
     <plugin id="com.jetbrains.performancePlugin"/>
-    <plugin id="org.jetbrains.plugins.gradle"/>
     <module name="intellij.gradle"/>
-    <!-- endregion -->
+    <module name="intellij.gradle.java"/>
   </dependencies>
+  <!-- endregion -->
   <extensions defaultExtensionNs="com.jetbrains">
     <performancePlugin.commandProvider implementation="com.intellij.gradle.java.performance.GradleCommandProvider"/>
   </extensions>
diff --git a/plugins/gradle/java/plugin/BUILD.bazel b/plugins/gradle/java/plugin/BUILD.bazel
new file mode 100644
index 000000000000..9fc5021a493c
--- /dev/null
+++ b/plugins/gradle/java/plugin/BUILD.bazel
@@ -0,0 +1,16 @@
+### auto-generated section `build intellij.gradle.java.plugin` start
+load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
+
+resourcegroup(
+  name = "plugin_resources",
+  srcs = glob(["resources/**/*"]),
+  strip_prefix = "resources"
+)
+
+jvm_library(
+  name = "plugin",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True),
+  resources = [":plugin_resources"]
+)
+### auto-generated section `build intellij.gradle.java.plugin` end
\ No newline at end of file
diff --git a/plugins/gradle/java/plugin/intellij.gradle.java.plugin.iml b/plugins/gradle/java/plugin/intellij.gradle.java.plugin.iml
new file mode 100644
index 000000000000..510e3ffb6679
--- /dev/null
+++ b/plugins/gradle/java/plugin/intellij.gradle.java.plugin.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" 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" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/gradle/java/plugin-content.yaml b/plugins/gradle/java/plugin/plugin-content.yaml
similarity index 93%
rename from plugins/gradle/java/plugin-content.yaml
rename to plugins/gradle/java/plugin/plugin-content.yaml
index 5291486d008b..f75a734ec43f 100644
--- a/plugins/gradle/java/plugin-content.yaml
+++ b/plugins/gradle/java/plugin/plugin-content.yaml
@@ -1,5 +1,7 @@
-- name: lib/gradle-java.jar
+- name: lib/gradle-java-plugin.jar
   modules:
+  - name: intellij.gradle.java.plugin
+  contentModules:
   - name: intellij.gradle.java
 - name: lib/gradle-jps.jar
   modules:
diff --git a/plugins/gradle/java/plugin/resources/META-INF/plugin.xml b/plugins/gradle/java/plugin/resources/META-INF/plugin.xml
new file mode 100644
index 000000000000..7edf089b7c9d
--- /dev/null
+++ b/plugins/gradle/java/plugin/resources/META-INF/plugin.xml
@@ -0,0 +1,36 @@
+<idea-plugin allow-bundled-update="true">
+  <name>Gradle for Java</name>
+  <!-- "org.jetbrains.plugins.gradle" id has been reused to avoid dependent plugins breakage-->
+  <id>org.jetbrains.plugins.gradle</id>
+  <vendor>JetBrains</vendor>
+  <category>Build Tools</category>
+  <description>
+    Provides Java Gradle projects import, run configuration and profiler integrations.
+  </description>
+
+  <dependencies>
+    <plugin id="org.intellij.groovy"/>
+    <module name="intellij.java.indexing"/>
+    <module name="intellij.java.ui"/>
+    <module name="intellij.platform.jps.build"/>
+  </dependencies>
+
+  <module value="com.intellij.modules.gradle.java"/>
+  <module value="org.jetbrains.plugins.gradle.java"/>
+
+  <content namespace="jetbrains">
+    <module name="intellij.gradle.java" loading="embedded"/>
+    <module name="intellij.gradle.profiler"/>
+    <module name="intellij.gradle.java.maven"/>
+    <module name="intellij.gradle.analysis"/>
+    <module name="intellij.gradle.dependencyUpdater"/>
+    <module name="intellij.gradle.java.performance"/>
+    <module name="intellij.gradle.java.toml"/>
+    <module name="intellij.gradle.java.groovy"/>
+    <module name="intellij.gradle.java.groovy.toml"/>
+    <module name="intellij.gradle.java.groovy.ml"/>
+    <module name="intellij.gradle.java.coverage"/>
+    <module name="intellij.gradle.java.properties"/>
+  </content>
+
+</idea-plugin>
diff --git a/plugins/gradle/java/resources/META-INF/pluginIcon.svg b/plugins/gradle/java/plugin/resources/META-INF/pluginIcon.svg
similarity index 100%
rename from plugins/gradle/java/resources/META-INF/pluginIcon.svg
rename to plugins/gradle/java/plugin/resources/META-INF/pluginIcon.svg
diff --git a/plugins/gradle/java/resources/META-INF/pluginIcon_dark.svg b/plugins/gradle/java/plugin/resources/META-INF/pluginIcon_dark.svg
similarity index 100%
rename from plugins/gradle/java/resources/META-INF/pluginIcon_dark.svg
rename to plugins/gradle/java/plugin/resources/META-INF/pluginIcon_dark.svg
diff --git a/plugins/gradle/java/properties/resources/intellij.gradle.java.properties.xml b/plugins/gradle/java/properties/resources/intellij.gradle.java.properties.xml
index 42c89ea72215..1181d827f036 100644
--- a/plugins/gradle/java/properties/resources/intellij.gradle.java.properties.xml
+++ b/plugins/gradle/java/properties/resources/intellij.gradle.java.properties.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <plugin id="org.jetbrains.plugins.gradle"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.gradle.java.groovy"/>
     <module name="intellij.java.psi"/>
     <module name="intellij.properties.backend.psi"/>
diff --git a/plugins/gradle/java/resources/META-INF/plugin.xml b/plugins/gradle/java/resources/intellij.gradle.java.xml
similarity index 90%
rename from plugins/gradle/java/resources/META-INF/plugin.xml
rename to plugins/gradle/java/resources/intellij.gradle.java.xml
index 377a4c8c69ea..9fa7eaa52ca4 100644
--- a/plugins/gradle/java/resources/META-INF/plugin.xml
+++ b/plugins/gradle/java/resources/intellij.gradle.java.xml
@@ -1,40 +1,23 @@
-<idea-plugin allow-bundled-update="true">
-  <name>Gradle for Java</name>
-  <!-- "org.jetbrains.plugins.gradle" id has been reused to avoid dependent plugins breakage-->
-  <id>org.jetbrains.plugins.gradle</id>
-  <vendor>JetBrains</vendor>
-  <category>Build Tools</category>
-  <description>
-    Provides Java Gradle projects import, run configuration and profiler integrations.
-  </description>
-
+<idea-plugin visibility="public">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <plugin id="org.intellij.groovy"/>
+    <plugin id="com.intellij.gradle"/>
+    <plugin id="com.jetbrains.performancePlugin"/>
+    <module name="intellij.gradle"/>
+    <module name="intellij.java"/>
+    <module name="intellij.java.compiler"/>
+    <module name="intellij.java.compiler.impl"/>
+    <module name="intellij.java.debugger.impl"/>
+    <module name="intellij.java.debugger.impl.shared"/>
+    <module name="intellij.java.execution"/>
+    <module name="intellij.java.execution.impl"/>
+    <module name="intellij.java.impl"/>
     <module name="intellij.java.indexing"/>
     <module name="intellij.java.ui"/>
     <module name="intellij.platform.jps.build"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <module name="intellij.gradle"/>
-    <!-- endregion -->
+    <module name="intellij.properties.backend.psi"/>
   </dependencies>
-
-  <module value="com.intellij.modules.gradle.java"/>
-  <module value="org.jetbrains.plugins.gradle.java"/>
-
-  <content namespace="jetbrains">
-    <module name="intellij.gradle.profiler"/>
-    <module name="intellij.gradle.java.maven"/>
-    <module name="intellij.gradle.analysis"/>
-    <module name="intellij.gradle.dependencyUpdater"/>
-    <module name="intellij.gradle.java.performance"/>
-    <module name="intellij.gradle.java.toml"/>
-    <module name="intellij.gradle.java.groovy"/>
-    <module name="intellij.gradle.java.groovy.toml"/>
-    <module name="intellij.gradle.java.groovy.ml"/>
-    <module name="intellij.gradle.java.coverage"/>
-    <module name="intellij.gradle.java.properties"/>
-  </content>
-
+  <!-- endregion -->
   <resource-bundle>messages.GradleInspectionBundle</resource-bundle>
 
   <extensionPoints>
diff --git a/plugins/gradle/java/toml/resources/intellij.gradle.java.toml.xml b/plugins/gradle/java/toml/resources/intellij.gradle.java.toml.xml
index 856a312cd2c3..8fa67a3ad66b 100644
--- a/plugins/gradle/java/toml/resources/intellij.gradle.java.toml.xml
+++ b/plugins/gradle/java/toml/resources/intellij.gradle.java.toml.xml
@@ -1,11 +1,11 @@
 <idea-plugin visibility="public">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <plugin id="org.jetbrains.plugins.gradle"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.java.psi"/>
     <module name="intellij.toml.core"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij">
     <elementDescriptionProvider implementation="com.intellij.gradle.java.toml.navigation.VersionCatalogDescriptionProvider"/>
diff --git a/plugins/kotlin/gradle/code-insight-common/resources/intellij.kotlin.gradle.codeInsight.common.xml b/plugins/kotlin/gradle/code-insight-common/resources/intellij.kotlin.gradle.codeInsight.common.xml
index 85b17d7c88fc..03a2db50d5e9 100644
--- a/plugins/kotlin/gradle/code-insight-common/resources/intellij.kotlin.gradle.codeInsight.common.xml
+++ b/plugins/kotlin/gradle/code-insight-common/resources/intellij.kotlin.gradle.codeInsight.common.xml
@@ -1,13 +1,13 @@
 <idea-plugin visibility="internal" package="org.jetbrains.kotlin.idea.gradleCodeInsightCommon">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.kotlin.gradle.tooling"/>
     <module name="intellij.kotlin.projectWizard.idea"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <plugin id="org.jetbrains.plugins.gradle"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.kotlin.gradle.gradle"/>
     <module name="kotlin.code-insight.inspections.shared"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensionPoints>
     <extensionPoint
diff --git a/plugins/kotlin/gradle/code-insight-toml/k2/resources/intellij.kotlin.gradle.codeInsight.toml.k2.xml b/plugins/kotlin/gradle/code-insight-toml/k2/resources/intellij.kotlin.gradle.codeInsight.toml.k2.xml
index df5eb820e399..7f255e02ea5d 100644
--- a/plugins/kotlin/gradle/code-insight-toml/k2/resources/intellij.kotlin.gradle.codeInsight.toml.k2.xml
+++ b/plugins/kotlin/gradle/code-insight-toml/k2/resources/intellij.kotlin.gradle.codeInsight.toml.k2.xml
@@ -1,13 +1,13 @@
 <idea-plugin package="org.jetbrains.kotlin.idea.gradle.versionCatalog.toml.k2">
 
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <plugin id="com.intellij.modules.kotlin.k2"/>
-    <plugin id="org.jetbrains.plugins.gradle"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.gradle.java"/>
     <module name="intellij.gradle.java.toml"/>
     <module name="intellij.kotlin.gradle.codeInsight.toml"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="org.jetbrains.kotlin">
     <psiReferenceProvider implementation="org.jetbrains.kotlin.idea.gradle.versionCatalog.toml.k2.K2GradleTomlVersionCatalogPsiReferenceProviderContributor"/>
diff --git a/plugins/kotlin/gradle/code-insight-toml/resources/intellij.kotlin.gradle.codeInsight.toml.xml b/plugins/kotlin/gradle/code-insight-toml/resources/intellij.kotlin.gradle.codeInsight.toml.xml
index 2547ba8bdba1..1fbad5c0b8d9 100644
--- a/plugins/kotlin/gradle/code-insight-toml/resources/intellij.kotlin.gradle.codeInsight.toml.xml
+++ b/plugins/kotlin/gradle/code-insight-toml/resources/intellij.kotlin.gradle.codeInsight.toml.xml
@@ -1,14 +1,14 @@
 <idea-plugin package="org.jetbrains.kotlin.idea.gradle.versionCatalog.toml">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
+    <plugin id="org.toml.lang"/>
     <module name="intellij.kotlin.gradle.gradle"/>
     <module name="intellij.kotlin.gradle.tooling"/>
     <module name="intellij.gradle.completion"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <plugin id="org.jetbrains.plugins.gradle"/>
-    <plugin id="org.toml.lang"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.gradle.java.toml"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij">
     <gotoDeclarationHandler
diff --git a/plugins/kotlin/gradle/gradle-java/k1/resources/kotlin.gradle.gradle-java.k1.xml b/plugins/kotlin/gradle/gradle-java/k1/resources/kotlin.gradle.gradle-java.k1.xml
index 61ebb0b337b0..116552ad1195 100644
--- a/plugins/kotlin/gradle/gradle-java/k1/resources/kotlin.gradle.gradle-java.k1.xml
+++ b/plugins/kotlin/gradle/gradle-java/k1/resources/kotlin.gradle.gradle-java.k1.xml
@@ -1,7 +1,10 @@
 <idea-plugin package="org.jetbrains.kotlin.idea.gradleJava.k1">
 
   <dependencies>
-    <module name="kotlin.gradle.gradle-java"/>
     <plugin id="com.intellij.modules.kotlin.k1"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.gradle.java"/>
+    <module name="kotlin.gradle.gradle-java"/>
+    <!-- endregion -->
   </dependencies>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/k2/resources/intellij.kotlin.gradle.java.xml b/plugins/kotlin/gradle/gradle-java/k2/resources/intellij.kotlin.gradle.java.xml
index 1a0e0754d290..2dc4b02ea908 100644
--- a/plugins/kotlin/gradle/gradle-java/k2/resources/intellij.kotlin.gradle.java.xml
+++ b/plugins/kotlin/gradle/gradle-java/k2/resources/intellij.kotlin.gradle.java.xml
@@ -1,8 +1,10 @@
 <idea-plugin package="org.jetbrains.kotlin.idea.gradleJava.k2">
 
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
-    <module name="kotlin.gradle.gradle-java"/>
-    <plugin id="org.jetbrains.plugins.gradle"/>
     <plugin id="com.intellij.modules.kotlin.k2"/>
+    <module name="kotlin.gradle.gradle-java"/>
+    <module name="intellij.gradle.java"/>
   </dependencies>
+  <!-- endregion -->
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/resources/kotlin.gradle.gradle-java.xml b/plugins/kotlin/gradle/gradle-java/resources/kotlin.gradle.gradle-java.xml
index 8b950e93a8a3..a5f541e23934 100644
--- a/plugins/kotlin/gradle/gradle-java/resources/kotlin.gradle.gradle-java.xml
+++ b/plugins/kotlin/gradle/gradle-java/resources/kotlin.gradle.gradle-java.xml
@@ -1,14 +1,16 @@
 <idea-plugin visibility="internal" package="org.jetbrains.kotlin.idea.gradleJava">
 
   <dependencies>
-    <module name="intellij.gradle"/>
-    <plugin id="org.jetbrains.plugins.gradle"/>
     <module name="intellij.kotlin.gradle.tooling"/>
-    <module name="intellij.kotlin.gradle.gradle"/>
-    <module name="intellij.kotlin.gradle.codeInsight.common"/>
     <module name="intellij.kotlin.projectWizard.idea"/>
+    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
+    <module name="intellij.gradle"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.kotlin.base.externalSystem"/>
+    <module name="intellij.kotlin.gradle.codeInsight.common"/>
+    <module name="intellij.kotlin.gradle.gradle"/>
     <module name="intellij.kotlin.runConfigurations.jvm"/>
+    <!-- endregion -->
   </dependencies>
 
   <extensionPoints>
diff --git a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/resources/intellij.kotlin.gradle.scripting.xml b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/resources/intellij.kotlin.gradle.scripting.xml
index 17309f1abe34..231c436485c6 100644
--- a/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/resources/intellij.kotlin.gradle.scripting.xml
+++ b/plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/resources/intellij.kotlin.gradle.scripting.xml
@@ -1,17 +1,17 @@
 <idea-plugin package="org.jetbrains.kotlin.gradle.scripting.k2">
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.kotlin.gradle.tooling"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <plugin id="org.jetbrains.plugins.gradle"/>
     <module name="intellij.gradle"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.gradle.java.groovy"/>
     <module name="intellij.gradle.java.toml"/>
     <module name="intellij.kotlin.base.scripting"/>
     <module name="intellij.kotlin.base.scripting.shared"/>
     <module name="kotlin.gradle.gradle-java"/>
     <module name="kotlin.gradle.scripting.shared"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <projectListeners>
     <listener
diff --git a/plugins/kotlin/project-wizard/gradle/resources/intellij.kotlin.projectWizard.gradle.xml b/plugins/kotlin/project-wizard/gradle/resources/intellij.kotlin.projectWizard.gradle.xml
index 952480fcc4fc..23800ce24820 100644
--- a/plugins/kotlin/project-wizard/gradle/resources/intellij.kotlin.projectWizard.gradle.xml
+++ b/plugins/kotlin/project-wizard/gradle/resources/intellij.kotlin.projectWizard.gradle.xml
@@ -1,14 +1,14 @@
 <idea-plugin package="org.jetbrains.kotlin.tools.projectWizard.gradle">
 
+  <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.kotlin.gradle.tooling"/>
-    <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
-    <plugin id="org.jetbrains.plugins.gradle"/>
+    <module name="intellij.gradle.java"/>
     <module name="intellij.kotlin.gradle.codeInsight.common"/>
     <module name="intellij.kotlin.projectWizard.idea"/>
     <module name="kotlin.gradle.gradle-java"/>
-    <!-- endregion -->
   </dependencies>
+  <!-- endregion -->
 
   <extensions defaultExtensionNs="com.intellij">
     <newProjectWizard.kotlin.buildSystem implementation="org.jetbrains.kotlin.tools.projectWizard.gradle.GradleKotlinNewProjectWizard"/>