Fix Dependency for datastore

Conflicts: gradle/assemble.gradle
grails · Mar 19, 2011 · f6c66ce · f6c66ce
1 parent 66f1ee8
commit f6c66ce
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
@@ -3,19 +3,19 @@ import org.apache.tools.ant.filters.ReplaceTokens
 dependencyCache = {
 	def cacheLocation = new File(gradle.gradleUserHomeDir, "cache")
 	copy {
-		from( cacheLocation ) {	
-			def dependencyIncludes = [] as Set			
+		from( cacheLocation ) {
+			def dependencyIncludes = [] as Set
 			def includeClosure = { artifact ->
-				def dependency = artifact.getResolvedDependency() 	
-				def file = artifact.file	
-				dependencyIncludes << "${dependency.moduleGroup}/${dependency.moduleName}/*-${dependency.moduleVersion}.*"
-				dependencyIncludes << "${dependency.moduleGroup}/${dependency.moduleName}/jars/${dependency.moduleName}-${dependency.moduleVersion}.jar"					
-				dependencyIncludes << "${dependency.moduleGroup}/${dependency.moduleName}/bundles/${dependency.moduleName}-${dependency.moduleVersion}.jar"										
-			}
+				def dependency = artifact.getResolvedDependency()
+				def file = artifact.file
+                    dependencyIncludes << "${dependency.moduleGroup}/${dependency.moduleName}/*-${dependency.moduleVersion}.*"
+                    dependencyIncludes << "${dependency.moduleGroup}/${dependency.moduleName}/jars/${dependency.moduleName}-${dependency.moduleVersion}.jar"
+                    dependencyIncludes << "${dependency.moduleGroup}/${dependency.moduleName}/bundles/${dependency.moduleName}-${dependency.moduleVersion}.jar"
+                }
 			for(project in subprojects) {
-				project.configurations.compile.resolvedConfiguration.resolvedArtifacts.each(includeClosure) 
-				project.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each(includeClosure) 
-				project.configurations.findByName("jsp21")?.resolvedConfiguration?.resolvedArtifacts?.each(includeClosure) 
+				project.configurations.compile.resolvedConfiguration.resolvedArtifacts.each(includeClosure)
+				project.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each(includeClosure)
+				project.configurations.findByName("jsp21")?.resolvedConfiguration?.resolvedArtifacts?.each(includeClosure)
 			}
 			includes = dependencyIncludes as List
           exclude "org.grails/**"
@@ -37,24 +37,24 @@ task populateDependencies {
 
 task libs(dependsOn: getTasksByName("assemble", true))  {
 	doFirst dependencyCache
-	
+
     destinationDir = 'dist'
 	doLast {
-		copy {		
+		copy {
 			for(project in subprojects) {
 				from( project.libsDir ) {
 					include "*-${grailsVersion}.jar"
 				}
-			}		
-			into 'dist'			
+			}
+			into 'dist'
 		}
 		copy {
 			from("$projectDir/grails-resources") {
 				include 'src/grails', 'src/war'
-			}			
-			into projectDir			
+			}
+			into projectDir
 		}
-		
+
 	}
 }
 
@@ -95,7 +95,7 @@ distSpec = copySpec {
 		include 'src/grails/**', 'src/war/**'
         // this file is accounted for later with special handling to do some token replacement
         exclude 'src/grails/grails-macros.xml'
-		
+
 	}
     from(projectDir) {
     	into "grails-$grailsVersion"
@@ -142,7 +142,7 @@ task zipDist(type: Zip,dependsOn:libs) {
     from distSpec
 	destinationDir = "${buildDir}/distributions" as File
 	baseName = 'grails'
-	appendix = grailsVersion	
+	appendix = grailsVersion
 }
 
 /*task zipDoc(type: Zip) {

diff --git a/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy b/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -290,6 +290,7 @@ class IvyDependencyManager extends AbstractIvyDependencyManager implements Depen
                                 ModuleRevisionId.newInstance("org.grails","grails-plugin-validation","$grailsVersion"),
 
 
+                                ModuleRevisionId.newInstance("org.springframework","spring-datastore-core","1.0.0.BUILD-SNAPSHOT"),
                                 ModuleRevisionId.newInstance("org.springframework","spring-core","3.0.5.RELEASE"),
                                 ModuleRevisionId.newInstance("org.springframework","spring-aop","3.0.5.RELEASE"),
                                 ModuleRevisionId.newInstance("org.springframework","spring-aspects","3.0.5.RELEASE"),