Skip to content

Commit 6b5763c

Browse files
graemerochergraemerocher
committed
upgraded to gradle 1.0 m9, added maven central publishing and signing
1 parent 49d605b commit 6b5763c

File tree

4 files changed

+98
-64
lines changed

4 files changed

+98
-64
lines changed

‎build.gradle

+90-61
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
springVersion = "3.0.5.RELEASE"
2-
grailsVersion = "1.3.7"
3-
slf4jVersion = "1.6.2"
4-
groovyVersion = System.getProperty('groovyVersion') ?: '1.7.8'
1+
project.ext {
2+
springVersion = "3.0.5.RELEASE"
3+
grailsVersion = "1.3.7"
4+
slf4jVersion = "1.6.2"
5+
groovyVersion = System.getProperty('groovyVersion') ?: '1.7.10'
6+
}
57

68
def groovyMajorVersion = groovyVersion[0..2]
79
def spockDependency = "org.spockframework:spock-core:0.5-groovy-${groovyMajorVersion}"
@@ -23,21 +25,45 @@ configurations {
2325
apply plugin: 'idea'
2426
apply plugin: 'project-report'
2527

28+
29+
allprojects {
30+
repositories {
31+
maven { url "http://repo.grails.org/grails/core" }
32+
// mavenLocal()
33+
}
34+
35+
configurations {
36+
all {
37+
resolutionStrategy {
38+
def cacheHours = isCiBuild ? 1 : 24
39+
cacheDynamicVersionsFor cacheHours, 'hours'
40+
cacheChangingModulesFor cacheHours, 'hours'
41+
}
42+
}
43+
}
44+
}
45+
2646
subprojects {
27-
releaseType = "RELEASE"
28-
// releaseType = "BUILD-SNAPSHOT"
47+
ext {
48+
// releaseType = "RELEASE"
49+
releaseType = "BUILD-SNAPSHOT"
2950
// releaseType = "RC3"
30-
version = "1.0.2.${releaseType}"
51+
isCiBuild = project.hasProperty("isCiBuild")
52+
}
53+
54+
version = "1.0.3.${releaseType}"
3155
group = "org.grails"
3256

57+
3358
def isStandardGroovyMavenProject = isGroovyProject(project)
3459

3560
if (isStandardGroovyMavenProject) {
3661
apply plugin: 'groovy'
3762
apply plugin: 'eclipse'
3863
apply plugin: 'maven'
3964
apply plugin: 'idea'
40-
apply from: "file:${rootDir}/clover.gradle"
65+
apply plugin: 'signing'
66+
/* apply from: "file:${rootDir}/clover.gradle"*/
4167

4268
install.doLast {
4369
def gradleArtifactCache = new File(gradle.gradleUserHomeDir, "cache")
@@ -55,15 +81,6 @@ subprojects {
5581
def isGormDatasource = project.name.startsWith("grails-datastore-gorm-") && !project.name.endsWith("tck") && !project.name.endsWith("plugin-support")
5682
def isDocumentationProject = project.name.startsWith("grails-documentation")
5783

58-
repositories {
59-
mavenRepo name:'mavenLocal',
60-
urls:new File(System.getProperty("user.home"), ".m2/repository").toURL().toString()
61-
mavenRepo(urls: "http://repo.grails.org/grails/core") {
62-
if (project.hasProperty('snapshotTimeout')) {
63-
setSnapshotTimeout(Long.parseLong(project.snapshotTimeout))
64-
}
65-
}
66-
}
6784

6885
dependencies {
6986
if (isStandardGroovyMavenProject) {
@@ -102,7 +119,7 @@ subprojects {
102119
}
103120
ant.docs(src:"src/docs", dest:destinationDir, properties:"src/docs/doc.properties")
104121
}
105-
docs.destinationDir = "${buildDir}/docs"
122+
docs.ext.destinationDir = "${buildDir}/docs"
106123

107124

108125
task clean << {
@@ -137,11 +154,11 @@ subprojects {
137154
}
138155

139156
test.doFirst {
140-
def tckClassesDir = project(":grails-datastore-gorm-tck").sourceSets.main.classesDir
157+
def tckClassesDir = project(":grails-datastore-gorm-tck").sourceSets.main.output.classesDir
141158
def thisProjectsTests = // surely there is a less hardcoded way to do this
142159
copy {
143160
from tckClassesDir
144-
into sourceSets.test.classesDir
161+
into sourceSets.test.output.classesDir
145162
include "**/*.class"
146163
exclude { details ->
147164
// Do not copy across any TCK class (or nested classes of that class)
@@ -162,9 +179,6 @@ subprojects {
162179
}
163180

164181
if (isStandardGroovyMavenProject) {
165-
configurations {
166-
meta
167-
}
168182

169183
task sourcesJar(type: Jar, dependsOn:classes) {
170184
classifier = 'sources'
@@ -176,10 +190,17 @@ subprojects {
176190
from javadoc.destinationDir
177191
}
178192

193+
179194
artifacts {
180-
meta sourcesJar
181-
meta javadocJar
195+
archives jar
196+
archives sourcesJar
197+
archives javadocJar
198+
}
199+
200+
signing {
201+
sign configurations.archives
182202
}
203+
183204
configure(install.repositories.mavenInstaller) {
184205
pom.whenConfigured { pom ->
185206
def dependency = pom.dependencies.find { dep -> dep.artifactId == 'slf4j-simple' }
@@ -198,8 +219,6 @@ subprojects {
198219

199220
uploadArchives {
200221
description = "Does a maven deploy of archives artifacts"
201-
def milestoneRepositoryUrl = "http://repo.grails.org/grails/libs-releases-local"
202-
def snapshotRepositoryUrl = "http://repo.grails.org/grails/libs-snapshots-local"
203222

204223
// add a configuration with a classpath that includes our s3 maven deployer
205224
configurations { deployerJars }
@@ -208,54 +227,64 @@ subprojects {
208227
}
209228

210229
repositories.mavenDeployer {
211-
switch (releaseType) {
212-
case 'RELEASE':
213-
repository(url: milestoneRepositoryUrl)
214-
description += milestoneRepositoryUrl
215-
216-
case ~/M[0-9]+/:
217-
description += milestoneRepositoryUrl
218-
// fall through and pick up config below
219-
220-
case ~/RC[0-9]+/:
221-
description += milestoneRepositoryUrl
222-
// fall through and pick up config below
223-
224-
225-
case 'BUILD-SNAPSHOT':
226-
description += snapshotRepositoryUrl
227-
final username = project.properties["artifactoryPublishUsername"]
228-
final password = project.properties["artifactoryPublishPassword"]
229-
230-
def credentials = [userName: username, password: password]
231-
org.apache.ivy.util.url.CredentialsStore.INSTANCE.addCredentials("Artifactory Realm", "repo.grails.org", username, password);
232-
configuration = configurations.deployerJars
233-
repository(url: milestoneRepositoryUrl) {
234-
authentication(credentials)
235-
}
236-
snapshotRepository(url: snapshotRepositoryUrl) {
237-
authentication(credentials)
238-
}
239-
break;
230+
beforeDeployment { MavenDeployment deployment ->
231+
signing.signPom(deployment)
240232
}
241233

242-
beforeDeployment { deployment ->
243-
["sources", "javadoc"].each { type ->
244-
deployment.addArtifact configurations.meta.artifacts.find { it.classifier == type }
245-
}
234+
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
235+
authentication(userName: project.hasProperty("sonatypeUsername") ? project.sonatypeUsername : null,
236+
password: project.hasProperty("sonatypePassword") ? project.sonatypePassword : null)
237+
}
238+
snapshotRepository(url: "http://repo.grails.org/grails/libs-snapshots-local") {
239+
authentication(userName: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : null,
240+
password: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : null)
246241
}
242+
247243
pom.project {
244+
name 'Grails GORM'
245+
packaging 'jar'
246+
description 'GORM - Grails Data Access Framework'
247+
delegate.url 'http://grails.org/'
248+
248249
licenses {
249250
license {
250251
name 'The Apache Software License, Version 2.0'
251252
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
252253
distribution 'repo'
253254
}
254255
}
256+
257+
scm {
258+
delegate.url 'scm:[email protected]:SpringSource/grails-data-mapping.git'
259+
connection 'scm:[email protected]:SpringSource/grails-data-mapping.git'
260+
developerConnection 'scm:[email protected]:SpringSource/grails-data-mapping.git'
261+
}
262+
263+
licenses {
264+
license {
265+
name 'The Apache Software License, Version 2.0'
266+
delegate.url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
267+
distribution 'repo'
268+
}
269+
}
270+
271+
developers {
272+
developer {
273+
id 'graemerocher'
274+
name 'Graeme Rocher'
275+
}
276+
developer {
277+
id 'jeffscottbrown'
278+
name 'Jeff Brown'
279+
}
280+
developer {
281+
id 'burtbeckwith'
282+
name 'Burt Beckwith'
283+
}
284+
}
255285
}
256286
}
257287
}
258-
uploadArchives.dependsOn sourcesJar, javadocJar
259288
}
260289
}
261290

‎gradle/wrapper/gradle-wrapper.properties

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
5-
distributionVersion=1.0-milestone-3
5+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-9-bin.zip
6+
distributionVersion=1.0-milestone-9
67
zipStorePath=wrapper/dists
7-
urlRoot=http\://gradle.artifactoryonline.com/gradle/distributions
8+
urlRoot=http\://services.gradle.org/distributions
89
distributionName=gradle
910
distributionClassifier=bin

‎grails-datastore-gemfire/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version = "1.0.0.BUILD-SNAPSHOT"
22

33
repositories {
4-
mavenRepo urls:'http://dist.gemstone.com/maven/release'
4+
maven { url "http://dist.gemstone.com/maven/release" }
55
}
66

77
dependencies {

‎grails-datastore-gorm-gemfire/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
version = "1.0.0.BUILD-SNAPSHOT"
22

3+
repositories {
4+
maven { url "http://dist.gemstone.com/maven/release" }
5+
}
6+
37
dependencies {
48

59
compile project(":grails-datastore-gorm"),

0 commit comments

Comments
 (0)