Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade to grails 1.3.9 #96

Merged
merged 1 commit into from
Sep 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
app.buildDate=02 Feb 2012 11\:17\:30 PM
app.buildNumber=1
app.context=/openboxes
app.grails.version=1.3.7
app.grails.version=1.3.9
app.name=openboxes
app.revisionNumber=11160
app.servlet.version=2.4
Expand All @@ -28,7 +28,6 @@ plugins.profile-template=0.1
plugins.runtime-logging=0.4
plugins.springcache=1.3.1
plugins.template-cache=0.1
plugins.tomcat=1.3.7
plugins.ui-performance=1.2.2
plugins.webflow=1.3.8
plugins.yui=2.8.2.1
11 changes: 6 additions & 5 deletions grails-app/conf/BuildConfig.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
grails.project.class.dir = "target/classes"
grails.project.docs.output.dir = "web-app/docs"
grails.project.test.class.dir = "target/test-classes"
grails.project.test.reports.dir = "target/test-reports"
grails.project.test.reports.dir = "target/test-reports"
//grails.project.war.file = "target/${appName}-${appVersion}.war"

grails.plugin.location.spock='spock/'
Expand All @@ -26,12 +26,12 @@ grails.project.dependency.resolution = {
inherits( "global" ) {
// uncomment to disable ehcache
// excludes 'ehcache'
excludes "xml-apis"
excludes "xml-apis"
}
log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
repositories {
//grailsRepo "http:https://grails.org/plugins"
grailsPlugins()
//grailsRepo "http:https://grails.org/plugins"
grailsPlugins()
grailsHome()
grailsCentral()

Expand Down Expand Up @@ -97,7 +97,8 @@ grails.project.dependency.resolution = {
//runtime(":liquibase:1.9.3.6") { excludes 'data-source' }
runtime(':mail:1.0.6') { excludes 'mail', 'spring-test' }
runtime(':excel-import:0.3') { excludes 'poi-contrib', 'poi-scratchpad' }
runtime(':hibernate:1.3.7') { excludes 'antlr' }
runtime(':hibernate:1.3.9') { excludes 'antlr' }
runtime(':tomcat:1.3.9')
runtime(':external-config-reload:1.4.0') { exclude 'spock-grails-support' }
runtime(':quartz2:2.1.6.2')
runtime(":resources:1.1.6")
Expand Down
5 changes: 5 additions & 0 deletions grails-app/conf/Config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ grails.enable.native2ascii = true
grails.logging.jul.usebridge = true
// packages to include in Spring bean scanning
grails.spring.bean.packages = []

// request parameters to mask when logging exceptions
grails.exceptionresolver.params.exclude = ['password']

grails.validateable.packages = [
'org.pih.warehouse.inventory',
'org.pih.warehouse.fulfillment',
Expand Down Expand Up @@ -319,6 +323,7 @@ log4j = {
debug 'org.apache.cxf',
'grails.plugin.rendering',
'org.apache.commons.mail',
'grails.plugins.raven',
//'com.unboundid'
//'org.hibernate.transaction',
//'org.jumpmind',
Expand Down