From a74f4e754b30b9488fa883e48feba390d3a0e60e Mon Sep 17 00:00:00 2001 From: Dmitry Kichinsky Date: Wed, 16 Jul 2025 11:10:27 +0200 Subject: [PATCH] [maven] IDEA-375601 fix ProxyImportingTest.testResolvePluginsUsingProxy GitOrigin-RevId: ff403ce958ed940817fd97bdfa14d097cb92d145 --- .../maven/importing/ProxyImportingTest.kt | 43 ++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ProxyImportingTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ProxyImportingTest.kt index 506bc718ecb2..1444240bddfa 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ProxyImportingTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ProxyImportingTest.kt @@ -16,9 +16,9 @@ import kotlin.io.path.exists import kotlin.io.path.isRegularFile class ProxyImportingTest : MavenMultiVersionImportingTestCase() { - lateinit var myRepositoryFixture: MavenHttpRepositoryServerFixture; - lateinit var myProxyFixture: MavenHttpProxyServerFixture; - lateinit var myHelper: MavenCustomRepositoryHelper; + lateinit var myRepositoryFixture: MavenHttpRepositoryServerFixture + lateinit var myProxyFixture: MavenHttpProxyServerFixture + lateinit var myHelper: MavenCustomRepositoryHelper override fun setUp() { super.setUp() @@ -49,7 +49,9 @@ class ProxyImportingTest : MavenMultiVersionImportingTestCase() { "settings.xml", """ + $localRepoPath + central-mirror @@ -66,14 +68,7 @@ class ProxyImportingTest : MavenMultiVersionImportingTestCase() { false - - - central - my-mirror - http://mavendummycentral.jetbrains.com/ - false - - + my @@ -84,6 +79,32 @@ class ProxyImportingTest : MavenMultiVersionImportingTestCase() { ${myProxyFixture.port} + + + + custom-repos + + + central + my-mirror + http://mavendummycentral.jetbrains.com/ + false + + + + + central-plugins + http://mavendummycentral.jetbrains.com/ + false + + + + + + + custom-repos + + """.trimIndent()) mavenGeneralSettings.setUserSettingsFile(settingsXml.canonicalPath)