Merge pull request #1150 from neetkee/patch-1

import-into-idea.md

@@ -4,17 +4,19 @@ The following has been tested against IntelliJ IDEA 2016.2.2
 
 _Within your locally cloned spring-framework working directory:_
 
-1. Import into IntelliJ IDEA (File -> New -> Project from Existing Sources -> Select directory -> Select Gradle -> Use gradle wrapper task configuration 
+1. Precompile `spring-oxm` with `./gradlew cleanIdea :spring-oxm:compileTestJava`
-2. Set the Project JDK as appropriate (1.8+)
+2. Import into IntelliJ (File -> New -> Project from Existing Sources -> Navigate to directory -> Select build.gradle)
-3. Code away
+3. When prompted exclude the `spring-aspects` module (or after the import via File-> Project Structure -> Modules)
+4. Code away
 
-## Known issues for IntelliJ IDEA 13.1
+## Known issues
 
-1. `spring-oxm` should be pre-compiled since it's using repackaged dependencies (see *RepackJar tasks). You can precompile `spring-oxm` with `./gradlew cleanIdea :spring-oxm:compileTestJava`
+1. `spring-core` and ``spring-oxm` should be pre-compiled due to repackaged dependencies.
-2. `spring-aspects` does not compile out of the box due to references to aspect types unknown to
+See `*RepackJar` tasks in the build and https://youtrack.jetbrains.com/issue/IDEA-160605).
+2. `spring-aspects` does not compile due to references to aspect types unknown to
 IntelliJ IDEA. See http://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, the
-'spring-aspects' should be excluded from the overall project to avoid compilation errors. To exclude go to File-> Project Structure -> Modules
+'spring-aspects' can be excluded from the project to avoid compilation errors.
-3. While all JUnit tests pass from the command line with Gradle, many will fail when run from
+3. While JUnit tests pass from the command line with Gradle, some may fail when run from
 IntelliJ IDEA. Resolving this is a work in progress. If attempting to run all JUnit tests from within
 IntelliJ IDEA, you will likely need to set the following VM options to avoid out of memory errors:
     -XX:MaxPermSize=2048m -Xmx2048m -XX:MaxHeapSize=2048m