Skip to content

Commit

Permalink
Merge branch 'forpullrequest'
Browse files Browse the repository at this point in the history
  • Loading branch information
@sarmbruster
sarmbruster committed Sep 28, 2011
2 parents 6f6667d + 161ad2f commit 409a588
Show file tree
Hide file tree
Showing 294 changed files with 7,523 additions and 3,434 deletions.
38 changes: 23 additions & 15 deletions build.gradle
View file
Expand Up @@ -3,38 +3,42 @@ import org.apache.tools.ant.filters.ReplaceTokens
buildscript {
repositories {
mavenRepo(urls: "http://repo.grails.org/grails/core")
//mavenRepo(urls: 'http://evgeny-goldin.org/artifactory/repo/')
}
dependencies {
classpath "commons-io:commons-io:1.4"
classpath "commons-io:commons-io:2.0.1"
//classpath "com.goldin.plugins:gradle:0.1-RC3" // http://evgeny-goldin.com/wiki/Gradle-duplicates-plugin
}
}


apply plugin: 'idea'


grailsVersion = '2.0.0.BUILD-SNAPSHOT'
antTraxVersion = "1.7.1"
antVersion = "1.8.2"
aspectjVersion = "1.6.10"
commonsBeanUtilsVersion = "1.8.0"
commonsBeanUtilsVersion = "1.8.3"
commonsCliVersion = "1.2"
commonsCollectionsVersion = "3.2.1"
commonsIOVersion = "1.4"
commonsLangVersion = "2.4"
commonsIOVersion = "2.0.1"
commonsLangVersion = "2.6"
datastoreVersion = "1.0.0.BUILD-SNAPSHOT"
gantVersion = "1.9.5"
gantVersion = "1.9.6"
gdocEngineVersion = "1.0.1"
grailsVersion = '2.0.0.BUILD-SNAPSHOT'
groovyVersion = "1.8.0"
groovyVersion = "1.8.3-SNAPSHOT"
gradleGroovyVersion = groovyVersion
gradleGroovyVersion = "1.8.2"
ivyVersion = "2.2.0"
jansiVersion = "1.2.1"
jlineVersion = "1.0"
jnaVersion = "3.2.3"
slf4jVersion = "1.6.1"
springLoadedVersion = "0.8.6"
slf4jVersion = "1.6.2"
springLoadedVersion = "0.9.2.BUILD-SNAPSHOT"
springVersion = "3.1.0.M2"
springWebflowVersion= "2.0.8.RELEASE"
hibernateVersion = "3.6.5.Final"
ehcacheVersion = "2.4.5"
junitVersion = "4.9"

archivesBaseName = 'grails'
version = grailsVersion
Expand All @@ -54,8 +58,10 @@ homeSrcDir = file("src")
// artifacts' POMs.
if(System.getProperty('groovy.jar')) {
groovyDependency = files(System.getProperty('groovy.jar'))
gradleGroovyDependency = groovyDependency
} else {
groovyDependency = "org.codehaus.groovy:groovy-all:${groovyVersion}"
gradleGroovyDependency = "org.codehaus.groovy:groovy-all:${gradleGroovyVersion}"
}


