Ignore:
Timestamp:
Apr 27, 2011, 3:26:12 PM (8 years ago)
Author:
gav
Message:

Svn merge -r900:r901 /branches/features/purchaseOrders/grails-app/conf/BuildConfig.groovy into /branches/features/grailsUpgrade/grails-app/conf/BuildConfig.groovy.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/features/grailsUpgrade/grails-app/conf/BuildConfig.groovy

    r876 r902  
    11grails.project.class.dir = "target/classes"
    22grails.project.test.class.dir = "target/test-classes"
    3 grails.project.test.reports.dir = "target/test-reports"
     3grails.project.test.reports.dir = "target/test-reports"
    44
    55def env = System.getProperty('grails.env')
     
    88    case "production":
    99        //grails.project.war.file = "target/${appName}-${appVersion}.war"
    10         grails.project.war.file="target/${appName}Live.war"
     10        grails.project.war.file = "target/${appName}Live.war"
    1111        break
    1212    case "development":
    13         grails.project.war.file="target/${appName}Dev.war"
     13        grails.project.war.file = "target/${appName}Dev.war"
    1414        break
    1515    default:
    16         grails.project.war.file="target/${appName}.war"
     16        grails.project.war.file = "target/${appName}.war"
    1717        break
    1818}
     
    3434
    3535    // inherit Grails' default dependencies
    36     inherits( "global" ) {
     36    inherits("global") {
    3737        // uncomment to disable ehcache
    3838        // excludes 'ehcache'
     
    5050        //mavenLocal()
    5151        mavenCentral()
     52        mavenRepo "https://nexus.codehaus.org/content/repositories/snapshots"
    5253        //mavenRepo "http://snapshots.repository.codehaus.org"
    5354        //mavenRepo "http://repository.codehaus.org"
     
    6162        runtime 'mysql:mysql-connector-java:5.1.9'
    6263
    63         runtime ('org.apache.poi:poi:3.5-FINAL') {
     64        runtime('org.apache.poi:poi:3.5-FINAL') {
    6465            excludes 'servlet-api', 'commons-logging', 'log4j'
    6566        }
    6667
    67         runtime ('net.sf.jasperreports:jasperreports:3.7.2') {
     68        runtime('net.sf.jasperreports:jasperreports:3.7.2') {
    6869            excludes 'xml-apis'
    6970        }
    7071
    71         runtime ('org.apache.ant:ant:1.7.1')
    72         runtime ('org.apache.ant:ant-launcher:1.7.1')
     72        runtime('org.apache.ant:ant:1.7.1')
     73        runtime('org.apache.ant:ant-launcher:1.7.1')
    7374
     75        test("org.seleniumhq.selenium:selenium-htmlunit-driver:latest.release") {
     76            excludes 'xml-apis'
     77        }
     78    }
     79    plugins {
     80        test ":geb:0.6-SNAPSHOT"
     81        test ":spock:0.5-groovy-1.7"
    7482    }
    7583
Note: See TracChangeset for help on using the changeset viewer.