Skip to content

Commit

Permalink
upgrade to Grails 2.3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
lhotari committed Feb 17, 2014
1 parent ca7af98 commit 7e61cf1
Show file tree
Hide file tree
Showing 30 changed files with 1,498 additions and 156 deletions.
5 changes: 3 additions & 2 deletions ResourcesGrailsPlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ResourcesGrailsPlugin {
static DEFAULT_URI_PREFIX = 'static'
static DEFAULT_ADHOC_PATTERNS = ["/images/*", "*.css", "*.js"].asImmutable()

def version = "1.2.1"
def version = "1.2.2-SNAPSHOT"
def grailsVersion = "1.3 > *"

def loadAfter = ['logging'] // retained to ensure correct loading under Grails < 2.0
Expand All @@ -29,7 +29,8 @@ class ResourcesGrailsPlugin {
"web-app/js/**/*.*",
"web-app/images/**/*.*",
"grails-app/resourceMappers/**/test/*",
"grails-app/conf/*Resources.groovy"
"grails-app/conf/*Resources.groovy",
"grails-app/conf/META-INF/mime.types"
]

def artefacts = [getResourceMapperArtefactHandler(), getResourcesArtefactHandler()]
Expand Down
3 changes: 1 addition & 2 deletions application.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#Grails Metadata file
#Sat Sep 14 14:20:38 MST 2013
app.grails.version=2.2.2
app.grails.version=2.3.6
app.name=resources
plugins.hibernate=2.2.2
51 changes: 22 additions & 29 deletions grails-app/conf/BuildConfig.groovy
Original file line number Diff line number Diff line change
@@ -1,42 +1,35 @@
grails.project.class.dir = "target/classes"
grails.project.test.class.dir = "target/test-classes"
grails.project.test.reports.dir = "target/test-reports"
//grails.project.war.file = "target/${appName}-${appVersion}.war"
grails.project.work.dir = 'target'

forkConfig = false
grails.project.fork = [
test: forkConfig, // configure settings for the test-app JVM
run: forkConfig, // configure settings for the run-app JVM
war: forkConfig, // configure settings for the run-war JVM
console: forkConfig, // configure settings for the Swing console JVM
compile: forkConfig // configure settings for compilation
]

grails.project.dependency.resolver = "maven"
grails.project.dependency.resolution = {
// inherit Grails' default dependencies
inherits( "global" ) {
// uncomment to disable ehcache
// excludes 'ehcache'
}
log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
repositories {
grailsCentral()
grailsRepo "http://grails.org/plugins"
mavenCentral()

// uncomment the below to enable remote dependency resolution
// from public Maven repositories
//mavenLocal()
//mavenCentral()
//mavenRepo "http://snapshots.repository.codehaus.org"
//mavenRepo "http://repository.codehaus.org"
//mavenRepo "http://download.java.net/maven/2/"
//mavenRepo "http://repository.jboss.com/maven2/"
inherits "global"
log "warn"

repositories {
mavenLocal()
grailsCentral()
mavenRepo "http://repo.grails.org/grails/core"
}

dependencies {
// build 'org.codehaus.gpars:gpars:0.12'
test "org.spockframework:spock-grails-support:0.7-groovy-2.0"
}
plugins {
provided(":webxml:1.4.1")
compile(":tomcat:$grailsVersion") {
export = false
}
compile(":release:2.2.1", ':rest-client-builder:1.0.3') {
compile(":tomcat:7.0.50") {
export = false
}
test(":spock:0.7") {
exclude "spock-grails-support"
compile(':release:3.0.1', ':rest-client-builder:1.0.3') {
export = false
}
}
Expand Down
Loading

0 comments on commit 7e61cf1

Please sign in to comment.