MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] IDEA-360609 Maven 4: create subprojects instead of modules if modelVersion=4.1.0

Browse Source 
GitOrigin-RevId: 9a621f306d0ba2ab4855b52d6ab4b98d245dc49a
This commit is contained in:
Dmitry Kichinsky
2025-02-11 17:49:25 +00:00
committed by intellij-monorepo-bot
parent feef33f5ad
commit 19baaa6a52
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.kt
+22 -2
View File
@@ -23,11 +23,13 @@ import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiManager
import com.intellij.psi.codeStyle.CodeStyleManager
import com.intellij.util.text.VersionComparatorUtil
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.jetbrains.annotations.VisibleForTesting
import org.jetbrains.idea.maven.dom.MavenDomUtil
import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
import org.jetbrains.idea.maven.execution.MavenRunner
import org.jetbrains.idea.maven.execution.MavenRunnerParameters
import org.jetbrains.idea.maven.model.MavenArchetype
@@ -132,12 +134,30 @@ open class MavenModuleBuilderHelper(
val model = MavenDomUtil.getMavenDomProjectModel(project, aggregatorProjectFile)
if (model != null) {
model.packaging.stringValue = "pom"
val module = model.modules.addModule()
module.value = getPsiFile(project, file)
val psiFile = getPsiFile(project, file)
val useSubprojects = useSubprojects(model)
if (useSubprojects) {
val subproject = model.subprojects.addSubproject()
subproject.value = psiFile
}
else {
val module = model.modules.addModule()
module.value = psiFile
}
unblockAndSaveDocuments(project, aggregatorProjectFile)
}
}
private fun useSubprojects(model: MavenDomProjectModel): Boolean {
// if any subprojects exist, add subproject; if modules exist, add module; if none exist, check modelVersion
if (model.subprojects.subprojects.any()) return true
if (model.modules.modules.any()) return false
val modelVersion = model.modelVersion.value
return VersionComparatorUtil.compare(modelVersion, "4.1.0") >= 0
}
protected fun updateProjectPom(project: Project, pom: VirtualFile) {
if (myParentProject == null) return