From bfcf7d2b1ee57c72c89dae290513a564d35b3edb Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 29 Mar 2016 17:14:21 +0300
Subject: [PATCH] [REVERTED] 2dd83b1 Alexey Sedunov on 3/25/2016 at 16:08
 (committed on 3/25/2016 at 16:21) Misc: Fetch Spring libraries to
 dependencies directory

---
 .../kotlin/idea/spring/tests/SpringTestFixtureExtension.kt   | 5 ++---
 update_dependencies.xml                                      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt b/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
index 4b8a02a3f87..e210bad5e32 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
+++ b/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
@@ -24,7 +24,6 @@ import com.intellij.testFramework.fixtures.CodeInsightTestFixture
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.test.TestFixtureExtension
-import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.util.*
 
 @Suppress("unused")
@@ -38,12 +37,12 @@ class SpringTestFixtureExtension() : TestFixtureExtension {
         )
     }
 
-    val SPRING_LIBRARY_ROOT = "${KotlinTestUtils.getHomeDirectory()}/dependencies/spring"
+    val SPRING_LIBRARY_ROOT = "${PluginTestCaseBase.getTestDataPathBase()}/spring/_lib"
 
     override fun setUp(module: Module) {
         this.module = module
         val library = SpringFramework.FRAMEWORK_4_2_0
-        val libraryPath = "$SPRING_LIBRARY_ROOT/${library.version}/"
+        val libraryPath = "$SPRING_LIBRARY_ROOT/spring/${library.version}/"
         val jarNames = HashSet<String>(library.artifactIds.size)
         for (id in library.artifactIds) {
             jarNames.add("spring-$id-${library.version}.jar")
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 9ca2bcdb07c..7a3c6a81c42 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -146,7 +146,7 @@
                 lib="@{lib}"
                 version="@{version}"
                 src="false"
-                dependencies="dependencies/spring/@{version}"/>
+                dependencies="idea/testData/spring/_lib/spring/@{version}"/>
         </sequential>
     </macrodef>