Skip to content

Commit b64b308

Browse files
committed
Building against Groovy 2.3 instead of 1.8; updated several dependencies to latest maintenance releases (JasperReports 5.5.2, Tiles 3.0.4, Jetty 9.1.5)
1 parent e04fb15 commit b64b308

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

build.gradle

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ configure(allprojects) { project ->
1414
version = qualifyVersionIfNecessary(version)
1515

1616
ext.aspectjVersion = "1.8.0"
17-
ext.groovyVersion = "1.8.9"
17+
ext.groovyVersion = "2.3.0"
1818
ext.hibernate3Version = "3.6.10.Final"
1919
ext.hibernate4Version = "4.3.5.Final"
2020
ext.hibVal4Version = "4.3.1.Final"
2121
ext.hibVal5Version = "5.1.0.Final"
2222
ext.hsqldbVersion = "2.3.2"
2323
ext.jackson2Version = "2.3.3"
24-
ext.jasperReportsVersion = "5.5.1" // 5.5.2 has an unresolvable transitive dependency
25-
ext.jettyVersion = "9.1.4.v20140401"
24+
ext.jasperReportsVersion = "5.5.2"
25+
ext.jettyVersion = "9.1.5.v20140505"
2626
ext.jodaVersion = "2.3"
2727
ext.junitVersion = "4.11"
2828
ext.slf4jVersion = "1.7.7"
2929
ext.snakeYamlVersion = "1.13"
30+
ext.snifferVersion = "1.11"
3031
ext.tiles2Version = "2.2.2"
31-
ext.tiles3Version = "3.0.3"
32+
ext.tiles3Version = "3.0.4"
3233
ext.tomcatVersion = "8.0.5"
3334
ext.xstreamVersion = "1.4.7"
34-
ext.snifferVersion = "1.11"
3535

3636
ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
3737

@@ -584,6 +584,8 @@ project("spring-context-support") {
584584
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
585585
exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
586586
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
587+
exclude group: "org.olap4j", module: "olap4j"
588+
exclude group: "xml-apis", module: "xml-apis"
587589
}
588590
testCompile("org.apache.poi:poi:3.10-FINAL")
589591
testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
@@ -761,10 +763,11 @@ project("spring-webmvc") {
761763
optional("org.freemarker:freemarker:2.3.20")
762764
optional("com.lowagie:itext:2.1.7")
763765
optional("net.sf.jasperreports:jasperreports:$jasperReportsVersion") {
764-
exclude group: "xml-apis", module: "xml-apis"
765766
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
766767
exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
767768
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
769+
exclude group: "org.olap4j", module: "olap4j"
770+
exclude group: "xml-apis", module: "xml-apis"
768771
}
769772
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
770773
optional("rome:rome:1.0")

0 commit comments

Comments
 (0)