From 97bc01da04cedee32bb4a3d8ae24e15b130bcb32 Mon Sep 17 00:00:00 2001 From: Victoria Petrakovich Date: Tue, 3 Feb 2026 16:48:58 +0100 Subject: [PATCH] [kotlin] KTIJ-16504, IDEA-384711 Use `${kotlin.version}` property for kotlin-maven-plugin too GitOrigin-RevId: 799af722fde85d1916d3af9093bc011504a4faa8 --- .../tools/projectWizard/wizard/MavenNewKotlinModuleTest.kt | 1 - .../mavenNewProjectWizard/addSampleCodeEverywhere/pom.xml | 2 +- .../mavenNewProjectWizard/addSampleCodeOnlyInModule/pom.xml | 2 +- .../testData/mavenNewProjectWizard/createNewProject/pom.xml | 2 +- .../mavenNewProjectWizard/newModuleInJavaProject/module/pom.xml | 2 +- .../newModuleInKotlinProjectIndependentHierarchy/module/pom.xml | 2 +- .../newModuleInKotlinProjectIndependentHierarchy/pom.xml | 2 +- .../tests/testData/mavenNewProjectWizard/simpleProject/pom.xml | 2 +- .../resources/fileTemplates/j2ee/Maven Kotlin Project.xml.ft | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/MavenNewKotlinModuleTest.kt b/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/MavenNewKotlinModuleTest.kt index 353b875d8cbd..6fa4cea20f4c 100644 --- a/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/MavenNewKotlinModuleTest.kt +++ b/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/MavenNewKotlinModuleTest.kt @@ -312,7 +312,6 @@ class MavenNewKotlinModuleTest : MavenNewProjectWizardTestCase(), NewKotlinProje override fun substituteArtifactsVersions(str: String): String { var result = str - result = substituteVersionForArtifact(result, "kotlin-maven-plugin", needMoreSpaces = true) result = substituteVersionForArtifact(result, "maven-surefire-plugin", needMoreSpaces = true) result = substituteVersionForArtifact(result, "maven-failsafe-plugin", needMoreSpaces = true) result = substituteVersionForArtifact(result, "junit-jupiter") diff --git a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/addSampleCodeEverywhere/pom.xml b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/addSampleCodeEverywhere/pom.xml index adcea947153a..f474be97efa9 100644 --- a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/addSampleCodeEverywhere/pom.xml +++ b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/addSampleCodeEverywhere/pom.xml @@ -33,7 +33,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - VERSION + ${kotlin.version} compile diff --git a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/addSampleCodeOnlyInModule/pom.xml b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/addSampleCodeOnlyInModule/pom.xml index adcea947153a..f474be97efa9 100644 --- a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/addSampleCodeOnlyInModule/pom.xml +++ b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/addSampleCodeOnlyInModule/pom.xml @@ -33,7 +33,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - VERSION + ${kotlin.version} compile diff --git a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/createNewProject/pom.xml b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/createNewProject/pom.xml index d0b0f30cbf9d..c462f364c3d1 100644 --- a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/createNewProject/pom.xml +++ b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/createNewProject/pom.xml @@ -29,7 +29,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - VERSION + ${kotlin.version} compile diff --git a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInJavaProject/module/pom.xml b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInJavaProject/module/pom.xml index 1d1d9c7918a8..3054278fb1da 100644 --- a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInJavaProject/module/pom.xml +++ b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInJavaProject/module/pom.xml @@ -32,7 +32,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - VERSION + ${kotlin.version} compile diff --git a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/module/pom.xml b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/module/pom.xml index 2b4de2db3c2f..e541db48a829 100644 --- a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/module/pom.xml +++ b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/module/pom.xml @@ -29,7 +29,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - VERSION + ${kotlin.version} compile diff --git a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/pom.xml b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/pom.xml index d0b0f30cbf9d..c462f364c3d1 100644 --- a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/pom.xml +++ b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/pom.xml @@ -29,7 +29,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - VERSION + ${kotlin.version} compile diff --git a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/simpleProject/pom.xml b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/simpleProject/pom.xml index adcea947153a..f474be97efa9 100644 --- a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/simpleProject/pom.xml +++ b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/simpleProject/pom.xml @@ -33,7 +33,7 @@ org.jetbrains.kotlin kotlin-maven-plugin - VERSION + ${kotlin.version} compile diff --git a/plugins/maven/src/main/resources/fileTemplates/j2ee/Maven Kotlin Project.xml.ft b/plugins/maven/src/main/resources/fileTemplates/j2ee/Maven Kotlin Project.xml.ft index 046f1f4b1d38..8739ff99f564 100644 --- a/plugins/maven/src/main/resources/fileTemplates/j2ee/Maven Kotlin Project.xml.ft +++ b/plugins/maven/src/main/resources/fileTemplates/j2ee/Maven Kotlin Project.xml.ft @@ -41,7 +41,7 @@ org.jetbrains.kotlin kotlin-maven-plugin #if (${INHERIT_MAVEN_KOTLIN_PLUGIN_VERSION} == false) - ${KOTLIN_PLUGIN_WIZARD_VERSION} + $${kotlin.version} #end