Changeset 913 for trunk/grails-app/conf/BuildConfig.groovy

Timestamp:

May 1, 2011, 12:46:31 PM (13 years ago)

Author:

gav

Message:

Svn merge -r875:r911 branches/features/grailsUpgrade/ into trunk/.

Location:

trunk

Files:

• . (modified) (1 prop)
• grails-app/conf/BuildConfig.groovy (modified) (6 diffs, 1 prop)

trunk/grails-app/conf/BuildConfig.groovy

@@ -1 +1 @@
 grails.project.class.dir = "target/classes"
 grails.project.test.class.dir = "target/test-classes"
-grails.project.test.reports.dir = "target/test-reports"
+grails.project.test.reports.dir = "target/test-reports"
 
 def env = System.getProperty('grails.env')
@@ -8 +8 @@
     case "production":
         //grails.project.war.file = "target/${appName}-${appVersion}.war"
-        grails.project.war.file="target/${appName}Live.war"
+        grails.project.war.file = "target/${appName}Live.war"
         break
     case "development":
-        grails.project.war.file="target/${appName}Dev.war"
+        grails.project.war.file = "target/${appName}Dev.war"
         break
     default:
-        grails.project.war.file="target/${appName}.war"
+        grails.project.war.file = "target/${appName}.war"
         break
 }
 
 grails.war.resources = { stagingDir, args ->
-    // Remove some duplicate jars.
-    delete file: "${stagingDir}/WEB-INF/lib/jasperreports-2.0.5.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/jasperreports-3.1.2.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/aspectjrt-1.5.4.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/commons-digester-1.7.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/iText-2.0.8.jar"
+    // Remove some duplicate/not required jars.
+    // From export plugin lib dir.
     delete file: "${stagingDir}/WEB-INF/lib/iText-2.1.5.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/jfreechart-1.0.3.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/poi-3.0.2-FINAL-20080204.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/facebook-2.0.4.jar"
-    // Included by searchable plugin.
-    delete file: "${stagingDir}/WEB-INF/lib/compass-2.1.0.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/compass-2.1.0-src.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-core.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-analyzers.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-highlighter.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-queries.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-snowball.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-spellchecker.jar"
+    // From acegi plugin lib dir.
+    delete file: "${stagingDir}/WEB-INF/lib/facebook-java-api-2.0.4.jar"
+    delete file: "${stagingDir}/WEB-INF/lib/easymock.jar"
+    delete file: "${stagingDir}/WEB-INF/lib/cas-client-core-3.1.1.jar"
+    delete file: "${stagingDir}/WEB-INF/lib/openid4java-0.9.2.jar"
+
 }
 
@@ -43 +33 @@
 
     // inherit Grails' default dependencies
-    inherits( "global" ) {
+    inherits("global") {
         // uncomment to disable ehcache
         // excludes 'ehcache'
@@ -51 +41 @@
 
     repositories {
+        grailsHome()
         grailsPlugins()
-        grailsHome()
+        grailsCentral()
 
         // uncomment the below to enable remote dependency resolution
@@ -58 +49 @@
         //mavenLocal()
         mavenCentral()
+        mavenRepo "https://nexus.codehaus.org/content/repositories/snapshots"
         //mavenRepo "http://snapshots.repository.codehaus.org"
         //mavenRepo "http://repository.codehaus.org"
         //mavenRepo "http://download.java.net/maven/2/"
         //mavenRepo "http://repository.jboss.com/maven2/"
+    }
+
+    plugins {
+        runtime ':acegi:0.5.3'
+        runtime ':export:0.7'
+        runtime ':filterpane:0.7'
+        runtime ':help-balloons:1.4'
+        runtime(':jasper:1.1.3') {
+            transitive = false
+        }
+        runtime ':navigation:1.1.1'
+        runtime ':quartz:0.4.2'
+        runtime ':richui:0.8'
+        runtime ':searchable:0.6-SNAPSHOT'
+
+        test ':geb:0.6-SNAPSHOT'
+        test ':spock:0.5-groovy-1.7'
     }
 
@@ -69 +78 @@
         runtime 'mysql:mysql-connector-java:5.1.9'
 
-        runtime ('org.apache.poi:poi:3.5-FINAL') {
-            excludes 'servlet-api', 'commons-logging', 'log4j'
+        // Japser plugin.
+        runtime('net.sf.jasperreports:jasperreports:3.7.2') {
+            excludes 'antlr', 'commons-beanutils', 'commons-collections', 'commons-logging',
+                    'ant', 'mondrian', 'commons-javaflow','barbecue', 'xml-apis-ext','xml-apis', 'xalan', 'groovy-all', 'hibernate', 'saaj-api', 'servlet-api',
+                    'xercesImpl','xmlParserAPIs','spring-core','bsh', 'spring-beans', 'jaxen', 'barcode4j','batik-svg-dom','batik-xml','batik-awt-util','batik-dom',
+                    'batik-css','batik-gvt','batik-script', 'batik-svggen','batik-util','batik-bridge','persistence-api','jdtcore','bcmail-jdk14','bcprov-jdk14','bctsp-jdk14'
+        }
+        runtime('org.apache.poi:poi:3.5-FINAL') {
+            excludes 'log4j', 'commons-logging'
         }
 
-        runtime ('net.sf.jasperreports:jasperreports:3.7.2') {
+        // Origin unknown, still required?
+        runtime('org.apache.ant:ant:1.7.1')
+        runtime('org.apache.ant:ant-launcher:1.7.1')
+
+        test('org.seleniumhq.selenium:selenium-htmlunit-driver:latest.release') {
             excludes 'xml-apis'
         }
-
-        runtime ('org.compass-project:compass:2.1.4')
-        runtime ('org.apache.lucene:lucene-core:2.4.1')
-        runtime ('org.apache.lucene:lucene-analyzers:2.4.1')
-        runtime ('org.apache.lucene:lucene-highlighter:2.4.1')
-        runtime ('org.apache.lucene:lucene-queries:2.4.1')
-        runtime ('org.apache.lucene:lucene-snowball:2.4.1')
-        runtime ('org.apache.lucene:lucene-spellchecker:2.4.1')
-
-        runtime ('org.apache.ant:ant:1.7.1')
-        runtime ('org.apache.ant:ant-launcher:1.7.1')
-
     }