Merge branch 'master' of github.com:grails/inconsequential

Conflicts:
	inconsequential.ipr

inconsequential.ipr

@@ -407,9 +407,9 @@
       <JAVADOC />
       <SOURCES />
     </library>
-    <library name="Spring JCR Module">
+    <library name="Spring Extension JCR">
       <CLASSES>
-        <root url="jar://$GRADLE_CACHE$/org.springmodules/spring-modules-jcr/jars/spring-modules-jcr-0.10-SNAPSHOT.jar!/" />
+        <root url="jar://$GRADLE_REPOSITORY$/org.springframework/se-jcr/jars/se-jcr-1.0-SNAPSHOT.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES />

spring-datastore-jcr/build.gradle

@@ -1,22 +1,13 @@
-//apply plugin: 'groovy'
-
-repositories {
-  mavenRepo name:'mavenLocal',
-              urls:new File( System.getProperty("user.home" ), ".m2/repository" ).toURL().toString()
-
-  flatDir dirs: ['lib', 'jcr/lib']
-}
 dependencies {
-  compile project(":core")
+  compile project(":spring-datastore-core")
   compile 'javax.jcr:jcr:1.0'
-  compile 'org.springmodules:spring-modules-jcr:0.10-SNAPSHOT'
+  compile 'org.springframework:se-jcr:1.0-SNAPSHOT'
   compile 'org.apache.jackrabbit:jackrabbit-core:1.6.2'
   compile 'org.apache.jackrabbit:jackrabbit-api:1.6.2'
   compile 'org.apache.jackrabbit:jackrabbit-jcr-commons:1.6.2'
   compile 'org.apache.jackrabbit:jackrabbit-spi-commons:1.6.2'
   compile 'org.slf4j:slf4j-log4j12:1.5.3'
 
-  //runtime 'org.apache.jackrabbit:jackrabbit-standalone:1.6.2'
   testCompile 'junit:junit:4.8.1'
 }
 jar.appendix = 'jcr'

spring-datastore-jcr/jcr.iml

@@ -6,19 +6,19 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/groovy" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/src/main/java" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core" />
     <orderEntry type="library" name="Grails Libraries" level="project" />
     <orderEntry type="library" name="JackRabbit" level="project" />
     <orderEntry type="library" name="Java Persistence" level="project" />
-    <orderEntry type="library" name="Spring Module JCR" level="project" />
     <orderEntry type="library" name="JCR" level="project" />
     <orderEntry type="library" name="JUnit" level="project" />
     <orderEntry type="library" name="Spring Transaction" level="project" />
     <orderEntry type="library" name="Spring Core" level="project" />
+    <orderEntry type="library" name="Spring Extension JCR" level="project" />
   </component>
 </module>