diff --git a/build.gradle b/build.gradle
index 07deaed1b5..70798022b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,36 +42,36 @@ configure (aspectjProjects) {
 }
 
 apply from: "$rootDir/gradle/dist.gradle"
-apply plugin: 'idea'
 
-configure(javaProjects) {
+allprojects {
     apply plugin: 'idea'
     apply plugin: 'eclipse'
-    ideaModule {
-        downloadJavadoc=false
-        excludeDirs.add(buildDir)
-    }
     def config = configurations.findByName('testRuntime')
     if (!config) {
         return
     }
+
     ideaModule {
+        downloadJavadoc=false
+        excludeDirs.add(buildDir)
         gradleCacheVariable = 'GRADLE_CACHE'
+        outputDir = "$rootProject.projectDir/intellij/out" as File
+        testOutputDir = "$rootProject.projectDir/intellij/testOut" as File
     }
 }
 
 ideaModule {
-    excludeDirs.add(file('.gradle'))
-    excludeDirs.add(file('buildSrc/build'))
-    excludeDirs.add(file('buildSrc/.gradle'))
+    excludeDirs += file('.gradle')
+    excludeDirs += file('buildSrc/build')
+    excludeDirs += file('buildSrc/.gradle')
 }
 
 ideaProject {
-    wildcards += ['?*.gradle']
     javaVersion = '1.6'
-
     withXml { node ->
-        node.component.find { it.@name == 'VcsDirectoryMappings' }.mapping.@vcs = 'Git'
+        // Use git
+        def vcsConfig = node.component.find { it.'@name' == 'VcsDirectoryMappings' }
+        vcsConfig.mapping[0].'@vcs' = 'Git'
     }
 }
 
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index e48d52bdca..395fdee221 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'eclipse'
 
-springVersion = '3.0.3.RELEASE'
+springVersion = '3.0.4.RELEASE'
 springLdapVersion = '1.3.0.RELEASE'
 ehcacheVersion = '1.6.2'
 aspectjVersion = '1.6.9'