diff --git a/idea/idea-maven/resources/inspectionDescriptions/SameVersion.html b/idea/idea-maven/resources/inspectionDescriptions/DifferentMavenStdlibVersion.html similarity index 100% rename from idea/idea-maven/resources/inspectionDescriptions/SameVersion.html rename to idea/idea-maven/resources/inspectionDescriptions/DifferentMavenStdlibVersion.html diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionInspection.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/DifferentMavenStdlibVersionInspection.kt similarity index 97% rename from idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionInspection.kt rename to idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/DifferentMavenStdlibVersionInspection.kt index 2510cb2647e..43a238bebb2 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionInspection.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/DifferentMavenStdlibVersionInspection.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.idea.maven.PomFile import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator -class SameVersionInspection : DomElementsInspection(MavenDomProjectModel::class.java) { +class DifferentMavenStdlibVersionInspection : DomElementsInspection(MavenDomProjectModel::class.java) { override fun checkFileElement(domFileElement: DomFileElement?, holder: DomElementAnnotationHolder?) { if (domFileElement == null || holder == null) { return diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java index b87295fee6e..82841f1758d 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java @@ -83,6 +83,12 @@ public class KotlinMavenInspectionTestGenerated extends AbstractKotlinMavenInspe doTest(fileName); } + @TestMetadata("sameVersionPluginLibrarySuppression.xml") + public void testSameVersionPluginLibrarySuppression() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml"); + doTest(fileName); + } + @TestMetadata("wrongJsExecution.xml") public void testWrongJsExecution() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/wrongJsExecution.xml"); diff --git a/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml index efcb01b4c2b..12efebc2b8b 100644 --- a/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml +++ b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml @@ -32,6 +32,6 @@ - + \ No newline at end of file diff --git a/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml index 0da5452e2d2..1ef707167f6 100644 --- a/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml +++ b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml @@ -32,6 +32,6 @@ - + \ No newline at end of file diff --git a/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml index ffdc68ae3db..b966867bb66 100644 --- a/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml +++ b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml @@ -32,6 +32,6 @@ - + \ No newline at end of file diff --git a/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml new file mode 100644 index 00000000000..56cba98fda4 --- /dev/null +++ b/idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + org.jetbrains.kotlin.test + configure-maven-test + 1.0-SNAPSHOT + + + 1.0.1 + 1.0.1-2 + + + + + org.jetbrains.kotlin + kotlin-stdlib + + ${kotlin.version.2} + + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + + ${kotlin.version.1} + + + + + + \ No newline at end of file diff --git a/idea/src/META-INF/maven.xml b/idea/src/META-INF/maven.xml index d75ec1828e0..1ecf8ad08f6 100644 --- a/idea/src/META-INF/maven.xml +++ b/idea/src/META-INF/maven.xml @@ -36,7 +36,7 @@ hasStaticDescription="true" level="WARNING" /> -