convert intellij.jvm.analysis.impl to V2 module

GitOrigin-RevId: aac0cb7c6c3d40f424d468a4eedd34507dc2f2ef

java/java-analysis-impl/intellij.java.analysis.impl.iml

@@ -20,7 +20,6 @@
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.java" />
-    <orderEntry type="module" module-name="intellij.jvm.analysis.impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" />

java/java-impl/src/META-INF/JavaPlugin.xml

@@ -1,43 +1,27 @@
-<!--
-  ~ Copyright 2000-2017 JetBrains s.r.o.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <module value="com.intellij.modules.java"/>
 
   <depends optional="true" config-file="images-integration.xml">com.intellij.platform.images</depends>
   <depends optional="true" config-file="community-integration.xml">com.intellij.modules.idea.community</depends>
 
-  <xi:include href="/idea/JavaActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/idea/JavaActions.xml"/>
 
-  <xi:include href="intellij.java.frontback.psi.impl.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="intellij.java.frontback.impl.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/JvmAnalysisPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/JavaIndexingPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/JavaPsiPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/JavaAnalysisPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/IntentionPowerPack.xml" xpointer="xpointer(/idea-plugin/*)">
+  <xi:include href="intellij.java.frontback.psi.impl.xml"/>
+  <xi:include href="intellij.java.frontback.impl.xml"/>
+  <xi:include href="/META-INF/JavaIndexingPlugin.xml"/>
+  <xi:include href="/META-INF/JavaPsiPlugin.xml"/>
+  <xi:include href="/META-INF/JavaAnalysisPlugin.xml"/>
+  <xi:include href="/META-INF/IntentionPowerPack.xml">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/InspectionGadgets.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/ManifestSupport.xml" xpointer="xpointer(/idea-plugin/*)">
+  <xi:include href="/META-INF/InspectionGadgets.xml"/>
+  <xi:include href="/META-INF/ManifestSupport.xml">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/TypeMigration.xml" xpointer="xpointer(/idea-plugin/*)">
+  <xi:include href="/META-INF/TypeMigration.xml">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/UsageData.xml" xpointer="xpointer(/idea-plugin/*)">
+  <xi:include href="/META-INF/UsageData.xml">
     <xi:fallback/>
   </xi:include>
 

java/plugin/plugin-content.yaml

@@ -41,7 +41,6 @@
   - name: intellij.java.remoteServers.impl
   - name: intellij.uiDesigner
   - name: intellij.java.analysis.impl
-  - name: intellij.jvm.analysis.impl
   - name: intellij.jvm.analysis.quickFix
   - name: intellij.jvm.analysis.refactoring
   - name: intellij.java.indexing.impl
@@ -133,6 +132,9 @@
 - name: lib/modules/intellij.java.vcs.jar
   contentModules:
   - name: intellij.java.vcs
+- name: lib/modules/intellij.jvm.analysis.impl.jar
+  contentModules:
+  - name: intellij.jvm.analysis.impl
 - name: lib/netty-codec-protobuf.jar
   projectLibraries:
   - name: netty-codec-protobuf

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

@@ -39,6 +39,7 @@
     <module name="intellij.java.vcs"/>
     <module name="intellij.java.compiler.charts"/>
     <module name="intellij.java.terminal"/>
+    <module name="intellij.jvm.analysis.impl"/>
   </content>
 
   <depends optional="true" config-file="intellij.java.remoteServers.impl.xml">com.intellij.modules.remoteServers</depends>

platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.kt

@@ -9,7 +9,7 @@ object JavaPluginLayout {
   const val MAIN_FRONTEND_MODULE_NAME = "intellij.java.frontend"
 
   fun javaPlugin(addition: ((PluginLayout.PluginLayoutSpec) -> Unit)? = null): PluginLayout {
-    return PluginLayout.plugin(MAIN_MODULE_NAME, auto = true) { spec ->
+    return PluginLayout.plugin(mainModuleName = MAIN_MODULE_NAME, auto = true) { spec ->
       spec.directoryName = "java"
       spec.mainJarName = "java-impl.jar"
 

platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginLayout.kt

@@ -45,7 +45,7 @@ class PluginLayout private constructor(
   }
 
   @TestOnly
-  fun isLibraryExcluded(name: String): Boolean = excludedLibraries.get(null)?.contains(name) ?: false
+  fun isLibraryExcluded(name: String): Boolean = excludedLibraries.get(null)?.contains(name) == true
 
   var directoryName: String = mainJarNameWithoutExtension
     private set