Skip to content

Commit 759bb33

Browse files
committed
Upgraded to propdeps plugin 0.0.6 and backported several build script refinements
1 parent a139670 commit 759bb33

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
maven { url "http://repo.springsource.org/plugins-release" }
44
}
55
dependencies {
6-
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.5")
6+
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.6")
77
classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.8")
88
}
99
}
@@ -12,11 +12,6 @@ configure(allprojects) { project ->
1212
group = "org.springframework"
1313
version = qualifyVersionIfNecessary(version)
1414

15-
// The following is a work-around for allowing to build on JDK 8 until the
16-
// Gradle build uses Ant 1.9.x by default. This is necessary to avoid the
17-
// "Class not found: javac1.8" issue with Ant versions prior to 1.9.x
18-
ant.properties["build.compiler"] = "javac1.7"
19-
2015
ext.aspectjVersion = "1.7.4"
2116
ext.hsqldbVersion = "1.8.0.10"
2217
ext.junitVersion = "4.11"
@@ -94,6 +89,7 @@ configure(allprojects) { project ->
9489
"http://commons.apache.org/proper/commons-codec/apidocs/",
9590
"http://commons.apache.org/proper/commons-dbcp/apidocs/",
9691
"http://portals.apache.org/pluto/portlet-2.0-apidocs/",
92+
"http://tiles.apache.org/tiles-request/apidocs/",
9793
"http://tiles.apache.org/framework/apidocs/",
9894
"http://aopalliance.sourceforge.net/doc/",
9995
"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
@@ -842,6 +838,7 @@ configure(rootProject) {
842838

843839
apply plugin: "docbook-reference"
844840
apply plugin: "groovy"
841+
845842
// apply plugin: "detect-split-packages"
846843
apply from: "${gradleScriptDir}/jdiff.gradle"
847844

@@ -921,7 +918,7 @@ configure(rootProject) {
921918
}
922919
}
923920

924-
task docsZip(type: Zip) {
921+
task docsZip(type: Zip, dependsOn: 'reference') {
925922
group = "Distribution"
926923
baseName = "spring-framework"
927924
classifier = "docs"

0 commit comments

Comments
 (0)