Changeset 903 for branches/features

Timestamp:

Apr 27, 2011, 5:16:37 PM (14 years ago)

Author:

gav

Message:

Adjust dependencies, move jasper plugin declaration to BuildConfig?.groovy.
Commons-digester should now be available to JasperController? in deployed war.

Location:

branches/features/grailsUpgrade

Files:

• application.properties (modified) (1 diff)
• grails-app/conf/BuildConfig.groovy (modified) (3 diffs)

branches/features/grailsUpgrade/application.properties

@@ -12 +12 @@
 plugins.help-balloons=1.4
 plugins.hibernate=1.3.7
-plugins.jasper=1.1.3
 plugins.navigation=1.1.1
 plugins.quartz=0.4.2

branches/features/grailsUpgrade/grails-app/conf/BuildConfig.groovy

@@ -19 +19 @@
 
 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"
+    delete file: "${stagingDir}/WEB-INF/lib/xercesImpl.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"
+
 }
 
@@ -62 +62 @@
         runtime 'mysql:mysql-connector-java:5.1.9'
 
+        // 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 'servlet-api', 'commons-logging', 'log4j'
-        }
-
-        runtime('net.sf.jasperreports:jasperreports:3.7.2') {
-            excludes 'xml-apis'
+            excludes 'log4j', 'commons-logging'
         }
 
@@ -77 +80 @@
         }
     }
+
     plugins {
         test ":geb:0.6-SNAPSHOT"
         test ":spock:0.5-groovy-1.7"
+        runtime( ':jasper:1.1.3' ) {
+            transitive = false
+        }
     }