Ignore:
Timestamp:
May 7, 2011, 12:42:44 PM (13 years ago)
Author:
gav
Message:

Svn merge -r874:r919 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:
branches/features/purchaseOrders
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/features/purchaseOrders

  • branches/features/purchaseOrders/grails-app/conf/BuildConfig.groovy

    r901 r920  
    1919
    2020grails.war.resources = { stagingDir, args ->
    21     // Remove some duplicate jars.
    22     delete file: "${stagingDir}/WEB-INF/lib/jasperreports-2.0.5.jar"
    23     delete file: "${stagingDir}/WEB-INF/lib/jasperreports-3.1.2.jar"
    24     delete file: "${stagingDir}/WEB-INF/lib/aspectjrt-1.5.4.jar"
    25     delete file: "${stagingDir}/WEB-INF/lib/commons-digester-1.7.jar"
    26     delete file: "${stagingDir}/WEB-INF/lib/iText-2.0.8.jar"
     21    // Remove some duplicate/not required jars.
     22    // From export plugin lib dir.
    2723    delete file: "${stagingDir}/WEB-INF/lib/iText-2.1.5.jar"
    28     delete file: "${stagingDir}/WEB-INF/lib/jfreechart-1.0.3.jar"
    29     delete file: "${stagingDir}/WEB-INF/lib/poi-3.0.2-FINAL-20080204.jar"
    30     delete file: "${stagingDir}/WEB-INF/lib/facebook-2.0.4.jar"
     24    // From acegi plugin lib dir.
     25    delete file: "${stagingDir}/WEB-INF/lib/facebook-java-api-2.0.4.jar"
     26    delete file: "${stagingDir}/WEB-INF/lib/easymock.jar"
     27    delete file: "${stagingDir}/WEB-INF/lib/cas-client-core-3.1.1.jar"
     28    delete file: "${stagingDir}/WEB-INF/lib/openid4java-0.9.2.jar"
     29
    3130}
    3231
     
    5756    }
    5857
     58    plugins {
     59        runtime ':acegi:0.5.3'
     60        runtime ':export:0.7'
     61        runtime ':filterpane:0.7'
     62        runtime ':help-balloons:1.4'
     63        runtime(':jasper:1.1.3') {
     64            transitive = false
     65        }
     66        runtime ':navigation:1.1.1'
     67        runtime ':quartz:0.4.2'
     68        runtime ':richui:0.8'
     69        runtime ':searchable:0.6-SNAPSHOT'
     70
     71        test ':geb:0.6-SNAPSHOT'
     72        test ':spock:0.5-groovy-1.7'
     73    }
     74
    5975    dependencies {
    6076        // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
     
    6278        runtime 'mysql:mysql-connector-java:5.1.9'
    6379
     80        // Japser plugin.
     81        runtime('net.sf.jasperreports:jasperreports:3.7.2') {
     82            excludes 'antlr', 'commons-beanutils', 'commons-collections', 'commons-logging',
     83                    'ant', 'mondrian', 'commons-javaflow','barbecue', 'xml-apis-ext','xml-apis', 'xalan', 'groovy-all', 'hibernate', 'saaj-api', 'servlet-api',
     84                    'xercesImpl','xmlParserAPIs','spring-core','bsh', 'spring-beans', 'jaxen', 'barcode4j','batik-svg-dom','batik-xml','batik-awt-util','batik-dom',
     85                    'batik-css','batik-gvt','batik-script', 'batik-svggen','batik-util','batik-bridge','persistence-api','jdtcore','bcmail-jdk14','bcprov-jdk14','bctsp-jdk14'
     86        }
    6487        runtime('org.apache.poi:poi:3.5-FINAL') {
    65             excludes 'servlet-api', 'commons-logging', 'log4j'
     88            excludes 'log4j', 'commons-logging'
    6689        }
    6790
    68         runtime('net.sf.jasperreports:jasperreports:3.7.2') {
    69             excludes 'xml-apis'
    70         }
    71 
     91        // Origin unknown, still required?
    7292        runtime('org.apache.ant:ant:1.7.1')
    7393        runtime('org.apache.ant:ant-launcher:1.7.1')
    7494
    75         test("org.seleniumhq.selenium:selenium-htmlunit-driver:latest.release") {
     95        test('org.seleniumhq.selenium:selenium-htmlunit-driver:latest.release') {
    7696            excludes 'xml-apis'
    7797        }
    7898    }
    79     plugins {
    80         test ":geb:0.6-SNAPSHOT"
    81         test ":spock:0.5-groovy-1.7"
    82     }
    8399
    84100}
Note: See TracChangeset for help on using the changeset viewer.