From dddbdd20e76e8c3b7ddc049c6772e5db8b698714 Mon Sep 17 00:00:00 2001 From: Dmitry Kichinsky Date: Thu, 20 Jun 2024 11:13:56 +0200 Subject: [PATCH] [maven] IDEA-355184 update bundled maven version to 3.9.8 GitOrigin-RevId: 13e05e234fa18e41305a6f4337c2479d745f4a96 --- build/dependencies/dependencies.properties | 2 +- .../maven/server/MavenIndexerCMDState.java | 2 +- .../MavenCompatibilityProjectImportingTest.kt | 1 + .../importing/InvalidProjectImportingTest.kt | 26 ++++++++++++++++--- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/build/dependencies/dependencies.properties b/build/dependencies/dependencies.properties index 3b32eede231a..4a204d1d993b 100644 --- a/build/dependencies/dependencies.properties +++ b/build/dependencies/dependencies.properties @@ -1,5 +1,5 @@ # The file is automatically updated. Comments and empty lines will be removed. Entries are sorted by key. -bundledMavenVersion=3.9.7 +bundledMavenVersion=3.9.8 debuggerAgent=1.2 gradleApiVersion=8.8 jdkBuild=17.0.11b1318.1 diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenIndexerCMDState.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenIndexerCMDState.java index 7e1bee32d6cc..4517ff7f139f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenIndexerCMDState.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenIndexerCMDState.java @@ -131,8 +131,8 @@ public class MavenIndexerCMDState extends CommandLineState { params.setMainClass("org.jetbrains.idea.maven.server.indexer.MavenServerIndexerMain"); params.getClassPath().add(PathUtil.getJarPathForClass(StringUtilRt.class));//util-rt params.getClassPath().add(PathUtil.getJarPathForClass(NotNull.class));//annotations-java5 - params.getClassPath().add(PathUtil.getJarPathForClass(Element.class));//JDOM params.getClassPath().addAllFiles(collectClassPathAndLibsFolder(myDistribution)); + params.getClassPath().add(PathUtil.getJarPathForClass(Element.class));//JDOM return params; } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compatibility/MavenCompatibilityProjectImportingTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compatibility/MavenCompatibilityProjectImportingTest.kt index 756329458c79..79e78159974d 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compatibility/MavenCompatibilityProjectImportingTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compatibility/MavenCompatibilityProjectImportingTest.kt @@ -385,6 +385,7 @@ class MavenCompatibilityProjectImportingTest : MavenImportingTestCase() { val mavenVersions: List> get() = listOf( arrayOf("4.0.0-beta-3"), + arrayOf("3.9.8"), arrayOf("3.9.7"), arrayOf("3.9.6"), arrayOf("3.9.5"), diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/InvalidProjectImportingTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/InvalidProjectImportingTest.kt index 2cae0b46efb0..0ffe443e4a80 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/InvalidProjectImportingTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/InvalidProjectImportingTest.kt @@ -639,7 +639,11 @@ class InvalidProjectImportingTest : MavenMultiVersionImportingTestCase() { val root = rootProjects[0] val problems = root.getProblems() UsefulTestCase.assertSize(1, problems) - assertTrue(problems[0]!!.description!!.contains("Could not find artifact xxx:yyy:jar:1")) + val description = if (mavenVersionIsOrMoreThan("3.9.8")) + "Unresolveable build extension: Plugin xxx:yyy:1 or one of its dependencies could not be resolved" + else + "Could not find artifact xxx:yyy:jar:1" + assertTrue(problems[0]!!.description!!.contains(description)) } @Test @@ -726,12 +730,20 @@ class InvalidProjectImportingTest : MavenMultiVersionImportingTestCase() { var problems = getModules(root)[0].getProblems() UsefulTestCase.assertSize(1, problems) - assertTrue(problems[0]!!.description, problems[0]!!.description!!.contains("Could not find artifact xxx:xxx:jar:1")) + val description = if (mavenVersionIsOrMoreThan("3.9.8")) + "Unresolveable build extension: Plugin xxx:xxx:1 or one of its dependencies could not be resolved" + else + "Could not find artifact xxx:xxx:jar:1" + assertTrue(problems[0]!!.description, problems[0]!!.description!!.contains(description)) problems = getModules(root)[1].getProblems() UsefulTestCase.assertSize(1, problems) - assertTrue(problems[0]!!.description, problems[0]!!.description!!.contains("Could not find artifact yyy:yyy:jar:1")) + val description2 = if (mavenVersionIsOrMoreThan("3.9.8")) + "Unresolveable build extension: Plugin yyy:yyy:1 or one of its dependencies could not be resolved" + else + "Could not find artifact yyy:yyy:jar:1" + assertTrue(problems[0]!!.description, problems[0]!!.description!!.contains(description2)) } @Test @@ -803,7 +815,13 @@ class InvalidProjectImportingTest : MavenMultiVersionImportingTestCase() { val root = rootProjects[0] val problems = root.getProblems() UsefulTestCase.assertSize(2, problems) - assertTrue(problems[0]!!.description, problems[0]!!.description!!.contains("Could not find artifact xxx:yyy:jar:1")) + + val description = if (mavenVersionIsOrMoreThan("3.9.8")) + "Unresolveable build extension: Plugin xxx:yyy:1 or one of its dependencies could not be resolved" + else + "Could not find artifact xxx:yyy:jar:1" + assertTrue(problems[0]!!.description, problems[0]!!.description!!.contains(description)) + assertTrue(problems[1]!!.description, problems[1]!!.description!!.contains("Unresolved plugin: 'xxx:yyy:1'")) }