Permalink
Browse files

Merge branch 'master' of github.com:grails/grails-core

  • Loading branch information...
2 parents b78d9a0 + 1073263 commit 0cfa2767bc925b9266d9c3f81348fdae0d04d0f0 @jeffbrown jeffbrown committed May 8, 2012
View
@@ -24,7 +24,7 @@ ext {
commonsCollectionsVersion = "3.2.1"
commonsIOVersion = "2.1"
commonsLangVersion = "2.6"
- datastoreVersion = "1.0.3.RELEASE"
+ datastoreVersion = "1.0.7.RELEASE"
gantVersion = "1.9.6"
gdocEngineVersion = "1.0.1"
groovyVersion = "1.8.6"
@@ -180,7 +180,7 @@ public Object doCall() {
};
registerDependencies(dependencyManager, compileTimeDependenciesMethod, commonsExcludingLoggingAndXmlApis, "commons-logging", "xml-apis", "commons-digester");
- String datastoreMappingVersion = "1.0.3.RELEASE";
+ String datastoreMappingVersion = "1.0.7.RELEASE";
ModuleRevisionId[] compileDependencies = {
ModuleRevisionId.newInstance("aopalliance", "aopalliance", "1.0"),
ModuleRevisionId.newInstance("com.googlecode.concurrentlinkedhashmap", "concurrentlinkedhashmap-lru", "1.2_jdk5"),
@@ -220,18 +220,20 @@ class PluginInstallEngine {
def parentDir = zipFile.canonicalFile.parentFile
final currentDependencyManager = resolveEngine.dependencyManager
- IvyDependencyManager dependencyManager = new IvyDependencyManager(currentDependencyManager.applicationName, currentDependencyManager.applicationVersion, settings)
- dependencyManager.chainResolver = new ChainResolver()
+ final ivySettings = currentDependencyManager.ivySettings
+ IvyDependencyManager dependencyManager = new IvyDependencyManager(currentDependencyManager.applicationName, currentDependencyManager.applicationVersion, settings, Metadata.current, ivySettings)
+ dependencyManager.chainResolver = new ChainResolver(name: "chain", settings: ivySettings)
dependencyManager.parseDependencies {
log "warn"
useOrigin true
- cacheDir currentDependencyManager.ivySettings.getDefaultCache().absolutePath
+ cacheDir ivySettings.getDefaultCache().absolutePath
repositories {
+ grailsHome()
def pluginResolver = new FileSystemResolver(name: "$name plugin install resolver")
final parentPath = parentDir.canonicalPath
pluginResolver.addArtifactPattern("${parentPath}/[module]-[revision].[ext]")
pluginResolver.addArtifactPattern("${parentPath}/grails-[module]-[revision].[ext]")
- pluginResolver.settings = dependencyManager.ivySettings
+ pluginResolver.settings = ivySettings
pluginResolver.latestStrategy = new LatestTimeStrategy()
pluginResolver.changingPattern = ".*SNAPSHOT"
pluginResolver.setCheckmodified(true)

0 comments on commit 0cfa276

Please sign in to comment.