Skip to content

Commit a0ccd65

Browse files
committed
Consistent build dependencies
1 parent 675b650 commit a0ccd65

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

spring-aspects/aspects.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ compileTestJava {
6161
ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties",
6262
classpath: configurations.ajc.asPath)
6363

64-
ant.iajc(source: compileJava.sourceCompatibility, target: compileJava.targetCompatibility,
64+
ant.iajc(source: sourceCompatibility, target: targetCompatibility,
6565
maxmem: "1024m", fork: "true", Xlint: "ignore",
6666
destDir: outputDir.absolutePath,
6767
aspectPath: jar.archivePath,

spring-oxm/oxm.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ dependencies {
88
castor "org.codehaus.castor:castor-anttasks:1.2"
99
castor "velocity:velocity:1.5"
1010
xjc "com.sun.xml.bind:jaxb-xjc:2.1.7"
11-
xmlbeans "org.apache.xmlbeans:xmlbeans:2.4.0"
12-
jibx "org.jibx:jibx-bind:1.2.3"
11+
xmlbeans "org.apache.xmlbeans:xmlbeans:2.6.0"
12+
jibx "org.jibx:jibx-bind:1.2.5"
1313
jibx "bcel:bcel:5.1"
1414
}
1515

@@ -113,7 +113,7 @@ task genXmlbeans {
113113
// add jibx binding to the normal test compilation process
114114
// INCOMPATIBLE WITH OPENJDK 8 b89+
115115
def jibxEnabled = project.properties.get("testGroups")?.toLowerCase()?.split(",")?.contains("custom_compilation")
116-
if(jibxEnabled) {
116+
if (jibxEnabled) {
117117
compileTestJava {
118118
def bindingXml = "${projectDir}/src/test/resources/org/springframework/oxm/jibx/binding.xml"
119119

@@ -131,4 +131,4 @@ if(jibxEnabled) {
131131
}
132132
}
133133
}
134-
}
134+
}

0 commit comments

Comments
 (0)