From 0f11b2bf73930b77857d43f4ef53a1eb24bf933a Mon Sep 17 00:00:00 2001 From: Alexander Bubenchikov Date: Tue, 19 Dec 2023 12:01:50 +0100 Subject: [PATCH] [maven][IDEA-340182] use default plugin groupid in case if plugin groupid is not set in pom GitOrigin-RevId: 478103a9490270e2625b66cefb447d1bf33af025 --- .../preimport/MavenProjectPreImporter.kt | 3 ++- .../maven/importing/MavenPreimportingTest.kt | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/preimport/MavenProjectPreImporter.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/preimport/MavenProjectPreImporter.kt index 899236d444b3..01c245397c95 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/preimport/MavenProjectPreImporter.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/preimport/MavenProjectPreImporter.kt @@ -490,7 +490,8 @@ class MavenProjectPreImporter(val project: Project, val coroutineScope: Coroutin } ?: emptyList() val id = extractId(it) - val plugin = MavenPlugin(id.groupId, id.artifactId, id.version, false, false, it.getChild("configuration"), executions, emptyList()) + val groupId = id.groupId.nullize(true) ?: "org.apache.maven.plugins" + val plugin = MavenPlugin(groupId, id.artifactId, id.version, false, false, it.getChild("configuration"), executions, emptyList()) plugins[trimVersion(id)] = plugin } return plugins diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPreimportingTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPreimportingTest.kt index 84954e23088c..43cd3dd28079 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPreimportingTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPreimportingTest.kt @@ -216,6 +216,33 @@ class MavenPreimportingTest : MavenMultiVersionImportingTestCase() { } } + @Test + fun testImportProjectWithCompilerConfigWithoutGroupId() = runBlocking { + importProjectAsync(""" + test + project + 1 + + + + maven-compiler-plugin + 3.11.0 + + 14 + 14 + + + + + """.trimIndent()) + + + readAction { + val module = getModule("project") + assertEquals(LanguageLevel.JDK_14, LanguageLevelUtil.getEffectiveLanguageLevel(module)) + } + } + @Test fun testImportProjectWithCompilerConfigOfParent() = runBlocking {