Mercurial > public > develkit

diff init20.gradle @ 176:e0865f323a60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct layouts for ssdt repositories. remove ssdt-releases repo
author smith@nwoca.org
date Fri, 12 Dec 2014 22:16:28 +0000
parents c3b7af90d1e4
children 629ee17d6f39
line wrap: on
line diff
--- a/init20.gradle	Fri Dec 12 20:59:40 2014 +0000
+++ b/init20.gradle	Fri Dec 12 22:16:28 2014 +0000
@@ -352,37 +352,21 @@
                 if (gradle.branchStream == 'feature') {
                     ivy {
                         name = 'ssdt-branches'
-                        def url = "${ssdtArtifactory}/ssdt-branches"
-                        artifactPattern "${url}/${gradle.branchHash}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"
-                        ivyPattern "${url}/${gradle.branchHash}/[organization]/[module]/ivy-[revision].xml"
-//                        m2compatible = false
-//                        def filter1 = ";ssdt-branch.branchName+=${gradle.branchName.replaceAll('/', '-')}"
-//                        def filter2 = ";ssdt-branch.branchName=${gradle.branchName.replaceAll('/', '-')}"
-//                        checkmodified = true
-//                        changingMatcher = 'regexp'
-//                        changingPattern = '.*SNAPSHOT'
+                        url = "${ssdtArtifactory}/ssdt-branches"
+                        artifactPattern "${gradle.branchHash}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"
+                        ivyPattern "${gradle.branchHash}/[organization]/[module]/ivy-[revision].xml"
                     }
                 }
 
                 ivy {
                     name = 'ssdt-snapshots'
-                    def url = "${ssdtArtifactory}/ssdt-snapshots"
-                    artifactPattern "${url}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"
-                    artifactPattern "${url}/[organization]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
-                    ivyPattern "${url}/[organization]/[module]/ivy-[revision].xml"
-//                    checkmodified = true
-//                    m2compatible = true
-//                    changingMatcher = 'regexp'
-//                    changingPattern = '.*SNAPSHOT'
-                }
-
-                ivy {
-                    name = 'ssdt-releases'
-//                    m2compatible = false
-                    def url = "${ssdtArtifactory}/ssdt-releases"
-                    artifactPattern "${url}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"
-                    artifactPattern "${url}/[organization]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
-                    ivyPattern("${url}/[organization]/[module]/ivy-[revision].xml")
+                    url = "${ssdtArtifactory}/ssdt-snapshots"
+                    layout "pattern", {
+                        artifact "[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]"
+                        artifact "[organization]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+                        ivy "[organization]/[module]/ivy-[revision].xml"
+                        m2compatible = true
+                    }
                 }
 
                 maven {
@@ -393,9 +377,7 @@
 
             }
 
-            if (thisProject.repositories.find {
-                it.name == 'local'
-            } && thisProject.getTasksByName('uploadArchives', false)) {
+            if (thisProject.repositories.find { it.name == 'local' } && thisProject.getTasksByName('uploadArchives', false)) {
                 uploadArchives {
                     repositories {
                         add thisProject.repositories.local