Mercurial > public > develkit
diff fixivy.groovy @ 92:90325a10fe95
correct develkit location
author | smith@nwoca.org |
---|---|
date | Wed, 22 Feb 2012 04:50:48 +0000 |
parents | c207cdcaf13e |
children |
line wrap: on
line diff
--- a/fixivy.groovy Wed Feb 22 04:46:58 2012 +0000 +++ b/fixivy.groovy Wed Feb 22 04:50:48 2012 +0000 @@ -72,8 +72,10 @@ dep.@conf = 'castor-ant->default(*)' } else if (dep.@conf.text() == 'runtime->default' ) { // preserve + } else if (dep.@conf.text().contains('groovy') ) { + // preserve } else{ - dep.attributes().remove('conf') +// dep.attributes().remove('conf') } } @@ -90,6 +92,7 @@ // find groovy dependencies (or null) +/* groovy = ivy.dependencies.children().find { it.@org == 'org.codehaus.groovy' && it.@name.text().startsWith('groovy') } if (groovy) { @@ -118,7 +121,7 @@ } } - +*/ // resolveJunit(ivy.dependencies) // remove exclude for groovy-all @@ -127,7 +130,7 @@ ivy.dependencies.children().find { it.name() == 'exclude' && it.@module.text() == 'com.springsource.org.apache.commons.logging' }.replaceNode {} // Add exclude for regular groovy: - ensureExcluded(ivy.dependencies,"org.codehaus.groovy:groovy") +// ensureExcluded(ivy.dependencies,"org.codehaus.groovy:groovy") // ensure modules covered by springsource are exluded; // ensureSpringSourceExcludes(ivy.dependencies) @@ -148,12 +151,13 @@ it.@module = 'junit' } */ - cfgs.children().each { it.@visibility = 'private' } // Should be 'private' after initial conversions. + cfgs.children().each { it.@visibility = 'public' } // Should be 'private' after initial conversions. cfgs.children().find {it.@name == 'runtime' }.@extends = 'compile' cfgs.children().find {it.@name == 'compile-test' }.@extends = 'compile' cfgs.children().find {it.@name == 'runtime-test' }.@extends = 'runtime,compile-test' cfgs.children().find {it.@name == 'runtime-test' }.@visibility = 'public' + cfgs.children().find {it.@name == 'compile-test' }.@visibility = 'public' cfgs.children().find {it.@name == 'default' }.@visibility = 'public' cfgs.children().find {it.@name == 'default' }.@extends = 'runtime'