MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] IDEA-355184 update bundled maven version to 3.9.8

Browse Source 
GitOrigin-RevId: 13e05e234fa18e41305a6f4337c2479d745f4a96
This commit is contained in:
Dmitry Kichinsky
2024-06-20 11:13:56 +02:00
committed by intellij-monorepo-bot
parent 706e6345fc
commit dddbdd20e7
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies/dependencies.properties
View File

@@ -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

2
plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenIndexerCMDState.java
View File

@@ -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;
}

1
plugins/maven/src/test/java/org/jetbrains/idea/maven/compatibility/MavenCompatibilityProjectImportingTest.kt
View File

@@ -385,6 +385,7 @@ class MavenCompatibilityProjectImportingTest : MavenImportingTestCase() {
val mavenVersions: List<Array<String>>
get() = listOf(
arrayOf("4.0.0-beta-3"),
arrayOf("3.9.8"),
arrayOf("3.9.7"),
arrayOf("3.9.6"),
arrayOf("3.9.5"),

26
plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/InvalidProjectImportingTest.kt
View File

@@ -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'"))
}