Mercurial > public > develkit

annotate init.gradle @ 161:8dd6adab9388

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add Rule for converting arbitrary environment's to property files
author Dave Smith <smith@nwoca.org>
date Fri, 10 Jan 2014 03:41:29 +0000
parents 6af68acaf9b2
children 29c3af8dc031
rev   line source
91
b72ba5cb5c53 correct develkit location
smith@nwoca.org
parents: 87
diff changeset
1
101
df191eeb14ac USASR-800: upgrade for grale 1.0-ml9
smith@nwoca.org
parents: 100
diff changeset
2 gradle.ext.ssdtDevelkitLocation = gradle.ext.has('ssdtDevelkitLocation') ? gradle.ssdtDevelkitLocation : 'http://hg.ssdt-ohio.org/browse/public/develkit'
73
174b4bcfd2f2 fix gradle init script
smith@nwoca.org
parents:
diff changeset
3
94
1290b23e7b76 modify ivy and gradle to use same local repo
smith@nwoca.org
parents: 92
diff changeset
4 ant.property(file: System.getProperty('user.home') + "/.ssdt/private.properties")
101
df191eeb14ac USASR-800: upgrade for grale 1.0-ml9
smith@nwoca.org
parents: 100
diff changeset
5 gradle.ext.ivyUserDir = ant.properties['ivy.default.ivy.user.dir'] ?: System.getProperty('user.home') + "/.ivy2"
94
1290b23e7b76 modify ivy and gradle to use same local repo
smith@nwoca.org
parents: 92
diff changeset
6
140
615ef3a8f0b8 default projectId to root project name
smith@nwoca.org
parents: 139
diff changeset
7 gradle.ext.ssdtProjectId = System.getenv('bamboo_project_id') ?: rootProject.name
137
cc3cd7da35a7 add projectId to environment based on bamboo id
smith@nwoca.org
parents: 136
diff changeset
8
73
174b4bcfd2f2 fix gradle init script
smith@nwoca.org
parents:
diff changeset
9 gradle.addListener(new ArtifactoryGradleSettings())
174b4bcfd2f2 fix gradle init script
smith@nwoca.org
parents:
diff changeset
10
115
8ddd1a6fa4ea patch to improve identification of bamboo severs
smith@nwoca.org
parents: 114
diff changeset
11 def hostname
8ddd1a6fa4ea patch to improve identification of bamboo severs
smith@nwoca.org
parents: 114
diff changeset
12 try { hostname = "hostname".execute().text.toLowerCase().readLines().first() } catch (e) { hostname = 'unknown'}
8ddd1a6fa4ea patch to improve identification of bamboo severs
smith@nwoca.org
parents: 114
diff changeset
13
156
465c6cf6dff3 adjust bamboo server detection
Dave Smith <smith@nwoca.org>
parents: 155
diff changeset
14 gradle.ext.bambooBuild = System.getenv().any { it.key.toLowerCase().contains('bamboo')} || hostname?.startsWith('ssdt-')
115
8ddd1a6fa4ea patch to improve identification of bamboo severs
smith@nwoca.org
parents: 114
diff changeset
15
129
bef2bfc61f6e CM-133: fix bamboo plan parsing. enable showEnv to display sytem properties and env variables in -info mode
smith@nwoca.org
parents: 128
diff changeset
16 gradle.ext.bambooPlan = (System.getenv('BAMBOO_PLAN') ?: 'UNKNOWN-UNKNOWN-JOB1').split('-')[0..1].join('-')
bef2bfc61f6e CM-133: fix bamboo plan parsing. enable showEnv to display sytem properties and env variables in -info mode
smith@nwoca.org
parents: 128
diff changeset
17 logger.info "Bamboo plan: ${gradle.bambooPlan}"
128
c93df17513f1 CM-133: add jacoco for standard coverage reports. Add sonar properties for SCM and bamboo plan
smith@nwoca.org
parents: 126
diff changeset
18
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
19 gradle.ext.buildTimestamp = System.currentTimeMillis().toString().padLeft(14,'0')
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
20
128
c93df17513f1 CM-133: add jacoco for standard coverage reports. Add sonar properties for SCM and bamboo plan
smith@nwoca.org
parents: 126
diff changeset
21 gradle.ext.hgRepositoryUrl = ""
159
0c48cfd1938b allow projects to override branchName
Dave Smith <smith@nwoca.org>
parents: 158
diff changeset
22 try {
0c48cfd1938b allow projects to override branchName
Dave Smith <smith@nwoca.org>
parents: 158
diff changeset
23 gradle.ext.hgRepositoryUrl = ("hg path".execute().text.split('=') ?: ['',''] )[1].trim()
0c48cfd1938b allow projects to override branchName
Dave Smith <smith@nwoca.org>
parents: 158
diff changeset
24 } catch (e) { }
0c48cfd1938b allow projects to override branchName
Dave Smith <smith@nwoca.org>
parents: 158
diff changeset
25
160
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
26 gradle.ext.branchName = System.getenv('bamboo_planRepository_branch')
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
27 gradle.ext.branchStream = ""
153
8dbc79c5bbb0 remove --template and parse manually
Dave Smith <smith@nwoca.org>
parents: 152
diff changeset
28
160
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
29 if (!gradle.branchName ) {
143
1963264c39c4 handle merge working directories (multiple parent branches)
Dave Smith <smith@nwoca.org>
parents: 141
diff changeset
30 gradle.ext.branchName = "hg branch".execute().text.trim()
153
8dbc79c5bbb0 remove --template and parse manually
Dave Smith <smith@nwoca.org>
parents: 152
diff changeset
31 def rawParents = 'hg parents'.execute().text
154
6666e1cd8bae remove debugging. patch for non-merge dirs
Dave Smith <smith@nwoca.org>
parents: 153
diff changeset
32 def parent = rawParents.split('\n').find { it.startsWith("branch") }?.split(":")?.getAt(1)?.trim()
160
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
33 gradle.ext.branchName = parent ?: gradle.branchName
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
34 }
128
c93df17513f1 CM-133: add jacoco for standard coverage reports. Add sonar properties for SCM and bamboo plan
smith@nwoca.org
parents: 126
diff changeset
35
160
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
36 if (file('.hgflow').exists()) {
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
37 def flows = new Properties()
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
38 flows.load(file('.hgflow').newReader())
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
39 flows.stringPropertyNames().each {
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
40 if (!it.startsWith("[") && gradle.branchName.startsWith(flows.getProperty(it))) {
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
41 gradle.ext.branchStream = it
143
1963264c39c4 handle merge working directories (multiple parent branches)
Dave Smith <smith@nwoca.org>
parents: 141
diff changeset
42 }
160
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
43 }
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
44 }
143
1963264c39c4 handle merge working directories (multiple parent branches)
Dave Smith <smith@nwoca.org>
parents: 141
diff changeset
45
155
6389a03379a6 CM-135: allow environment* scripts to access gradle project
Dave Smith <smith@nwoca.org>
parents: 154
diff changeset
46 loadEnvironments()
6389a03379a6 CM-135: allow environment* scripts to access gradle project
Dave Smith <smith@nwoca.org>
parents: 154
diff changeset
47
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
48 gradle.environment.put('hgRepositoryUrl',gradle.hgRepositoryUrl)
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
49 gradle.environment.put('branchName',gradle.branchName)
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
50 gradle.environment.put('branchStream',gradle.branchStream)
160
6af68acaf9b2 modify to use bamboo env varible to override branchName
Dave Smith <smith@nwoca.org>
parents: 159
diff changeset
51
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
52
124
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
53 rootProject.ext.indyCapable = {
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
54 boolean capable = true
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
55 try {
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
56 Class.forName('java.lang.invoke.MethodHandle')
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
57 } catch (e) {
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
58 capable = false
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
59 }
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
60 capable && !rootProject.hasProperty('skipIndy')
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
61 }
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
62
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
63 rootProject.ext.useIndy = {
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
64 boolean indy = false
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
65 // first, check if a system property activates indy support
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
66 indy |= System.hasProperty('indy') && Boolean.valueOf(System.getProperty('indy'))
79
f0c29c1ac1f4 finish gradle to artifactory publishing
smith@nwoca.org
parents: 78
diff changeset
67
124
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
68 // check ssdt environment for indy property.
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
69 indy |= (gradle.environment.indy) ? gradle.environment.indy.toBoolean() : false
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
70
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
71 // check if the main project has an extension property setting indy (-Pindy).
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
72 if (rootProject.hasProperty('indy')) { indy = (Boolean.valueOf(rootProject.indy)) }
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
73
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
74 // set the groovy runtime system property to ensure forked junit test will get the indy flag properly
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
75 if (indy && rootProject.indyCapable()) System.setProperty("groovy.target.indy","true")
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
76
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
77 indy && rootProject.indyCapable()
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
78 }
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
79
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
80 println "Indy available: ${rootProject.indyCapable()} enabled: ${rootProject.useIndy()}"
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
81
79
f0c29c1ac1f4 finish gradle to artifactory publishing
smith@nwoca.org
parents: 78
diff changeset
82 if (gradle.bambooBuild) {
102
8ac4e506ca7b USASR-800: fix def of gradlekit location
smith@nwoca.org
parents: 101
diff changeset
83 gradle.ext.ssdtGradlekitLocation = gradle.ext.has('ssdtGradlekitLocation') ? gradle.ssdtGradlekitLocation : 'http://hg.ssdt-ohio.org/ssdt/gradlekit/raw-file/tip'
124
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
84 logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)"
85
f36eeb411845 add sonar publishing
smith@nwoca.org
parents: 84
diff changeset
85 apply from: "${gradle.ssdtGradlekitLocation}/artifactory.gradle"
79
f0c29c1ac1f4 finish gradle to artifactory publishing
smith@nwoca.org
parents: 78
diff changeset
86 }
76
15a5fd89d80b add display of envs for bamboo testing
smith@nwoca.org
parents: 75
diff changeset
87
126
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
88
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
89 buildscript {
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
90 repositories {
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
91 maven { url 'http://repos.ssdt.nwoca.org/artifactory/gradle-plugins' }
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
92 maven { url 'http://repos.ssdt.nwoca.org/artifactory/repository' }
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
93 maven { url 'http://repos.ssdt.nwoca.org/artifactory/libs-snapshots' }
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
94 }
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
95 }
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
96
85
f36eeb411845 add sonar publishing
smith@nwoca.org
parents: 84
diff changeset
97 apply from: "${gradle.ssdtDevelkitLocation}/metrics.gradle"
f36eeb411845 add sonar publishing
smith@nwoca.org
parents: 84
diff changeset
98
137
cc3cd7da35a7 add projectId to environment based on bamboo id
smith@nwoca.org
parents: 136
diff changeset
99 task wrapper(type: Wrapper) {}
cc3cd7da35a7 add projectId to environment based on bamboo id
smith@nwoca.org
parents: 136
diff changeset
100
136
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
101 rootProject.afterEvaluate { r ->
81
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
102
136
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
103 if (r.plugins.hasPlugin(org.gradle.plugins.ide.idea.IdeaPlugin)) {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
104
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
105 r.idea.project.ipr.withXml { xml ->
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
106 if (file('.hg').exists()) {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
107 println 'enabling HG on project'
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
108 def vcs = findComponent(xml.asNode(),'VcsDirectoryMappings')
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
109 vcs.mapping.@vcs = 'hg4idea'
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
110 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
111
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
112 def codeStyle = findComponent(xml.asNode(),'ProjectCodeStyleSettingsManager')
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
113 if (codeStyle) { xml.asNode().remove(codeStyle) }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
114
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
115 def styleManager = xml.asNode().appendNode('component', [name: 'ProjectCodeStyleSettingsManager'])
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
116 styleManager.appendNode 'option', [name: 'USE_PER_PROJECT_SETTINGS',value: true]
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
117
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
118 def styleOptions = new NodeBuilder().option(name:'PER_PROJECT_SETTINGS') {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
119 value {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
120 GroovyCodeStyleSettings {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
121 option(name: 'CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND', value:'10')
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
122 option(name: 'PACKAGES_TO_USE_IMPORT_ON_DEMAND') {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
123 value {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
124 'package'( name:"java.awt", withSubpackages: false, static: false )
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
125 'package'( name:"javax.swing", withSubpackages:false, static:false )
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
126 'package'( name:"javax.persistence", withSubpackages:false, static:false )
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
127 'package'( name:"javax.validation", withSubpackages: true, static:false )
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
128 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
129 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
130 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
131 XML {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
132 option(name: 'XML_LEGACY_SETTINGS_IMPORTED',value:true)
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
133 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
134
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
135 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
136 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
137
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
138 styleManager.append styleOptions
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
139
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
140 if (r.group.contains('org.ssdt') ) {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
141
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
142 def copyRight = findComponent(xml.asNode(),'CopyrightManager')
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
143 if (copyRight) { xml.asNode().remove(copyRight) }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
144
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
145 copyRight = new NodeBuilder().component(name: 'CopyrightManager', default: 'ODE') {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
146
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
147 copyright {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
148 option (name: 'notice', value:'Copyright (c) $today.year. Ohio Department of Education. - All Rights Reserved.\nUnauthorized copying of this file, in any medium, is strictly prohibited.\nWritten by State Software Development Team (http://ssdt.oecn.k12.oh.us/)' )
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
149 option (name: 'keyword', value: 'Copyright')
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
150 option (name: 'allowReplaceKeyword', value: 'South Front' )
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
151 option (name: 'myName', value: 'ODE' )
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
152 option (name: 'myLocal', value: true )
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
153 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
154 LanguageOptions(name: 'CSS') {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
155 option(name:'fileTypeOverride', value: 1)
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
156 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
157 LanguageOptions(name: 'JSP') {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
158 option(name:'fileTypeOverride', value: 1)
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
159 option(name:'prefixLines', value: false)
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
160 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
161 LanguageOptions(name: 'JSPX') {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
162 option(name:'fileTypeOverride', value: 1)
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
163 option(name:'prefixLines', value: false)
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
164 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
165 LanguageOptions(name: 'JavaScript') {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
166 option(name:'fileTypeOverride', value: 1)
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
167 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
168 LanguageOptions(name: 'Properties') {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
169 option(name:'fileTypeOverride', value: 1)
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
170 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
171 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
172
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
173 xml.asNode().append copyRight
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
174
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
175 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
176 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
177 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
178
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
179 }
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
180
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
181 def findComponent(project, name) {
9ce07c211984 for idea: add enabling hg, set default codestyle, set standard copyright notice
smith@nwoca.org
parents: 129
diff changeset
182 project.component.find { it.@name == name }
81
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
183 }
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
184
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
185 allprojects {
85
f36eeb411845 add sonar publishing
smith@nwoca.org
parents: 84
diff changeset
186
84
fa7b349201eb add descriptions to tasks
smith@nwoca.org
parents: 83
diff changeset
187 task cleanLocal(description: "removes all artifacts from developer's local repository") << {
fa7b349201eb add descriptions to tasks
smith@nwoca.org
parents: 83
diff changeset
188
75
02cc8e50945e allow local file repo for local builds
smith@nwoca.org
parents: 74
diff changeset
189 def local = project.repositories.find { it.name == 'local' }
81
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
190 if ( local ) {
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
191 logger.info "removing local repo: $it"
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
192 new File(System.properties['user.home'] + "/.ssdt/local-repo").deleteDir()
123
6f1918544f7f Add test to cleanLocal to ensure local repo was removed
smith@nwoca.org
parents: 115
diff changeset
193 def localDir = new File(gradle.ivyUserDir + "/local")
6f1918544f7f Add test to cleanLocal to ensure local repo was removed
smith@nwoca.org
parents: 115
diff changeset
194 localDir.deleteDir()
6f1918544f7f Add test to cleanLocal to ensure local repo was removed
smith@nwoca.org
parents: 115
diff changeset
195 logger.info "verifying removal of local repo"
6f1918544f7f Add test to cleanLocal to ensure local repo was removed
smith@nwoca.org
parents: 115
diff changeset
196 if (localDir.exists()) {
6f1918544f7f Add test to cleanLocal to ensure local repo was removed
smith@nwoca.org
parents: 115
diff changeset
197 throw new org.gradle.api.GradleException("Unable to clean ${localDir}. Files may be locked by another process.")
6f1918544f7f Add test to cleanLocal to ensure local repo was removed
smith@nwoca.org
parents: 115
diff changeset
198 }
75
02cc8e50945e allow local file repo for local builds
smith@nwoca.org
parents: 74
diff changeset
199 }
79
f0c29c1ac1f4 finish gradle to artifactory publishing
smith@nwoca.org
parents: 78
diff changeset
200 }
85
f36eeb411845 add sonar publishing
smith@nwoca.org
parents: 84
diff changeset
201
78
e47f80ef056b finish cleanLocal. start adding artifactory plugin
smith@nwoca.org
parents: 77
diff changeset
202 cleanLocal.onlyIf {
81
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
203 project.repositories.any { it.name == 'local' }
79
f0c29c1ac1f4 finish gradle to artifactory publishing
smith@nwoca.org
parents: 78
diff changeset
204 }
161
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
205
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
206 tasks.addRule("Pattern: <environment>As[Test]Properties: Generates <environment>.properties as resource or Test resource") { String taskName ->
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
207 if ((taskName - 'Test').endsWith("AsProperties") && !taskName.startsWith('clean')) {
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
208 def t = taskName.contains('Test') ? processTestResources.destinationDir : processResources.destinationDir
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
209 def e = (taskName - 'Test' - 'AsProperties').capitalize()
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
210 task(taskName) {
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
211 ext.propertyFile = new File(t, "${e.toLowerCase()}.properties")
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
212 inputs.files "../environment${e}.groovy", "../private${e}.groovy", '../private.properties'
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
213 outputs.file propertyFile
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
214 doLast {
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
215 t.mkdirs()
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
216 gradle."environment${e}".toProperties().store(propertyFile.newOutputStream(), "by $taskName of $this")
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
217 }
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
218 }
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
219 }
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
220 }
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
221
81
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
222
75
02cc8e50945e allow local file repo for local builds
smith@nwoca.org
parents: 74
diff changeset
223 }
02cc8e50945e allow local file repo for local builds
smith@nwoca.org
parents: 74
diff changeset
224
114
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
225
73
174b4bcfd2f2 fix gradle init script
smith@nwoca.org
parents:
diff changeset
226 class ArtifactoryGradleSettings extends BuildAdapter implements BuildListener {
79
f0c29c1ac1f4 finish gradle to artifactory publishing
smith@nwoca.org
parents: 78
diff changeset
227
73
174b4bcfd2f2 fix gradle init script
smith@nwoca.org
parents:
diff changeset
228 def void projectsEvaluated(Gradle gradle) {
83
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
229 def ssdtArtifactory = 'http://repos.ssdt.nwoca.org/artifactory'
79
f0c29c1ac1f4 finish gradle to artifactory publishing
smith@nwoca.org
parents: 78
diff changeset
230 Project root = gradle.getRootProject()
114
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
231 root.allprojects {
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
232
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
233
114
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
234
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
235 def thisProject = delegate
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
236 thisProject.status = 'integration'
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
237 if (gradle.branchStream) {
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
238 thisProject.status = 'integration'
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
239 def fixupVersion = thisProject.version - ".SNAPSHOT"
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
240 if ( gradle.branchStream == 'feature' ) {
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
241 fixupVersion = fixupVersion + "-" + gradle.buildTimestamp
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
242 }
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
243 if ( gradle.branchStream == 'develop' ) {
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
244 fixupVersion = fixupVersion + ".SNAPSHOT"
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
245 }
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
246 if ( gradle.branchStream in ['production','release'] ) {
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
247 thisProject.status = 'release'
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
248 }
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
249 thisProject.version = fixupVersion
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
250 }
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
251
74
a622ec40a570 update repo definitions
smith@nwoca.org
parents: 73
diff changeset
252 configurations.all {
109
029db4d977fe fix cache setting of changing and and dynamic revisions
smith@nwoca.org
parents: 107
diff changeset
253 resolutionStrategy.cacheChangingModulesFor 60 * 60 * 8, 'seconds'
029db4d977fe fix cache setting of changing and and dynamic revisions
smith@nwoca.org
parents: 107
diff changeset
254 resolutionStrategy.cacheDynamicVersionsFor 60 * 60 * 8, 'seconds'
79
f0c29c1ac1f4 finish gradle to artifactory publishing
smith@nwoca.org
parents: 78
diff changeset
255 }
73
174b4bcfd2f2 fix gradle init script
smith@nwoca.org
parents:
diff changeset
256 repositories {
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
257
81
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
258 if (!gradle.bambooBuild) {
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
259 add(new org.apache.ivy.plugins.resolver.FileSystemResolver()) {
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
260 name = 'local'
94
1290b23e7b76 modify ivy and gradle to use same local repo
smith@nwoca.org
parents: 92
diff changeset
261 addIvyPattern gradle.ivyUserDir + "/local/[module]-ivy-[revision].xml"
161
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
262 addArtifactPattern gradle.ivyUserDir + '/local/[artifact]-[revision](-[classifier]).[ext]'
81
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
263 descriptor = 'optional'
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
264 checkmodified = true
94
1290b23e7b76 modify ivy and gradle to use same local repo
smith@nwoca.org
parents: 92
diff changeset
265 changingMatcher = 'regexp'
161
8dd6adab9388 add Rule for converting arbitrary environment's to property files
Dave Smith <smith@nwoca.org>
parents: 160
diff changeset
266 changingPattern = '.*SNAPSHOT'
94
1290b23e7b76 modify ivy and gradle to use same local repo
smith@nwoca.org
parents: 92
diff changeset
267 force = true
81
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
268 }
114
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
269 }
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
270
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
271
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
272 if(gradle.branchStream == 'feature') {
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
273 add(new org.apache.ivy.plugins.resolver.URLResolver()) {
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
274 name = 'ssdt-branches'
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
275 m2compatible = false
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
276 def url = "${ssdtArtifactory}/ssdt-branches"
157
bf82d6ce853d update to handle branch names for ivy files
Dave Smith <smith@nwoca.org>
parents: 156
diff changeset
277 def filter = ";ssdt-branch.branchName+=${gradle.branchName.replaceAll('/','-')}"
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
278 addArtifactPattern("${url}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]${filter}")
158
01c8e1e27d97 add filter to ivy pattern
Dave Smith <smith@nwoca.org>
parents: 157
diff changeset
279 addIvyPattern("${url}${filter}/[organization]/[module]/ivy-[revision].xml")
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
280 checkmodified = true
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
281 changingMatcher = 'regexp'
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
282 changingPattern = /\d{14}/
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
283 }
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
284 }
114
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
285
74
a622ec40a570 update repo definitions
smith@nwoca.org
parents: 73
diff changeset
286 add(new org.apache.ivy.plugins.resolver.URLResolver()) {
83
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
287 name = 'ssdt-snapshots'
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
288 m2compatible = true
101
df191eeb14ac USASR-800: upgrade for grale 1.0-ml9
smith@nwoca.org
parents: 100
diff changeset
289 def url = "${ssdtArtifactory}/ssdt-snapshots"
83
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
290 addArtifactPattern("${url}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]")
99
333e489c1188 add ivy artifact by name pattern
smith@nwoca.org
parents: 98
diff changeset
291 addArtifactPattern("${url}/[organization]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")
83
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
292 addIvyPattern("${url}/[organization]/[module]/ivy-[revision].xml")
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
293 checkmodified = true
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
294 changingMatcher = 'regexp'
114
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
295 changingPattern = '.*SNAPSHOT'
141
d3c09b4e3332 modify for hgflow. for feature branches, use timestamp for snapshots and resolve branch from ssdt-branches
Dave Smith <smith@nwoca.org>
parents: 140
diff changeset
296 }
114
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
297
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
298 add(new org.apache.ivy.plugins.resolver.URLResolver()) {
83
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
299 name = 'ssdt-releases'
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
300 m2compatible = false
101
df191eeb14ac USASR-800: upgrade for grale 1.0-ml9
smith@nwoca.org
parents: 100
diff changeset
301 def url = "${ssdtArtifactory}/ssdt-releases"
83
9c551ecc816a clean up script to be more maintainable
smith@nwoca.org
parents: 82
diff changeset
302 addArtifactPattern("${url}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]")
99
333e489c1188 add ivy artifact by name pattern
smith@nwoca.org
parents: 98
diff changeset
303 addArtifactPattern("${url}/[organization]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]")
114
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
304 addIvyPattern("${url}/[organization]/[module]/ivy-[revision].xml")
74
a622ec40a570 update repo definitions
smith@nwoca.org
parents: 73
diff changeset
305 }
114
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
306
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
307
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
308 maven {
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
309 name = 'ssdt-repository'
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
310 url = "${ssdtArtifactory}/repository"
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
311 }
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
312
9ed6a36104ed Improve dependency resolution performance: use gradle resolver instead of ivy and use new repo which does not cnotain snapshots
smith@nwoca.org
parents: 109
diff changeset
313
75
02cc8e50945e allow local file repo for local builds
smith@nwoca.org
parents: 74
diff changeset
314 }
81
36b2fd9e3861 fix handling of multi-project artifacts and local repos
smith@nwoca.org
parents: 80
diff changeset
315
139
998693eba42e handle stub subprojects which only contain other subprojects
smith@nwoca.org
parents: 138
diff changeset
316 if ( thisProject.repositories.find { it.name == 'local' } && thisProject.getTasksByName('uploadArchives',false) ) {
87
be111b66cdc6 fix publishlocal task
smith@nwoca.org
parents: 85
diff changeset
317 uploadArchives {
be111b66cdc6 fix publishlocal task
smith@nwoca.org
parents: 85
diff changeset
318 repositories {
be111b66cdc6 fix publishlocal task
smith@nwoca.org
parents: 85
diff changeset
319 add thisProject.repositories.local
be111b66cdc6 fix publishlocal task
smith@nwoca.org
parents: 85
diff changeset
320 }
be111b66cdc6 fix publishlocal task
smith@nwoca.org
parents: 85
diff changeset
321 }
85
f36eeb411845 add sonar publishing
smith@nwoca.org
parents: 84
diff changeset
322
126
b2532280341e CM-133: switch to sonar-runner
smith@nwoca.org
parents: 124
diff changeset
323 thisProject.tasks.create("publishLocal") {
87
be111b66cdc6 fix publishlocal task
smith@nwoca.org
parents: 85
diff changeset
324 description = "Publishes this projects artifacts to developer's local repository"
be111b66cdc6 fix publishlocal task
smith@nwoca.org
parents: 85
diff changeset
325 dependsOn = ["uploadArchives"]
be111b66cdc6 fix publishlocal task
smith@nwoca.org
parents: 85
diff changeset
326 }
124
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
327 }
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
328
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
329 }
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
330
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
331 root.subprojects { p ->
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
332 if (root.useIndy()) {
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
333 def groovyIndy = p.configurations.compile.files.find { f -> f.name.startsWith('groovy-all') && f.name.contains('-indy') }
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
334 if (groovyIndy) {
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
335 logger.info "enabling indy on $p"
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
336 [compileGroovy.groovyOptions,compileTestGroovy.groovyOptions]*.with {
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
337 optimizationOptions = [ indy: true ]
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
338 }
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
339 }
81a8ecfbc8fa update init script to support groovy indy builds
smith@nwoca.org
parents: 123
diff changeset
340 }
73
174b4bcfd2f2 fix gradle init script
smith@nwoca.org
parents:
diff changeset
341 }
174b4bcfd2f2 fix gradle init script
smith@nwoca.org
parents:
diff changeset
342 }
95
ebb42488396a modify wrapper to use gradle version when executed
smith@nwoca.org
parents: 94
diff changeset
343 }
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
344
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
345
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
346 task showEnvironments << {
115
8ddd1a6fa4ea patch to improve identification of bamboo severs
smith@nwoca.org
parents: 114
diff changeset
347 println "Defined environments: $gradle.environments"
103
3267840f534f USASR-800: fix showEnvironment task
smith@nwoca.org
parents: 102
diff changeset
348 gradle.environments.each { e ->
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
349 println "\n $e:"
105
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
350 gradle.getProperty(e).flatten().each { k, v ->
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
351 println String.format(' %25s = %s',k, k.contains('password') ? "********" : v )
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
352 }
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
353 }
129
bef2bfc61f6e CM-133: fix bamboo plan parsing. enable showEnv to display sytem properties and env variables in -info mode
smith@nwoca.org
parents: 128
diff changeset
354 if (logger.isInfoEnabled() ) {
bef2bfc61f6e CM-133: fix bamboo plan parsing. enable showEnv to display sytem properties and env variables in -info mode
smith@nwoca.org
parents: 128
diff changeset
355 println "System properties:"
bef2bfc61f6e CM-133: fix bamboo plan parsing. enable showEnv to display sytem properties and env variables in -info mode
smith@nwoca.org
parents: 128
diff changeset
356 System.properties.each { println " $it" }
bef2bfc61f6e CM-133: fix bamboo plan parsing. enable showEnv to display sytem properties and env variables in -info mode
smith@nwoca.org
parents: 128
diff changeset
357 println "env variables:"
bef2bfc61f6e CM-133: fix bamboo plan parsing. enable showEnv to display sytem properties and env variables in -info mode
smith@nwoca.org
parents: 128
diff changeset
358 System.getenv().each { println " $it" }
bef2bfc61f6e CM-133: fix bamboo plan parsing. enable showEnv to display sytem properties and env variables in -info mode
smith@nwoca.org
parents: 128
diff changeset
359 }
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
360 }
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
361
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
362 def loadEnvironments() {
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
363 def developerPrivate = new Properties()
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
364 if (file('private.properties').exists()) {
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
365 developerPrivate.load(file('private.properties').newReader())
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
366 }
106
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
367 def envOverrides = [:]
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
368
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
369 if ( !hasProperty('env') ) {
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
370 gradle.ext.env = developerPrivate.env ?: 'dev'
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
371 } else {
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
372 def values = getProperty('env').split(',')
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
373 gradle.ext.env = values.first()
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
374 values.tail().each {
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
375 def (k,v) = it.split('=')
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
376 envOverrides.put(k,v)
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
377 }
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
378 }
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
379
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
380 println "Environment is: $gradle.env ($envOverrides)"
101
df191eeb14ac USASR-800: upgrade for grale 1.0-ml9
smith@nwoca.org
parents: 100
diff changeset
381 def slurper = new ConfigSlurper(gradle.env)
155
6389a03379a6 CM-135: allow environment* scripts to access gradle project
Dave Smith <smith@nwoca.org>
parents: 154
diff changeset
382 slurper.setBinding(['gradle': gradle ])
6389a03379a6 CM-135: allow environment* scripts to access gradle project
Dave Smith <smith@nwoca.org>
parents: 154
diff changeset
383
6389a03379a6 CM-135: allow environment* scripts to access gradle project
Dave Smith <smith@nwoca.org>
parents: 154
diff changeset
384 def environment = new ConfigObject()
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
385 def environments = []
105
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
386
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
387 file('.').eachFileMatch(~/^environment.*\.groovy$/) { envFile ->
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
388 def envName = envFile.name - '.groovy'
107
167745cd8af9 add support for private environment files in slurper format
smith@nwoca.org
parents: 106
diff changeset
389 def privateFile = file("private" + envName - "environment" + ".groovy")
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
390 logger.info("loading environment $envFile.name")
107
167745cd8af9 add support for private environment files in slurper format
smith@nwoca.org
parents: 106
diff changeset
391
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
392 def envCfg = slurper.parse(envFile.toURL())
99
333e489c1188 add ivy artifact by name pattern
smith@nwoca.org
parents: 98
diff changeset
393 envCfg.merge(slurper.parse(developerPrivate))
137
cc3cd7da35a7 add projectId to environment based on bamboo id
smith@nwoca.org
parents: 136
diff changeset
394 envCfg.put('ssdt.projectid',gradle.ssdtProjectId)
138
23e24ef3cd6b add environment properties for ssdt.environment and deployment.mode
smith@nwoca.org
parents: 137
diff changeset
395 envCfg.put('ssdt.environment',gradle.env)
107
167745cd8af9 add support for private environment files in slurper format
smith@nwoca.org
parents: 106
diff changeset
396 if (privateFile.exists()) {
167745cd8af9 add support for private environment files in slurper format
smith@nwoca.org
parents: 106
diff changeset
397 logger.info("loading private environment $privateFile")
167745cd8af9 add support for private environment files in slurper format
smith@nwoca.org
parents: 106
diff changeset
398 envCfg.merge(slurper.parse(privateFile.toURL()))
167745cd8af9 add support for private environment files in slurper format
smith@nwoca.org
parents: 106
diff changeset
399 }
167745cd8af9 add support for private environment files in slurper format
smith@nwoca.org
parents: 106
diff changeset
400
105
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
401 gradle.rootProject.getProperties().find { it.key.startsWith('environment') }.each {
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
402 it.value.split(',').each { p ->
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
403 def (k,v) = p.split('=')
107
167745cd8af9 add support for private environment files in slurper format
smith@nwoca.org
parents: 106
diff changeset
404 logger.info("$envName: overriding " + k + "=" + v + " in $it")
105
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
405 envCfg.put(k,v)
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
406 }
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
407 }
107
167745cd8af9 add support for private environment files in slurper format
smith@nwoca.org
parents: 106
diff changeset
408
106
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
409 envOverrides.each { k,v ->
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
410 logger.info("$envName: overriding " + k + "=" + v)
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
411 envCfg.put(k,v)
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
412 }
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
413 environment.merge(envCfg)
34bb1f5b9027 support setting env and overriding of specific properties
smith@nwoca.org
parents: 105
diff changeset
414 if (envName != 'environment' ) {
101
df191eeb14ac USASR-800: upgrade for grale 1.0-ml9
smith@nwoca.org
parents: 100
diff changeset
415 gradle.ext[envName] =envCfg
99
333e489c1188 add ivy artifact by name pattern
smith@nwoca.org
parents: 98
diff changeset
416 environments << envName
333e489c1188 add ivy artifact by name pattern
smith@nwoca.org
parents: 98
diff changeset
417 }
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
418 }
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
419 environment.merge(slurper.parse(developerPrivate))
138
23e24ef3cd6b add environment properties for ssdt.environment and deployment.mode
smith@nwoca.org
parents: 137
diff changeset
420 def deployMode = environment.deploy.mode ?: 'development'
23e24ef3cd6b add environment properties for ssdt.environment and deployment.mode
smith@nwoca.org
parents: 137
diff changeset
421 environments.each { gradle.ext[it].put('ssdt.deployment.mode',deployMode) }
99
333e489c1188 add ivy artifact by name pattern
smith@nwoca.org
parents: 98
diff changeset
422 environments << 'environment'
101
df191eeb14ac USASR-800: upgrade for grale 1.0-ml9
smith@nwoca.org
parents: 100
diff changeset
423 gradle.ext.environment = environment
df191eeb14ac USASR-800: upgrade for grale 1.0-ml9
smith@nwoca.org
parents: 100
diff changeset
424 gradle.ext.environments = environments
105
f7b0f9d286b8 allow environment variables to be overridden on command line
smith@nwoca.org
parents: 104
diff changeset
425
97
bdc17bcaf797 CM-130: add standard 'environment' handling for SSDt projects
smith@nwoca.org
parents: 96
diff changeset
426 }