root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Consistent build dependencies

This commit is contained in:
Juergen Hoeller 2014-01-05 03:00:12 +01:00
parent 675b650290
commit a0ccd65d51
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-aspects/aspects.gradle
View File

@ -61,7 +61,7 @@ compileTestJava {
ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
classpath: configurations.ajc.asPath)
ant.iajc(source: compileJava.sourceCompatibility, target: compileJava.targetCompatibility,
ant.iajc(source: sourceCompatibility, target: targetCompatibility,
maxmem: "1024m", fork: "true", Xlint: "ignore",
destDir: outputDir.absolutePath,
aspectPath: jar.archivePath,

8
spring-oxm/oxm.gradle
View File

@ -8,8 +8,8 @@ dependencies {
castor "org.codehaus.castor:castor-anttasks:1.2"
castor "velocity:velocity:1.5"
xjc "com.sun.xml.bind:jaxb-xjc:2.1.7"
xmlbeans "org.apache.xmlbeans:xmlbeans:2.4.0"
jibx "org.jibx:jibx-bind:1.2.3"
xmlbeans "org.apache.xmlbeans:xmlbeans:2.6.0"
jibx "org.jibx:jibx-bind:1.2.5"
jibx "bcel:bcel:5.1"
}
@ -113,7 +113,7 @@ task genXmlbeans {
// add jibx binding to the normal test compilation process
// INCOMPATIBLE WITH OPENJDK 8 b89+
def jibxEnabled = project.properties.get("testGroups")?.toLowerCase()?.split(",")?.contains("custom_compilation")
if(jibxEnabled) {
if (jibxEnabled) {
compileTestJava {
def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
@ -131,4 +131,4 @@ if(jibxEnabled) {
}
}
}
}
}