Expand All @@ -65,6 +71,7 @@ subprojects { project ->
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'project-report'
//apply plugin: 'duplicates'

sourceCompatibility = "1.5"
targetCompatibility = "1.5"
Expand Down Expand Up @@ -112,10 +119,10 @@ subprojects { project ->
// Groovy
if(System.getProperty('groovy.jar')) {
// use the jar specified in the system property (the joint build specifies its own groovy jar)...
groovy groovyDependency
groovy gradleGroovyDependency
} else {
// resolve the dependency from a repo...
groovy( groovyDependency ) {
groovy( gradleGroovyDependency ) {
exclude module:"commons-cli"
exclude module:"ant"
}
Expand All @@ -132,8 +139,8 @@ subprojects { project ->


// Testing
testCompile 'junit:junit:4.8.1'
testCompile('org.spockframework:spock-core:0.5-groovy-1.8') {
testCompile "junit:junit:${junitVersion}"
testCompile('org.spockframework:spock-core:0.6-groovy-1.8-SNAPSHOT') {
transitive = false
}
}
Expand Down Expand Up @@ -161,6 +168,7 @@ subprojects { project ->
configurations {
meta
published.extendsFrom archives, meta
all*.exclude group:'commons-logging', module: 'commons-logging'
}

artifacts {
Expand Down
153 changes: 79 additions & 74 deletions gradle/assemble.gradle
View file
Expand Up @@ -47,18 +47,23 @@ task sourcesJars(type: Copy) {
}

task pluginsFromSvn {
dir = "$buildDir/pluginsFromSvn"
grailsHibernateDest = "$dir/grails-hibernate-${grailsVersion}.zip"
grailsTomcatDest = "$dir/grails-tomcat-${grailsVersion}.zip"
outputs.files grailsHibernateDest, grailsTomcatDest
plugins = [
hibernate: grailsVersion,
tomcat: grailsVersion,
resources: "1.0.2",
jquery: "1.6.1.1"
]

dir = file("$buildDir/pluginsFromSvn")
outputs.files { dir.listFiles().findAll { it.name.endsWith(".zip") } }
doFirst {
ant {
mkdir(dir: dir)
def versionTag = grailsVersion.replaceAll(/\./, '_').toUpperCase()
get(src: "http://svn.codehaus.org/grails-plugins/grails-hibernate/tags/RELEASE_${versionTag}/grails-hibernate-${grailsVersion}.zip",
dest: grailsHibernateDest, verbose: true, usetimestamp: true)
get(src: "http://svn.codehaus.org/grails-plugins/grails-tomcat/tags/RELEASE_${versionTag}/grails-tomcat-${grailsVersion}.zip",
dest: grailsTomcatDest, verbose: true, usetimestamp: true)
plugins.each { name, version ->
def versionTag = version.replaceAll(/\./, '_').toUpperCase()
get(src: "http://plugins.grails.org/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.zip",
dest: dir, verbose: true, usetimestamp: true)
}
}
}
}
Expand Down Expand Up @@ -124,72 +129,72 @@ task zipDist(type: Zip, dependsOn: [sourcesJars, install]) {
destinationDir = "${buildDir}/distributions" as File
baseName = 'grails'
appendix = grailsVersion

from(projectDir) {
into "grails-$grailsVersion"
include 'lib/', 'gradle/', 'media/', 'samples/', 'scripts/', 'build.gradle', 'build.properties', 'dependencies.txt',
'LICENSE', 'INSTALL', "src/", "gradlew.bat","gradle.properties"
exclude 'ant/bin', 'src/grails', 'src/war'
}
from("grails-resources") {
into "grails-$grailsVersion"
include 'src/grails/**', 'src/war/**'
// this file is accounted for later with special handling to do some token replacement
exclude 'src/grails/grails-macros.xml'
}
from(projectDir) {
into "grails-$grailsVersion"
include "gradlew"
fileMode = 0755
}
from(docs.destinationDir) {
into "grails-$grailsVersion/doc"
}

exclude "**/CVS/**"
from(pluginsFromSvn.outputs.files) {
into "grails-$grailsVersion/plugins"
}
from('grails-resources/src/grails/home/docs/README') {
into "grails-$grailsVersion"
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
}
from('grails-resources/src/grails/home/tests') {
into "grails-$grailsVersion/src/resources/tests"
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
}
from("grails-resources/src/grails/home/bash") {
into "grails-$grailsVersion/bin"
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion])
filter(ReplaceTokens, tokens: ['spring.loaded.version': springLoadedVersion])
fileMode = 0755
}
from("grails-resources/src/grails/home/conf") {
into "grails-$grailsVersion/conf"
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion])
filter(ReplaceTokens, tokens: ['jline.version': jlineVersion])
filter(ReplaceTokens, tokens: ['jansi.version': jansiVersion])
filter(ReplaceTokens, tokens: ['jna.version': jnaVersion])
filter(ReplaceTokens, tokens: ['commons.cli.version': commonsCliVersion])
filter(ReplaceTokens, tokens: ['ant.version': antVersion])
filter(ReplaceTokens, tokens: ['gant.version': gantVersion])
filter(ReplaceTokens, tokens: ['ivy.version': ivyVersion])
filter(ReplaceTokens, tokens: ['jline.version': jlineVersion])
filter(ReplaceTokens, tokens: ['jansi.version': jansiVersion])
filter(ReplaceTokens, tokens: ['jna.version': jnaVersion])
filter(ReplaceTokens, tokens: ['commons.cli.version': commonsCliVersion])
}
from(homeDistDir) {
into "grails-$grailsVersion/dist"
exclude "*.zip"
}
from("grails-resources/src/grails/grails-macros.xml") {
into "grails-$grailsVersion/src/grails"
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
}
from('grails-resources/src/grails/home/dsl-support') {
into "grails-$grailsVersion/dsl-support"

into("grails-$grailsVersion") {
from(projectDir) {
include 'lib/', 'gradle/', 'media/', 'samples/', 'scripts/', 'build.gradle', 'build.properties', 'dependencies.txt',
'LICENSE', 'INSTALL', "src/", "gradlew.bat","gradle.properties"
exclude 'ant/bin', 'src/grails', 'src/war'
}
from("grails-resources") {
include 'src/grails/**', 'src/war/**'
// this file is accounted for later with special handling to do some token replacement
exclude 'src/grails/grails-macros.xml'
}
from(projectDir) {
include "gradlew"
fileMode = 0755
}
from(docs.destinationDir) {
into "doc"
}
from(pluginsFromSvn.outputs.files) {
into "plugins"
rename { it - "grails-" }
}
from('grails-resources/src/grails/home/docs/README') {
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
}
from('grails-resources/src/grails/home/tests') {
into "src/resources/tests"
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
}
from("grails-resources/src/grails/home/bash") {
into "bin"
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion])
filter(ReplaceTokens, tokens: ['spring.loaded.version': springLoadedVersion])
fileMode = 0755
}
from("grails-resources/src/grails/home/conf") {
into "conf"
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion])
filter(ReplaceTokens, tokens: ['jline.version': jlineVersion])
filter(ReplaceTokens, tokens: ['jansi.version': jansiVersion])
filter(ReplaceTokens, tokens: ['jna.version': jnaVersion])
filter(ReplaceTokens, tokens: ['commons.cli.version': commonsCliVersion])
filter(ReplaceTokens, tokens: ['ant.version': antVersion])
filter(ReplaceTokens, tokens: ['gant.version': gantVersion])
filter(ReplaceTokens, tokens: ['ivy.version': ivyVersion])
filter(ReplaceTokens, tokens: ['jline.version': jlineVersion])
filter(ReplaceTokens, tokens: ['jansi.version': jansiVersion])
filter(ReplaceTokens, tokens: ['jna.version': jnaVersion])
filter(ReplaceTokens, tokens: ['commons.cli.version': commonsCliVersion])
}
from(homeDistDir) {
into "dist"
exclude "*.zip"
}
from("grails-resources/src/grails/grails-macros.xml") {
into "src/grails"
filter(ReplaceTokens, tokens: ['grails.version': grailsVersion])
}
from('grails-resources/src/grails/home/dsl-support') {
into "dsl-support"
}
}
}

Expand Down
9 changes: 7 additions & 2 deletions grails-bootstrap/build.gradle
View file
Expand Up @@ -33,16 +33,21 @@ dependencies {

compile "commons-lang:commons-lang:$commonsLangVersion"

// Ant
compile "org.fusesource.jansi:jansi:$jansiVersion",
"jline:jline:$jlineVersion",
"net.java.dev.jna:jna:$jnaVersion"

compile "junit:junit:${junitVersion}"

// Ant
compile "org.apache.ant:ant:${antVersion}",
"org.apache.ant:ant-launcher:${antVersion}",
"org.apache.ant:ant-junit:${antVersion}",
"org.apache.ant:ant-trax:${antTraxVersion}",
"org.apache.ivy:ivy:${ivyVersion}"

compile("org.apache.ant:ant-junit:${antVersion}") {
exclude module:'junit'
}

compile("org.codehaus.gant:gant_groovy1.8:${gantVersion}") {
exclude module:'commons-cli'
Expand Down

0 comments on commit 409a588

Please sign in to comment.