# HG changeset patch # User smith@nwoca.org # Date 1331071764 0 # Node ID 333e489c11886b6d465c90215cba13c24fa5ad32 # Parent 8c578d1464769efe3980818a61fc9029993cd48a add ivy artifact by name pattern diff -r 8c578d146476 -r 333e489c1188 init.gradle --- a/init.gradle Mon Mar 05 21:05:08 2012 +0000 +++ b/init.gradle Tue Mar 06 22:09:24 2012 +0000 @@ -72,6 +72,7 @@ m2compatible = true url = "${ssdtArtifactory}/ssdt-snapshots" addArtifactPattern("${url}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]") + addArtifactPattern("${url}/[organization]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]") addIvyPattern("${url}/[organization]/[module]/ivy-[revision].xml") checkmodified = true changingMatcher = 'regexp' @@ -82,6 +83,7 @@ m2compatible = false url = "${ssdtArtifactory}/ssdt-releases" addArtifactPattern("${url}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]") + addArtifactPattern("${url}/[organization]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]") addIvyPattern("${url}/[organization]/[module]/ivy-[revision].xml") } mavenRepo name: 'ssdt-repo', url: "${ssdtArtifactory}/ssdt-repo" @@ -127,12 +129,15 @@ def envName = envFile.name - '.groovy' logger.info("loading environment $envFile.name") def envCfg = slurper.parse(envFile.toURL()) + envCfg.merge(slurper.parse(developerPrivate)) environment.merge(envCfg) - if (envName != 'environment' ) { setProperty envName,envCfg } - environments << envName + if (envName != 'environment' ) { + setProperty envName,envCfg + environments << envName + } } environment.merge(slurper.parse(developerPrivate)) -// environment['environment'] = environment + environments << 'environment' setProperty 'environment', environment setProperty 'environments', environments }