changeset 99:333e489c1188

add ivy artifact by name pattern
author smith@nwoca.org
date Tue, 06 Mar 2012 22:09:24 +0000
parents 8c578d146476
children 44c4cb9d0fed
files init.gradle
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
 }