[ml-local-models] move java-dependent part to main plugin

(cherry picked from commit 3714e5265a89b7a53644aeb2f8d4999de18ea1e8)

IJ-CR-10484

GitOrigin-RevId: 51937ded68e6f04e0fa2eb41f2cd0ec126090856

.idea/modules.xml

@@ -582,7 +582,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/intellij.java.langInjection.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/intellij.java.langInjection.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/manifest/intellij.java.manifest.iml" filepath="$PROJECT_DIR$/java/manifest/intellij.java.manifest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/java/java-ml-local-models/intellij.java.ml.models.local.iml" filepath="$PROJECT_DIR$/java/java-ml-local-models/intellij.java.ml.models.local.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/plugin/intellij.java.plugin.iml" filepath="$PROJECT_DIR$/java/plugin/intellij.java.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/java-psi-api/intellij.java.psi.iml" filepath="$PROJECT_DIR$/java/java-psi-api/intellij.java.psi.iml" />
       <module fileurl="file://$PROJECT_DIR$/java/java-psi-impl/intellij.java.psi.impl.iml" filepath="$PROJECT_DIR$/java/java-psi-impl/intellij.java.psi.impl.iml" />
@@ -646,6 +645,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven30-server-impl/intellij.maven.server.m30.impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven30-server-impl/intellij.maven.server.m30.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven36-server-impl/intellij.maven.server.m36.impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven36-server-impl/intellij.maven.server.m36.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ml-local-models/intellij.ml.models.local.iml" filepath="$PROJECT_DIR$/plugins/ml-local-models/intellij.ml.models.local.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/ml-local-models/java/intellij.ml.models.local.java.iml" filepath="$PROJECT_DIR$/plugins/ml-local-models/java/intellij.ml.models.local.java.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" filepath="$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/package-search/intellij.packageSearch.iml" filepath="$PROJECT_DIR$/plugins/package-search/intellij.packageSearch.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" filepath="$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" />

intellij.idea.community.main.iml

@@ -152,7 +152,7 @@
     <orderEntry type="module" module-name="intellij.java.featuresTrainer" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.idea.community.build.tasks" scope="TEST" />
     <orderEntry type="module" module-name="intellij.junit.v5.rt.tests" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.java.ml.models.local" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.ml.models.local.java" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.kotlin.plugin.community.main" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file

java/plugin/resources/META-INF/plugin.xml

@@ -29,7 +29,6 @@
   <depends optional="true" config-file="intellij.java.structuralSearch.xml">com.intellij.modules.structuralsearch</depends>
   <depends optional="true" config-file="intellij.java.remoteServers.impl.xml">com.intellij.modules.remoteServers</depends>
   <depends optional="true" config-file="intellij.java.featuresTrainer.xml">training</depends>
-  <depends optional="true" config-file="intellij.java.ml.models.local.xml">com.intellij.ml.local.models</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <moduleType id="JAVA_MODULE" classpathProvider="true" implementationClass="com.intellij.openapi.module.JavaModuleType"/>

platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy

@@ -175,6 +175,7 @@ final class CommunityRepositoryModules {
       bundlingRestrictions.includeInEapOnly = true
     },
     plugin("intellij.ml.models.local") {
+      withModule("intellij.ml.models.local.java")
       bundlingRestrictions.includeInEapOnly = true
     },
     plugin("intellij.jps.cache"),

platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy

@@ -68,8 +68,7 @@ final class JavaPluginLayout {
         "intellij.java.uast",
         "intellij.java.structuralSearch",
         "intellij.java.typeMigration",
-        "intellij.java.featuresTrainer",
-        "intellij.java.ml.models.local"
+        "intellij.java.featuresTrainer"
       ].each {
         withModule(it, "java-impl.jar")
       }

plugins/ml-local-models/resources/META-INF/plugin.xml

@@ -27,4 +27,6 @@
 
     <projectService serviceImplementation="com.intellij.ml.local.models.LocalModelsManager"/>
   </extensions>
+
+  <depends optional="true" config-file="intellij.ml.models.local.java.xml">com.intellij.modules.java</depends>
 </idea-plugin>
\ No newline at end of file